Christophe Vilayphiou
|
f190ce18ee
|
Put sorting in web_link, page_context and design
|
2012-05-05 21:20:20 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Matthew K. Fu JuYuan
|
db46803cda
|
R4-Billingual
|
2012-04-24 16:43:45 +08:00 |
|
Matthew K. Fu JuYuan
|
33640de184
|
Changes for Billingual
|
2012-04-24 14:37:06 +08:00 |
|
Matthew K. Fu JuYuan
|
e7bb9ea86b
|
Fix ad image date selector
|
2012-04-24 14:37:06 +08:00 |
|
Matthew K. Fu JuYuan
|
c57ba305e9
|
Fix ad_banner
|
2012-04-24 14:37:06 +08:00 |
|
Christophe Vilayphiou
|
c856b4cdce
|
Fix for upload image component in announcement
|
2012-04-24 12:41:28 +08:00 |
|
Christophe Vilayphiou
|
42aeaead93
|
Ray's changes, put the js for upload image component in a separate file
|
2012-04-24 12:15:32 +08:00 |
|
Christophe Vilayphiou
|
b80339d704
|
Ray's changes for image upload component and sign-in page
|
2012-04-24 11:35:50 +08:00 |
|
Christophe Vilayphiou
|
6831a3dbbb
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-24 02:44:39 +08:00 |
|
Christophe Vilayphiou
|
0c4328987a
|
Ray's changes for css files, sort headers in announcement and pagination
|
2012-04-24 02:37:51 +08:00 |
|
Christophe Vilayphiou
|
a5b13e680f
|
Add sub_menu in r_tags
|
2012-04-24 02:30:40 +08:00 |
|
Christophe Vilayphiou
|
834cbe3a11
|
Fix side_bar for tags
Modules needs to use the fullpath for active or visible in tags
|
2012-04-23 16:12:07 +08:00 |
|
Matthew K. Fu JuYuan
|
67ba2389a2
|
fix js
|
2012-04-23 14:07:14 +08:00 |
|
Matthew K. Fu JuYuan
|
8eedbc951e
|
add i18n vars
|
2012-04-23 14:07:14 +08:00 |
|
Matthew K. Fu JuYuan
|
0c46b4da23
|
AdImage and AnBanner JS fixed
|
2012-04-23 14:07:13 +08:00 |
|
Matthew K. Fu JuYuan
|
81b0046f42
|
Preview now can be use at both ad_banner and ad_image,however it won't run correctly if user change its ad_banner at ad_image.
|
2012-04-23 14:07:13 +08:00 |