Commit Graph

206 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan cb17fe0825 Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working 2012-06-20 14:50:51 +08:00
Matthew K. Fu JuYuan 8dd1ab32c1 Add this toolbar, and nccu calendar fix 2012-06-04 16:51:29 +08:00
Matthew K. Fu JuYuan 3480fa2545 Fix login and label. Check sync jobs and update info function. 2012-05-24 17:01:00 +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 dd4c1697cd Fix bug when object_auth was only built but not created 2012-05-22 16:52:12 +08:00
Matthew K. Fu JuYuan 361722f252 fix orbit core to adopt current user behavior 2012-05-22 14:59:54 +08:00
Matt 6a022c90da Changes on nccu 2012-05-18 15:20:45 +08:00
Christophe Vilayphiou eba4671733 Merge branch 'design_team' into ldap 2012-05-17 06:46:29 +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
Christophe Vilayphiou f950f77f36 Merge branch 'design_team' into ldap
Conflicts:
	Gemfile
	app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
Matthew K. Fu JuYuan 77deffb512 Nccu calendar and daily job. 2012-05-15 14:03:54 +08:00
Matthew K. Fu JuYuan 551e1ef740 Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly. 2012-05-15 11:28:24 +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 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
Christophe Vilayphiou 1ecdb91778 Merge branch 'design_team' into ldap 2012-05-14 09:31:44 +08:00
Christophe Vilayphiou f0dd1eb871 Fix designs.rake 2012-05-14 09:30:49 +08:00
Christophe Vilayphiou 9837f8eae7 Merge branch 'design_team' into ldap 2012-05-14 09:07:36 +08:00
Christophe Vilayphiou 33e3821e61 Rake task to change design_ids 2012-05-14 08:59:53 +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 0119ab1a74 New Interface for App Auth and Object Auth 2012-05-14 00:50:12 +08:00
Christophe Vilayphiou cf8d20dc84 Add category and tag to pages 2012-05-14 00:33:52 +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 4685952bd6 Changes in page_edit 2012-05-13 20:13:26 +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
Christophe Vilayphiou 6a443f0976 Add mongoid-tree to Item 2012-05-11 16:16:09 +08:00
Christophe Vilayphiou de739d7d20 Merge branch 'design_team' into ldap
Conflicts:
	vendor/built_in_modules/web_resource/web_resource.json
2012-05-10 00:34:23 +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 d88d4e58dc Merge branch 'design_team' into ldap
Conflicts:
	config/environments/development.rb
2012-05-09 13:51:00 +08:00
Christophe Vilayphiou 909ca19456 Fix bugs in sub_menu 2012-05-09 04:31:04 +08:00
Christophe Vilayphiou 9ead6cafda Ray's changes 2012-05-09 04:15:02 +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
Christophe Vilayphiou 49e2eb0187 Add class 'active' in the menu for current page 2012-05-08 21:46:24 +08:00
Matthew K. Fu JuYuan c28d7d59b6 starting Resque 2012-05-08 20:21:28 +08:00
Matthew K. Fu JuYuan 083963af65 Test version for DB sync schedule job 2012-05-08 19:20:53 +08:00
Christophe Vilayphiou 5c7cf1aef2 Add sub_menu to site_info 2012-05-08 17:27:02 +08:00
Christophe Vilayphiou d2e07f537a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-08 17:24:40 +08:00
Christophe Vilayphiou a3868cb785 Ray's changes for front-end banner 2012-05-08 17:21:26 +08:00
Christophe Vilayphiou 65a0998080 Merge branch 'jobs_and_mail' into ldap
Conflicts:
	config/environments/development.rb
	config/routes.rb
2012-05-08 11:45:34 +08:00
Matthew K. Fu JuYuan 7339d1ee4a starting Resque 2012-05-08 11:41:58 +08:00
Christophe Vilayphiou 2b9190a49e Merge branch 'design_team' into ldap
Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-05-08 11:40:38 +08:00
Christophe Vilayphiou ba4385e3fd Add module authorization for news
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
2012-05-08 10:50:09 +08:00
Christophe Vilayphiou 8b61314cc4 Add i18n for site_info.
Add always display site title.
Changes for menu in front-end
2012-05-07 15:11:43 +08:00
Christophe Vilayphiou e52119e258 Add footer parser 2012-05-07 13:33:29 +08:00
Christophe Vilayphiou ce1fecaf93 Add position ordering and hiding page for i18n 2012-05-06 00:35:13 +08:00
Christophe Vilayphiou 8e6fd277c2 Fix bug: preview was always true 2012-05-04 19:02:40 +08:00