Christophe Vilayphiou
|
26a50cc862
|
Add sub_menu to children
|
2012-05-09 04:15:45 +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 |
Christophe Vilayphiou
|
41424d2829
|
Fix error in front-end announcement index
|
2012-05-08 17:40:14 +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 |
Matthew K. Fu JuYuan
|
7603cb91ad
|
Change subrole's context from code to text at approval setting.
|
2012-05-08 16:21:10 +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 |
Christophe Vilayphiou
|
d29b89ad1a
|
Merge branch 'jobs_and_mail' of github.com:Rulingcom/orbit into jobs_and_mail
|
2012-05-08 11:42:54 +08:00 |
Matthew K. Fu JuYuan
|
d7194dc805
|
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
|
2012-05-08 11:41:58 +08:00 |
Matthew K. Fu JuYuan
|
5b604037f8
|
now jobs is working
|
2012-05-08 11:41:58 +08:00 |
Matthew K. Fu JuYuan
|
7339d1ee4a
|
starting Resque
|
2012-05-08 11:41:58 +08:00 |
Matthew K. Fu JuYuan
|
8ff36ee76c
|
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
|
2012-05-08 11:31:35 +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
|
2aaff21000
|
Add missing class in widget news_bulletin/index
|
2012-05-07 23:23:17 +08:00 |
Christophe Vilayphiou
|
ca88d0e01b
|
Fix bug that was never displaying preview
|
2012-05-07 17:29:56 +08:00 |
Christophe Vilayphiou
|
469f5c8267
|
Add always_display checkbox for title in site_info independent of i18n
|
2012-05-07 16:29:32 +08:00 |
Christophe Vilayphiou
|
9a5e7cc8fa
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
app/views/admin/sites/site_info.html.erb
|
2012-05-07 16:08:05 +08:00 |
Christophe Vilayphiou
|
4c7a3842d6
|
Add drop_down to news_bulletin widget index for categories
|
2012-05-07 15:58:52 +08:00 |
Christophe Vilayphiou
|
f534e6ca7b
|
Ray's changes for site_info
|
2012-05-07 15:55:45 +08:00 |
Christophe Vilayphiou
|
8a3f0b9bdc
|
Add menu_enabled_for: the page can be shown even if there's no link in the menu
|
2012-05-07 15:47:14 +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
|
0246341aef
|
Add footer to site_info
|
2012-05-07 11:25:33 +08:00 |
Matthew K. Fu JuYuan
|
a2277d7ea5
|
now jobs is working
|
2012-05-07 10:23:16 +08:00 |
Christophe Vilayphiou
|
1fb6c20b86
|
Add site_info
|
2012-05-07 00:54:18 +08:00 |
Christophe Vilayphiou
|
48f8fbde7f
|
Fix site_locale_default_head and active for current locale
|
2012-05-07 00:53:52 +08:00 |
Christophe Vilayphiou
|
51f87e7212
|
Add missing translation for enabled_for
|
2012-05-06 03:36:01 +08:00 |
Christophe Vilayphiou
|
ce1fecaf93
|
Add position ordering and hiding page for i18n
|
2012-05-06 00:35:13 +08:00 |
Christophe Vilayphiou
|
f190ce18ee
|
Put sorting in web_link, page_context and design
|
2012-05-05 21:20:20 +08:00 |
Christophe Vilayphiou
|
b48099d752
|
Fix bug in is_admin?
Fix bug in helpers for news and announcement
|
2012-05-05 17:40:07 +08:00 |
Christophe Vilayphiou
|
555aa088d9
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-04 19:23:45 +08:00 |
Christophe Vilayphiou
|
3ef81c520e
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-04 19:16:57 +08:00 |
Christophe Vilayphiou
|
e0a191162d
|
Ray's changes
|
2012-05-04 19:11:28 +08:00 |
Christophe Vilayphiou
|
8e6fd277c2
|
Fix bug: preview was always true
|
2012-05-04 19:02:40 +08:00 |
Christophe Vilayphiou
|
e9b337a385
|
Copy changes into news after merge
|
2012-05-04 18:49:07 +08:00 |
Christophe Vilayphiou
|
15bc4d4268
|
Fix merge error
|
2012-05-04 16:12:28 +08:00 |
Christophe Vilayphiou
|
3bd3820519
|
Merge branch 'nccu0501_cust' of github.com:Rulingcom/orbit into nccu0501_cust
Conflicts:
app/controllers/application_controller.rb
app/helpers/application_helper.rb
lib/parsers/parser_front_end.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/config/locales/en.yml
vendor/built_in_modules/announcement/config/locales/zh_tw.yml
|
2012-05-04 15:59:26 +08:00 |
Christophe Vilayphiou
|
8f1ce78ab4
|
Fix bug when homepage
|
2012-05-04 15:51:51 +08:00 |
Matthew K. Fu JuYuan
|
119d8ff13a
|
add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.
|
2012-05-04 15:50:45 +08:00 |