Commit Graph

251 Commits

Author SHA1 Message Date
Christophe Vilayphiou 7c44e94285 Order list by created_at desc
Add best image size in news new
2012-05-23 11:46:19 +08:00
Christophe Vilayphiou d6b92fc604 Fixed bugs for nccu 2012-05-22 20:00:07 +08:00
Christophe Vilayphiou 11a371cbb9 Fix destroy in structure
Fix sorting
2012-05-22 17:55:45 +08:00
Christophe Vilayphiou 5e9836f371 Changes for structure 2012-05-22 14:45:49 +08:00
Christophe Vilayphiou c4d7079059 Fix's Matt code for not showing bulletins in index 2012-05-21 18:10:03 +08:00
Christophe Vilayphiou 815e6a8361 Fix matt's code and add it to filters 2012-05-19 03:19:55 +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 8ad7f70822 Proof i18n_variable for categories 2012-05-18 10:28:28 +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 c9cbec4239 Asset changes, add description 2012-05-17 18:31:40 +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 0f354b8ccc fix ad_image size hints. fix orbit backend controller error when changing language. 2012-05-17 06:44:14 +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 82d78acbad First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued 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 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 0647698012 fix ad_image size hints. fix orbit backend controller error when changing language. 2012-05-16 17:16:48 +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 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 8fcb8ef8de Change the way links are displayed in menus in front-end 2012-05-14 21:43:10 +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
Matthew K. Fu JuYuan 7a6d30ad62 Remove unless files and change routes. 2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan 0119ab1a74 New Interface for App Auth and Object Auth 2012-05-14 00:50:12 +08:00
Matthew K. Fu JuYuan 8b42c595b3 Don't display admin in any premission select. Fix not necessary header for UT data 2012-05-14 00:49:22 +08:00
Christophe Vilayphiou cf8d20dc84 Add category and tag to pages 2012-05-14 00:33:52 +08:00
Christophe Vilayphiou e40c76bf5f Fix new page form
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
2012-05-13 23:48:34 +08:00
Christophe Vilayphiou 4ae8299949 Add custom title to widgets
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
Christophe Vilayphiou 281cfa6518 Changes for widgets 2012-05-13 21:55:39 +08:00
Christophe Vilayphiou 82fa85def8 Clean the parsers code 2012-05-13 19:32:05 +08:00
Christophe Vilayphiou 17b486f9e9 Fix bugs for shift_to and change items.rake for the missing position in db 2012-05-11 17:56:26 +08:00
Matthew K. Fu JuYuan 0a34f0277e Remove unless files and change routes. 2012-05-11 16:46:36 +08:00
Matthew K. Fu JuYuan 20a1a6e30f New Interface for App Auth and Object Auth 2012-05-11 16:44:40 +08:00
Christophe Vilayphiou 6a443f0976 Add mongoid-tree to Item 2012-05-11 16:16:09 +08:00
Christophe Vilayphiou fd52d00187 Add drag and drop to structure side_bar 2012-05-11 10:00:45 +08:00
Matthew K. Fu JuYuan 4f1e47bb82 Don't display admin in any premission select. Fix not necessary header for UT data 2012-05-10 14:43:05 +08:00
Matthew K. Fu JuYuan b6aad17681 Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page. 2012-05-10 14:16:37 +08:00
Matthew K. Fu JuYuan 87ebcc48e7 Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page. 2012-05-10 11:51:44 +08:00
Christophe Vilayphiou 13587306bc Add list widgets for announcement, news and links with categories and tags 2012-05-10 00:25:30 +08:00