Harry Bomrah
|
1ba87982ba
|
Multi language and side bar update
|
2012-08-20 23:14:11 +08:00 |
|
Harry Bomrah
|
1daf405b3d
|
Gallery started.
|
2012-08-20 23:14:10 +08:00 |
unknown
|
1d8e386bde
|
demo website widget
|
2012-07-09 16:28:03 +08:00 |
Christophe Vilayphiou
|
a1e74987dc
|
Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
Conflicts:
Gemfile.lock
app/assets/javascripts/.DS_Store
app/assets/stylesheets/style.css.erb
app/views/layouts/_orbit_bar.html.erb
|
2012-06-29 16:10:29 +08:00 |
Matthew K. Fu JuYuan
|
11247ce84c
|
Clean up code , cache other auths. Fix sidebar
|
2012-05-29 17:17:26 +08:00 |
|
Christophe Vilayphiou
|
d0b030c47d
|
Put inc/ajax_setting in new_admin
Fix callback for link on save
|
2012-05-22 16:11:00 +08:00 |
|
Matthew K. Fu JuYuan
|
79f67208fa
|
js for preventing user do stupid things durning ajax
|
2012-05-22 14:59:54 +08:00 |
|
Christophe Vilayphiou
|
5e9836f371
|
Changes for structure
|
2012-05-22 14:45:49 +08:00 |
|
Christophe Vilayphiou
|
aa114568c4
|
Move design to site_settings side_bar
|
2012-05-21 18:20:39 +08:00 |
|
Matthew K. Fu JuYuan
|
6ce6577e83
|
fix news approve and preview
|
2012-05-18 18:47:18 +08:00 |
|
Christophe Vilayphiou
|
27fd2d0714
|
Hide assets links from side_bar
|
2012-05-17 18:37:46 +08:00 |
|
Matthew K. Fu JuYuan
|
7f2564a81e
|
Fix sidebar and hide some links by roles
|
2012-05-17 06:43:39 +08:00 |
|
Matthew K. Fu JuYuan
|
82d78acbad
|
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
|
2012-05-17 06:43:39 +08:00 |
|
Christophe Vilayphiou
|
26292f0dcc
|
Asset upload
|
2012-05-17 06:28:29 +08:00 |
|
Christophe Vilayphiou
|
9129835f23
|
Add tags to assets
|
2012-05-16 18:19:41 +08:00 |
|
Matthew K. Fu JuYuan
|
0119ab1a74
|
New Interface for App Auth and Object Auth
|
2012-05-14 00:50:12 +08:00 |
|
Matthew K. Fu JuYuan
|
a184f96ce7
|
AdBanner app_auth
|
2012-05-14 00:49:22 +08:00 |
|
Christophe Vilayphiou
|
281cfa6518
|
Changes for widgets
|
2012-05-13 21:55:39 +08:00 |
|
Christophe Vilayphiou
|
fd52d00187
|
Add drag and drop to structure side_bar
|
2012-05-11 10:00:45 +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 |
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 |
|
Christophe Vilayphiou
|
18c42a80a6
|
Put site_settings in the orbit_button
|
2012-05-08 20:06:56 +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
|
1fb6c20b86
|
Add site_info
|
2012-05-07 00:54:18 +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
|
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
|
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 |
|
Christophe Vilayphiou
|
851dc72f42
|
Ray's changes in css and html
|
2012-04-30 00:17:18 +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
|
faace9893a
|
dehumanize ad banner
|
2012-04-26 17:11:05 +08:00 |
|
Christophe Vilayphiou
|
58d52c60d3
|
Fix for structure: restore js and change manifests
|
2012-04-25 18:17:58 +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 |
|
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
|
e353afb5ac
|
fix i18n vars in ad_banner
|
2012-04-23 14:07:13 +08:00 |
|
Christophe Vilayphiou
|
2f279c53ff
|
Apply patch from ldap
|
2012-04-23 14:04:55 +08:00 |
|
Christophe Vilayphiou
|
72efdbd742
|
changes before Chirs and Ray's trip
|
2012-04-19 11:50:54 +08:00 |
|
Christophe Vilayphiou
|
f54dba8b0b
|
Merge branch 'master' into desktop_harry
|
2012-04-13 13:39:00 +08:00 |