Commit Graph

1149 Commits

Author SHA1 Message Date
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
Matt ea79246f83 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap 2012-05-10 10:35:07 +08:00
Christophe Vilayphiou 87449ec6a8 Merge branch 'design_team' into ldap 2012-05-10 10:34:28 +08:00
Christophe Vilayphiou a43877323e Add tinymce to page_part edit for text 2012-05-10 10:34:13 +08:00
Christophe Vilayphiou 2677054de7 Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 2012-05-10 10:29:41 +08:00
Matthew K. Fu JuYuan 07815eee8f fix display for announcement and remove ut field 2012-05-10 10:29:18 +08:00
Christophe Vilayphiou 99c4e94729 Fix for home_list widget 2012-05-10 10:28:29 +08:00
Matthew K. Fu JuYuan f13e006e4d fix display for announcement and remove ut field 2012-05-10 10:27:01 +08:00
Matt f9d66687c1 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap 2012-05-10 00:43:43 +08:00
Christophe Vilayphiou 64effbd83c Remove extra widgets declaration 2012-05-10 00:41:32 +08:00
Matt 3a563dde8b Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap 2012-05-10 00:35:28 +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 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 6727f27181 Change for 0509 Nccu check 2012-05-09 16:58:12 +08:00
Matthew K. Fu JuYuan 9a6b66c57d Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 2012-05-09 15:54:59 +08:00
Matthew K. Fu JuYuan 93946c37f4 fix wrong link 2012-05-09 15:54:00 +08:00
Christophe Vilayphiou 8eaceb971a Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
Conflicts:
	dump.rdb
2012-05-09 15:28:37 +08:00
Matthew K. Fu JuYuan a9c241658a Repeat code for news module 2012-05-09 15:28:02 +08:00
Matthew K. Fu JuYuan c82d701b55 Permission setting for announcement for bulletin cate 2012-05-09 15:28:02 +08:00
Matt cca2b8fd6c Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap 2012-05-09 15:26:03 +08:00
Christophe Vilayphiou dc9af65524 Merge branch 'design_team' into ldap 2012-05-09 15:25:16 +08:00
Matthew K. Fu JuYuan 618e4f4047 Repeat code for news module 2012-05-09 15:22:15 +08:00
Christophe Vilayphiou 038378be9a Ray's changes for inccu in orbit_bar 2012-05-09 15:20:09 +08:00
Matt 695b779e4b Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap 2012-05-09 15:04:52 +08:00
Christophe Vilayphiou 1785da51a2 Merge branch 'design_team' into ldap 2012-05-09 15:04:06 +08:00
Christophe Vilayphiou 50edfdd02f Changes for tag key in side_bar announcement and news, fix ad_banner css for dot 2012-05-09 14:59:06 +08:00
Matthew K. Fu JuYuan 71a5731fe8 Permission setting for announcement for bulletin cate 2012-05-09 14:54:20 +08:00
Matt 0bcfac8177 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap 2012-05-09 14:22:09 +08:00
Christophe Vilayphiou 9d01f624da Merge branches 'nccu_0509' and 'design_team' into ldap 2012-05-09 14:21:24 +08:00
Christophe Vilayphiou ec8afc1341 Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
Conflicts:
	app/views/layouts/_side_bar.html.erb
2012-05-09 14:20:38 +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
Matt 69187df279 Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap 2012-05-09 14:00:23 +08:00
Matt e4c41a9310 Test version for DB sync schedule job 2012-05-09 13:58:19 +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 f9f7ddc8ee Hide some links in side_bar for site_settings 2012-05-09 12:53:42 +08:00
Christophe Vilayphiou 3a38992f29 Ray's changes for mail_setting i18n 2012-05-09 12:45:27 +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
Matthew K. Fu JuYuan 183104dd6d Fix i18 variable 2012-05-09 10:03:35 +08:00
Matthew K. Fu JuYuan 4659941989 hidding new ad_banner 2012-05-09 09:49:27 +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 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