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

358 Commits

Author SHA1 Message Date
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 80e84c10ba Remove link from dashboard 2012-05-15 23:01:00 +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
Matthew K. Fu JuYuan 0a9f0bcc45 starting ad_banner auth 2012-05-15 09:57:05 +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 a184f96ce7 AdBanner app_auth 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
Christophe Vilayphiou 281cfa6518 Changes for widgets 2012-05-13 21:55:39 +08:00
Christophe Vilayphiou 4685952bd6 Changes in page_edit 2012-05-13 20:13:26 +08:00
Christophe Vilayphiou ef2d416c70 Ray's changes for page_edit 2012-05-13 19:36:04 +08:00
Christophe Vilayphiou 803253ebcf Put nestedSortable in page_edit.js.erb 2012-05-12 22:12:17 +08:00
Christophe Vilayphiou ef49df448d Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 
Conflicts:
	app/helpers/admin/item_helper.rb
 2012-05-11 18:09:34 +08:00
Christophe Vilayphiou 076f5ad6ef Ray's changes for drag and drop in structure's side_bar 2012-05-11 17:54:33 +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
Christophe Vilayphiou 63f904d3b0 Fix tinymce js load 
Change to full_name for page_context index
 2012-05-10 20:36:19 +08:00
Matthew K. Fu JuYuan cb25cf60a9 AdBanner app_auth 2012-05-10 15:37:07 +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 a43877323e Add tinymce to page_part edit for text 2012-05-10 10:34:13 +08:00
Christophe Vilayphiou bc5e975fab Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-10 00:29:22 +08:00
Christophe Vilayphiou 9161dc73b5 Translation for "or" 2012-05-10 00:27:12 +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
Christophe Vilayphiou ecd21338bc Matt's changes for side_bar 2012-05-10 00:23:42 +08:00
Christophe Vilayphiou 038378be9a Ray's changes for inccu in orbit_bar 2012-05-09 15:20:09 +08:00
Matthew K. Fu JuYuan 6c9944918a Fix i18 variable 2012-05-09 14:18:52 +08:00
Matthew K. Fu JuYuan 47bca643af hidding new ad_banner 2012-05-09 14:17:20 +08:00
Christophe Vilayphiou f9f7ddc8ee Hide some links in side_bar for site_settings 2012-05-09 12:53:42 +08:00
Christophe Vilayphiou 44a485611a Site_info and site_setting i18n 2012-05-09 12:29:46 +08:00
Christophe Vilayphiou 9216f29bc9 Ray's changes for mail settings 2012-05-09 12:19:32 +08:00
Christophe Vilayphiou 41c0c26330 Add mail_settings 2012-05-09 11:38:29 +08:00
Christophe Vilayphiou b3be210ff7 Small adjustment for dashboard 2012-05-09 05:55:47 +08:00
Christophe Vilayphiou 2b03263fb7 Dashboard partial implementation 2012-05-09 05:53:07 +08:00
Christophe Vilayphiou 8d70d87120 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-09 04:13:14 +08:00
Christophe Vilayphiou 26a50cc862 Add sub_menu to children 2012-05-09 04:15:45 +08:00
Christophe Vilayphiou a186ae08d8 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-08 21:47:03 +08:00