Commit Graph

277 Commits

Author SHA1 Message Date
Harry Bomrah 47408f4467 UI modifications 2012-08-06 17:01:53 +08:00
Harry Bomrah 6159c04da6 Merge branch 'gallery_orbit' into desktop_devin 2012-08-01 20:09:58 +08:00
Harry Bomrah b0ef2b6957 Multi language and side bar update 2012-08-01 20:07:54 +08:00
devin eaa8171689 gallery update 2012-08-01 16:35:59 +08:00
Harry Bomrah 7accbed1a0 gallery translation supported 2012-07-31 21:15:42 +08:00
Harry Bomrah 45da2971ef Merge branch 'gallery_orbit' into desktop_harry 2012-07-31 01:16:22 +08:00
Harry Bomrah 17dffb15e1 Major updates for gallery 2012-07-31 01:15:48 +08:00
Harry Bomrah 929cd3b0cc Gallery update.. 2012-07-29 18:52:30 +08:00
Harry Bomrah 584d5d388e Merge branch 'gallery_orbit' into desktop_harry 2012-07-25 16:21:03 +08:00
Harry Bomrah 8f23755c0d Gallery update 2012-07-25 16:20:07 +08:00
Harry Bomrah 642e0c20ae Routes conflicts removed 2012-07-19 15:54:04 +08:00
Harry Bomrah 59ab1e6d17 Got gallery update 2012-07-19 15:51:41 +08:00
Harry Bomrah 37f6037333 Gallery started. 2012-07-19 15:44:44 +08:00
Harry Bomrah 87be934aa3 gallery module update 2012-07-16 20:26:04 +08:00
Harry Bomrah ba3d13790c gallery module update 2012-07-10 17:43:21 +08:00
unknown 89446ba796 demo 2012-07-09 16:28:04 +08:00
unknown fce2762ec3 demo 2012-07-09 16:28:04 +08:00
unknown 1d8e386bde demo website widget 2012-07-09 16:28:03 +08:00
Matthew K. Fu JuYuan 11247ce84c Clean up code , cache other auths. Fix sidebar 2012-05-29 17:17:26 +08:00
Christophe Vilayphiou 75b67dddf5 Fix date bugs 2012-05-25 09:59:39 +08:00
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
Matthew K. Fu JuYuan e0260542d3 fix code 2012-05-22 16:11:52 +08:00
Matthew K. Fu JuYuan 99bcdf6e1e clean up unless code 2012-05-22 14:59:54 +08:00
Matthew K. Fu JuYuan 79f67208fa js for preventing user do stupid things durning ajax 2012-05-22 14:59:54 +08:00
Christophe Vilayphiou 27cf99462e Fix bug in page and news 2012-05-22 14:42:19 +08:00
Christophe Vilayphiou 815e6a8361 Fix matt's code and add it to filters 2012-05-19 03:19:55 +08:00
Christophe Vilayphiou db410b9c50 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-18 19:44:18 +08:00
Christophe Vilayphiou 4d33c7a56d Changes for dat and time format
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
2012-05-18 19:42:36 +08:00
Matthew K. Fu JuYuan 661fcafe70 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
Conflicts:
	vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
2012-05-18 18:50:10 +08:00
Matthew K. Fu JuYuan 6ce6577e83 fix news approve and preview 2012-05-18 18:47:18 +08:00
Christophe Vilayphiou d9c12ea5a4 Proof authed_users for case when no category 2012-05-18 10:50:51 +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 4467bc5e48 Change Date to DateTime
Fix filename error
2012-05-17 09:59:49 +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 f663985a40 starting ad_banner auth 2012-05-17 06:42:33 +08:00
Christophe Vilayphiou be7ce0bf45 Redmine change's 2012-05-17 06:25:38 +08:00
Christophe Vilayphiou 0b0916179f Change assets 2012-05-16 11:07:11 +08:00
Christophe Vilayphiou 42881553a8 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-15 22:48:40 +08:00
Christophe Vilayphiou 5e9b55e08e Ray took out 'default' tags 2012-05-15 22:47:28 +08:00
Christophe Vilayphiou 3462c0e319 Add each page name to page_context index 2012-05-15 21:31:54 +08:00
Christophe Vilayphiou e54f4409fb Add impressionist 2012-05-15 21:26:09 +08:00
Matthew K. Fu JuYuan 9ba4c2cf2f Change to apply page to had object_auth 2012-05-14 12:40:50 +08:00
Christophe Vilayphiou 039e837fff Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
Conflicts:
	app/views/admin/object_auths_new_interface/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/setting.html.erb
2012-05-14 00:51:53 +08:00
Matthew K. Fu JuYuan b804ba4d96 Fix for manager and admin can see all post in announcement. Haven't applied to news 2012-05-14 00:50:36 +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