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
|
038378be9a
|
Ray's changes for inccu in orbit_bar
|
2012-05-09 15:20:09 +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
|
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
|
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
|
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 |
|
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
|
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 |
|
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
|
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
|
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
|
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
|
0246341aef
|
Add footer to site_info
|
2012-05-07 11:25:33 +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
|
15bc4d4268
|
Fix merge error
|
2012-05-04 16:12:28 +08:00 |
|
Christophe Vilayphiou
|
8f1ce78ab4
|
Fix bug when homepage
|
2012-05-04 15:51:51 +08:00 |
|
Matthew K. Fu JuYuan
|
453cb21066
|
Announcement preivew
|
2012-05-04 15:50:45 +08:00 |
|
Matthew K. Fu JuYuan
|
f6307abfbf
|
fix broken ad_banner
|
2012-05-04 15:40:43 +08:00 |