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 |
|
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 |
|
Christophe Vilayphiou
|
0cc94c65a8
|
Patch from ldap: Test version for DB sync schedule job
|
2012-05-08 21:14:57 +08:00 |
|
Christophe Vilayphiou
|
ffcfda912e
|
Patch from ldap: Calendar sync done,need Ray's JS change
|
2012-05-08 20:44:17 +08:00 |
|
Christophe Vilayphiou
|
3709d38621
|
Merge branch 'jobs_and_mail' of github.com:Rulingcom/orbit into jobs_and_mail
Conflicts:
config/initializers/resque.rb
|
2012-05-08 20:32:06 +08:00 |
|
Matthew K. Fu JuYuan
|
7af17f19ac
|
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
|
2012-05-08 20:26:36 +08:00 |
|
Matthew K. Fu JuYuan
|
dbac219c18
|
now jobs is working
|
2012-05-08 20:25:11 +08:00 |
|
Matthew K. Fu JuYuan
|
f3b58ea36d
|
starting Resque
|
2012-05-08 20:24:37 +08:00 |
|
Matthew K. Fu JuYuan
|
f949523bbb
|
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
|
2012-05-08 20:21:28 +08:00 |
|
Matthew K. Fu JuYuan
|
69f2f6a716
|
now jobs is working
|
2012-05-08 20:21:28 +08:00 |
|
Matthew K. Fu JuYuan
|
c28d7d59b6
|
starting Resque
|
2012-05-08 20:21:28 +08:00 |
|
Christophe Vilayphiou
|
18c42a80a6
|
Put site_settings in the orbit_button
|
2012-05-08 20:06:56 +08:00 |
|
Matthew K. Fu JuYuan
|
083963af65
|
Test version for DB sync schedule job
|
2012-05-08 19:20:53 +08:00 |
|
Christophe Vilayphiou
|
41424d2829
|
Fix error in front-end announcement index
|
2012-05-08 17:40:14 +08:00 |
|
Christophe Vilayphiou
|
23d2d9a81e
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-08 17:36:35 +08:00 |
|
Christophe Vilayphiou
|
ef9afca19f
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-08 17:28:05 +08:00 |
|
Christophe Vilayphiou
|
55bfaea43e
|
Can show announcement and news list by tag's key
|
2012-05-08 17:27:42 +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 |
|
Matthew K. Fu JuYuan
|
7603cb91ad
|
Change subrole's context from code to text at approval setting.
|
2012-05-08 16:21:10 +08:00 |
|
Matthew K. Fu JuYuan
|
f827e8429e
|
Calendar sync done,need Ray's JS change
|
2012-05-08 16:08:41 +08:00 |
|
Christophe Vilayphiou
|
caba8ce7a4
|
Add nccu icon
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
|
2012-05-08 15:27:43 +08:00 |