Christophe Vilayphiou
|
c32b0dd4b4
|
Move delete checkboxes to js
|
2012-08-14 00:59:01 +08:00 |
Harry Bomrah
|
4660c26b7a
|
fix for ie8,9 for tinymce
|
2012-08-07 20:55:18 +08:00 |
|
Christophe Vilayphiou
|
8ea7bf75cd
|
Fix uploader, ie9 ok, not ie8
|
2012-08-07 17:32:15 +08:00 |
|
Christophe Vilayphiou
|
39b63a970c
|
Fix .class to .class.to_s
|
2012-07-30 18:34:54 +08:00 |
|
Christophe Vilayphiou
|
7440727acd
|
Fix: "._type" to ".class"
|
2012-07-30 17:21:37 +08:00 |
|
Christophe Vilayphiou
|
a8cc581279
|
Sitemap done for backend and fronted
|
2012-07-27 19:13:40 +08:00 |
|
Christophe Vilayphiou
|
934b515914
|
Sitemap with main
|
2012-07-27 19:13:39 +08:00 |
|
Christophe Vilayphiou
|
38804bd118
|
Add disable for main title
|
2012-07-27 19:13:39 +08:00 |
|
Christophe Vilayphiou
|
db9c4c0e10
|
Partial sitemap
|
2012-07-27 19:13:39 +08:00 |
|
Christophe Vilayphiou
|
49dd3a1770
|
Remove i18n_variable for controllers, helpers and models
|
2012-07-27 19:13:39 +08:00 |
Matthew K. Fu JuYuan
|
2ae6b54a45
|
fix for not working cache
|
2012-07-13 18:32:17 +08:00 |
|
Matthew K. Fu JuYuan
|
4daf36908c
|
working cache
|
2012-07-13 15:36:10 +08:00 |
|
Matthew K. Fu JuYuan
|
49862e70f9
|
hide category at front end
|
2012-07-09 12:05:21 +08:00 |
|
Matthew K. Fu JuYuan
|
4f484599b7
|
Clean up code , cache other auths. Fix sidebar
|
2012-05-29 15:23:50 +08:00 |
|
Matthew K. Fu JuYuan
|
6f0cf0e92e
|
cache privilege user list.
|
2012-05-29 15:23:50 +08:00 |
|
Christophe Vilayphiou
|
f1c8bed29d
|
Merge branch 'design_team' into ldap
Conflicts:
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
|
2012-05-22 20:33:07 +08:00 |
|
Christophe Vilayphiou
|
5e9836f371
|
Changes for structure
|
2012-05-22 14:45:49 +08:00 |
Matt
|
6a022c90da
|
Changes on nccu
|
2012-05-18 15:20:45 +08:00 |
|
Matthew K. Fu JuYuan
|
5f6696a358
|
fix view for different_user for ad_banner. add field 'best size' for ad_banner within form
|
2012-05-18 14:19:13 +08:00 |
|
Christophe Vilayphiou
|
7c6b807170
|
Change impression count to exclude when :referrer is nil
|
2012-05-18 14:13:11 +08:00 |
|
Christophe Vilayphiou
|
a4afd5c1d3
|
Merge branch 'design_team' into ldap
|
2012-05-18 10:36:32 +08:00 |
|
Christophe Vilayphiou
|
8ad7f70822
|
Proof i18n_variable for categories
|
2012-05-18 10:28:28 +08:00 |
|
Christophe Vilayphiou
|
17b6a70506
|
Merge branch 'design_team' into ldap
|
2012-05-17 23:36:24 +08:00 |
|
Matthew K. Fu JuYuan
|
16ada34585
|
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
|
2012-05-17 23:35:46 +08:00 |
|
Christophe Vilayphiou
|
79f484300e
|
Merge branch 'design_team' into ldap
|
2012-05-17 18:32:06 +08:00 |
|
Christophe Vilayphiou
|
c9cbec4239
|
Asset changes, add description
|
2012-05-17 18:31:40 +08:00 |
|
Christophe Vilayphiou
|
eba4671733
|
Merge branch 'design_team' into ldap
|
2012-05-17 06:46:29 +08:00 |
|
Christophe Vilayphiou
|
cd1640482a
|
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
Conflicts:
app/views/layouts/_side_bar.html.erb
|
2012-05-17 06:45:30 +08:00 |
|
Matthew K. Fu JuYuan
|
a3acd865d7
|
AdBanner reopen new banner and delete. Rename title with content editable tag.
|
2012-05-17 06:44:14 +08:00 |
|
Matthew K. Fu JuYuan
|
7f2564a81e
|
Fix sidebar and hide some links by roles
|
2012-05-17 06:43:39 +08:00 |
|
Matthew K. Fu JuYuan
|
03387d3c07
|
Object auth for ad_banner
|
2012-05-17 06:42:33 +08:00 |
|
Christophe Vilayphiou
|
6b9c8eb15d
|
Merge branch 'design_team' into ldap
|
2012-05-17 06:31:57 +08:00 |
|
Christophe Vilayphiou
|
26292f0dcc
|
Asset upload
|
2012-05-17 06:28:29 +08:00 |
|
Christophe Vilayphiou
|
9129835f23
|
Add tags to assets
|
2012-05-16 18:19:41 +08:00 |
|
Matthew K. Fu JuYuan
|
befd3bcdec
|
AdBanner reopen new banner and delete. Rename title with content editable tag.
|
2012-05-16 16:42:43 +08:00 |
|
Harry Bomrah
|
617a683d00
|
image insertion completed..
|
2012-05-16 16:22:50 +08:00 |
|
Harry Bomrah
|
30137b50b4
|
popup fix..
|
2012-05-16 15:33:54 +08:00 |
|
Matthew K. Fu JuYuan
|
a31a9c4792
|
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/helpers/application_helper.rb
app/models/ad_banner.rb
|
2012-05-16 12:13:07 +08:00 |
|
Matthew K. Fu JuYuan
|
88a26cc6a1
|
Fix sidebar and hide some links by roles
|
2012-05-16 12:10:16 +08:00 |
|
Christophe Vilayphiou
|
0b0916179f
|
Change assets
|
2012-05-16 11:07:11 +08:00 |
|
Christophe Vilayphiou
|
f950f77f36
|
Merge branch 'design_team' into ldap
Conflicts:
Gemfile
app/models/ad_banner.rb
|
2012-05-15 23:02:22 +08:00 |
|
Christophe Vilayphiou
|
e54f4409fb
|
Add impressionist
|
2012-05-15 21:26:09 +08:00 |
|
Matthew K. Fu JuYuan
|
3f744dab05
|
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
|
2012-05-15 18:55:16 +08:00 |
|
Matthew K. Fu JuYuan
|
b23b5e8ec5
|
Object auth for ad_banner
|
2012-05-15 16:39:23 +08:00 |
|
Christophe Vilayphiou
|
59b55d1574
|
Merge branch 'design_team' into ldap
|
2012-05-14 12:42:06 +08:00 |
|
Matthew K. Fu JuYuan
|
9ba4c2cf2f
|
Change to apply page to had object_auth
|
2012-05-14 12:40:50 +08:00 |
|
Matthew K. Fu JuYuan
|
2cd67356a5
|
Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509
Conflicts:
config/locales/zh_tw.yml
|
2012-05-14 12:36:09 +08:00 |
|
Matthew K. Fu JuYuan
|
e1450ec748
|
Change to apply page to had object_auth
|
2012-05-14 12:34:15 +08:00 |
|
Christophe Vilayphiou
|
ebc8dd33ec
|
Merge branch 'design_team' into ldap
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
|
2012-05-14 00:57:17 +08:00 |
|
Matthew K. Fu JuYuan
|
7a6d30ad62
|
Remove unless files and change routes.
|
2012-05-14 00:50:36 +08:00 |