 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
|
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
|
18c42a80a6
|
Put site_settings in the orbit_button
|
2012-05-08 20:06:56 +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
|
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 |
|
 Harry Bomrah
|
2083e0bf4f
|
widget structure improvised…
|
2012-05-07 19:00:50 +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 |
|
|
Harry Bomrah
|
fcc875bb5d
|
app store page added… and few other changes..
|
2012-05-04 20:28:12 +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
|
e0a191162d
|
Ray's changes
|
2012-05-04 19:11:28 +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 |
|
|
Matthew K. Fu JuYuan
|
bff3cefbc7
|
Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager.
|
2012-05-04 15:40:43 +08:00 |
|
|
Matthew K. Fu JuYuan
|
f427c3803f
|
clean up useless flash msgs. add i18n vars for app auth and object auth
|
2012-05-04 15:40:43 +08:00 |
|
|
Matthew K. Fu JuYuan
|
05ded8de03
|
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
|
2012-05-04 15:38:18 +08:00 |
|
|
Harry Bomrah
|
3ad11f2098
|
View functionality, changed controller, journal and pages collections
|
2012-05-03 21:38:03 +08:00 |
|
|
Harry Bomrah
|
a3a1e4b92e
|
controller change, views working and db for paper and journals
|
2012-05-03 21:30:12 +08:00 |
|
 devin
|
aeaf2f05d1
|
Start Add Page - no function
|
2012-05-03 17:59:07 +08:00 |
|
|
Harry Bomrah
|
1fce99c96f
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-05-03 14:42:07 +08:00 |
|
|
Harry Bomrah
|
d6cbbff9de
|
connection page working now..
|
2012-05-03 14:40:54 +08:00 |
|
|
devin
|
b87cf0e2ff
|
list page
|
2012-05-03 14:39:22 +08:00 |
|
|
devin
|
887bda1491
|
lots of change
|
2012-05-02 17:04:16 +08:00 |
|
|
Christophe Vilayphiou
|
b8cd7097b0
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-02 16:27:09 +08:00 |
|
|
Christophe Vilayphiou
|
2762c24593
|
Fix wrong variable names in translations
|
2012-05-02 16:22:06 +08:00 |
|
|
Christophe Vilayphiou
|
92a53c1b27
|
Ray's fix
|
2012-05-02 16:20:59 +08:00 |
|
|
devin
|
bfc4507696
|
Connection page design
|
2012-05-01 18:05:17 +08:00 |
|
|
Harry Bomrah
|
769a67f026
|
the group more structured and also demo connecting with gmail account..
|
2012-04-30 21:17:20 +08:00 |
|
|
Harry Bomrah
|
1b7fb106f8
|
lot of updates
|
2012-04-30 14:33:12 +08:00 |
|
|
Harry Bomrah
|
aacd9da9fb
|
auto login encryption done…
|
2012-04-30 14:29:42 +08:00 |
|