developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,226 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

1226 Commits

Author SHA1 Message Date
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
Matthew K. Fu JuYuan f663985a40 starting ad_banner auth 2012-05-17 06:42:33 +08:00
Christophe Vilayphiou c35cd2e3a6 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-17 06:31:07 +08:00
Christophe Vilayphiou b05836835a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-17 06:28:49 +08:00
Christophe Vilayphiou 26292f0dcc Asset upload 2012-05-17 06:28:29 +08:00
Christophe Vilayphiou aab030efa9 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-17 06:26:21 +08:00
Christophe Vilayphiou be7ce0bf45 Redmine change's 2012-05-17 06:25:38 +08:00
Harry Bomrah 27a0984da1 tinymce loading fixed… 2012-05-16 18:51:37 +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 c380c4cad0 popup fixed 2012-05-16 15:34:23 +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
Harry Bomrah 75cbae049b few experiments… 2012-05-16 11:18:54 +08:00
Christophe Vilayphiou 0b0916179f Change assets 2012-05-16 11:07:11 +08:00
Christophe Vilayphiou 80e84c10ba Remove link from dashboard 2012-05-15 23:01:00 +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 a8c1cbdbba Add vendor/impressionist 2012-05-15 22:42:49 +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
Christophe Vilayphiou 53a0fbddf0 Fix commit error 2012-05-15 21:25:51 +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
Matthew K. Fu JuYuan 0a9f0bcc45 starting ad_banner auth 2012-05-15 09:57:05 +08:00
Christophe Vilayphiou 8fcb8ef8de Change the way links are displayed in menus in front-end 2012-05-14 21:43:10 +08:00
Christophe Vilayphiou 6c83b3f9ae Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 2012-05-14 12:41:14 +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 f0dd1eb871 Fix designs.rake 2012-05-14 09:30:49 +08:00
Christophe Vilayphiou 33e3821e61 Rake task to change design_ids 2012-05-14 08:59:53 +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 dfd2d82efb Restart job 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 a184f96ce7 AdBanner app_auth 2012-05-14 00:49:22 +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 01d0c002f5 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/views/admin/pages/_edit.html.erb
	app/views/admin/pages/_form.html.erb
	lib/parsers/parser_back_end.rb
 2012-05-13 23:14:13 +08:00
Christophe Vilayphiou 62e9a772f6 Fix titles for widgets 
Add translations
 2012-05-13 23:09:48 +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