Christophe Vilayphiou
|
4ae8299949
|
Add custom title to widgets
Fix pagination conflict with main_content and widgets
|
2012-05-13 22:35:00 +08:00 |
|
Christophe Vilayphiou
|
281cfa6518
|
Changes for widgets
|
2012-05-13 21:55:39 +08:00 |
|
Christophe Vilayphiou
|
4685952bd6
|
Changes in page_edit
|
2012-05-13 20:13:26 +08:00 |
Christophe Vilayphiou
|
ef2d416c70
|
Ray's changes for page_edit
|
2012-05-13 19:36:04 +08:00 |
|
Christophe Vilayphiou
|
803253ebcf
|
Put nestedSortable in page_edit.js.erb
|
2012-05-12 22:12:17 +08:00 |
|
Christophe Vilayphiou
|
ef49df448d
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
app/helpers/admin/item_helper.rb
|
2012-05-11 18:09:34 +08:00 |
|
Christophe Vilayphiou
|
076f5ad6ef
|
Ray's changes for drag and drop in structure's side_bar
|
2012-05-11 17:54:33 +08:00 |
|
Christophe Vilayphiou
|
6a443f0976
|
Add mongoid-tree to Item
|
2012-05-11 16:16:09 +08:00 |
Harry Bomrah
|
1a9fa8f505
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-05-11 15:28:05 +08:00 |
|
Harry Bomrah
|
2c3637e9b4
|
very important update for widgets management..
|
2012-05-11 15:27:16 +08:00 |
|
Christophe Vilayphiou
|
fd52d00187
|
Add drag and drop to structure side_bar
|
2012-05-11 10:00:45 +08:00 |
|
Christophe Vilayphiou
|
63f904d3b0
|
Fix tinymce js load
Change to full_name for page_context index
|
2012-05-10 20:36:19 +08:00 |
Matthew K. Fu JuYuan
|
b6aad17681
|
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
|
2012-05-10 14:16:37 +08:00 |
devin
|
ada56a7a63
|
some update
|
2012-05-10 10:54:43 +08:00 |
|
Christophe Vilayphiou
|
a43877323e
|
Add tinymce to page_part edit for text
|
2012-05-10 10:34:13 +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
|
038378be9a
|
Ray's changes for inccu in orbit_bar
|
2012-05-09 15:20:09 +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
|
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
|
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 |
|
Christophe Vilayphiou
|
496b8de58a
|
Side bar translation
|
2012-04-30 08:15:45 +08:00 |
|
Christophe Vilayphiou
|
b8f52fa1ec
|
Separate announcement and news
|
2012-04-30 06:31:46 +08:00 |
|
Matthew K. Fu JuYuan
|
a46a8898d7
|
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
|
2012-04-30 00:24:11 +08:00 |
|
Matthew K. Fu JuYuan
|
9d97b7c008
|
Change for the notice msg at login page
|
2012-04-30 00:24:10 +08:00 |
|
Christophe Vilayphiou
|
851dc72f42
|
Ray's changes in css and html
|
2012-04-30 00:17:18 +08:00 |
|
Christophe Vilayphiou
|
799fd1e3ac
|
Fix css bugs (opacity=) and changes in sign_in page
|
2012-04-27 15:27:59 +08:00 |
|
Christophe Vilayphiou
|
feb2156fd3
|
Fix error in side_bar for web_links
|
2012-04-27 14:15:36 +08:00 |
|
devin
|
2ebba577eb
|
journal start
|
2012-04-27 14:04:11 +08:00 |
|
Christophe Vilayphiou
|
3beb035101
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-27 11:11:56 +08:00 |
|
Christophe Vilayphiou
|
5aca3db95f
|
Ray's changes for structure and web_links
|
2012-04-27 11:02:56 +08:00 |
|
Harry Bomrah
|
c158375d02
|
with connection and some save settings…
|
2012-04-26 21:30:13 +08:00 |
|
Matthew K. Fu JuYuan
|
4af2068c1f
|
Fix ad_banner sec and msec
|
2012-04-26 17:11:06 +08:00 |
|
Matthew K. Fu JuYuan
|
faace9893a
|
dehumanize ad banner
|
2012-04-26 17:11:05 +08:00 |
|
Matthew K. Fu JuYuan
|
9a5ce5f512
|
Remove unless sidebar links.
|
2012-04-26 17:11:05 +08:00 |
|
Christophe Vilayphiou
|
3d293f6419
|
Fix for quick edit file and link in announcement
Change submit_button into ajax_for_submit
|
2012-04-26 16:42:28 +08:00 |
|
Harry Bomrah
|
64be61d61b
|
with gmail widget..
|
2012-04-26 14:47:49 +08:00 |
|
Christophe Vilayphiou
|
6bf4c60d45
|
Changes for js and ccs load for site's pages
|
2012-04-26 01:49:02 +08:00 |
|
Christophe Vilayphiou
|
6f1eb97ace
|
Fix for structure js and css
|
2012-04-25 18:41:38 +08:00 |
|
Christophe Vilayphiou
|
58d52c60d3
|
Fix for structure: restore js and change manifests
|
2012-04-25 18:17:58 +08:00 |
|
Christophe Vilayphiou
|
876036dd20
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
|
2012-04-25 16:39:26 +08:00 |
|
Christophe Vilayphiou
|
44ded537b3
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-25 16:28:34 +08:00 |
|
Christophe Vilayphiou
|
65a6f9c416
|
Ray's css fix for quick edit
|
2012-04-25 16:26:27 +08:00 |
|
Matthew K. Fu JuYuan
|
a3a109fb8b
|
Remove JS debug msg.
|
2012-04-25 16:10:11 +08:00 |
|
Matthew K. Fu JuYuan
|
7f285f4719
|
Change ad_banner preview from using title to id
|
2012-04-25 16:10:11 +08:00 |
|
Matthew K. Fu JuYuan
|
72921d6dfd
|
fix useless notice at login
|
2012-04-25 16:10:11 +08:00 |
|
Christophe Vilayphiou
|
3ec8bb7be6
|
Fix assets bug: when having a '.' in the name, the extension must be specified
|
2012-04-25 15:10:28 +08:00 |
|
Christophe Vilayphiou
|
3308744396
|
Fix side_bar after Matt's changes in translation
|
2012-04-24 17:00:33 +08:00 |
|
Harry Bomrah
|
a298cbd5f6
|
Publication started
|
2012-04-24 16:45:26 +08:00 |
|
Matthew K. Fu JuYuan
|
db46803cda
|
R4-Billingual
|
2012-04-24 16:43:45 +08:00 |