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 |
Harry Bomrah
|
2083e0bf4f
|
widget structure improvised…
|
2012-05-07 19:00:50 +08:00 |
|
Christophe Vilayphiou
|
f534e6ca7b
|
Ray's changes for site_info
|
2012-05-07 15:55:45 +08:00 |
|
Harry Bomrah
|
fcc875bb5d
|
app store page added… and few other changes..
|
2012-05-04 20:28:12 +08:00 |
|
Christophe Vilayphiou
|
e0a191162d
|
Ray's changes
|
2012-05-04 19:11:28 +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 |
|
Harry Bomrah
|
6b8c79a9a8
|
Merge branch 'desktop_devin' into desktop_harry
|
2012-05-02 17:06:56 +08:00 |
|
Harry Bomrah
|
5b7c422446
|
position update fixed..
|
2012-05-02 17:05:40 +08:00 |
|
devin
|
887bda1491
|
lots of change
|
2012-05-02 17:04:16 +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
|
bda21baed2
|
Add missing js
|
2012-04-30 08:32:54 +08:00 |
|
devin
|
b6fceadff4
|
column group experiment
|
2012-04-30 06:41:05 +08:00 |
|
Christophe Vilayphiou
|
32faef0c70
|
DRY code for sorting
|
2012-04-30 06:30:52 +08:00 |
Matthew K. Fu JuYuan
|
c4db7e2157
|
Fix approval setting ajax problem
|
2012-04-30 00:24:11 +08:00 |
|
Matthew K. Fu JuYuan
|
94d61abf83
|
A modal view for approval user
|
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 |
|
devin
|
03f19b80b4
|
small change
|
2012-04-28 01:49:48 +08:00 |
|
Christophe Vilayphiou
|
799fd1e3ac
|
Fix css bugs (opacity=) and changes in sign_in page
|
2012-04-27 15:27:59 +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 |
|
devin
|
682880c5bf
|
skip it
|
2012-04-26 23:18:52 +08:00 |
|
Harry Bomrah
|
c158375d02
|
with connection and some save settings…
|
2012-04-26 21:30:13 +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
|
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
|
65a6f9c416
|
Ray's css fix for quick edit
|
2012-04-25 16:26:27 +08:00 |
|
Matthew K. Fu JuYuan
|
7f285f4719
|
Change ad_banner preview from using title to id
|
2012-04-25 16:10:11 +08:00 |
|
Harry Bomrah
|
a298cbd5f6
|
Publication started
|
2012-04-24 16:45:26 +08:00 |
|
Christophe Vilayphiou
|
c7d8e0b27b
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb
|
2012-04-24 16:32:00 +08:00 |
|
Christophe Vilayphiou
|
291d5e3a03
|
Ray's changes in css
|
2012-04-24 16:24:50 +08:00 |
|
Christophe Vilayphiou
|
c0abaa643c
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-24 15:21:12 +08:00 |
|
Christophe Vilayphiou
|
45c194e870
|
Ray's changes in css
|
2012-04-24 15:15:36 +08:00 |
|
Matthew K. Fu JuYuan
|
c57ba305e9
|
Fix ad_banner
|
2012-04-24 14:37:06 +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 |
|
Harry Bomrah
|
670ec2a40e
|
Themes from db fixed..
|
2012-04-23 21:04:02 +08:00 |
|
Christophe Vilayphiou
|
499930a680
|
Pull from github
|
2012-04-23 14:29:55 +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 |
|
Matthew K. Fu JuYuan
|
1b70852ff7
|
realtime preview is working. but save to object when preview
|
2012-04-23 14:06:37 +08:00 |
|
Matthew K. Fu JuYuan
|
8cc0611c4a
|
Ray's fix for ad_banner
|
2012-04-23 14:06:36 +08:00 |
|
Christophe Vilayphiou
|
2f279c53ff
|
Apply patch from ldap
|
2012-04-23 14:04:55 +08:00 |
|
Harry Bomrah
|
8c42f6bb7c
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-04-20 14:44:57 +08:00 |
|
devin
|
2ebed9e44a
|
javascript update
|
2012-04-20 09:45:40 +08:00 |
|
devin
|
1f077cf2b3
|
javascript update
|
2012-04-20 07:31:48 +08:00 |
|
devin
|
19750d69e0
|
some update
|
2012-04-20 05:38:53 +08:00 |
|
Harry Bomrah
|
3eaf97babe
|
title and heading and welcome msg…
|
2012-04-19 20:26:21 +08:00 |
|
Harry Bomrah
|
3c5b7a5de3
|
Modified confirm box…
|
2012-04-19 15:36:03 +08:00 |
|
Christophe Vilayphiou
|
72efdbd742
|
changes before Chirs and Ray's trip
|
2012-04-19 11:50:54 +08:00 |
|
Harry Bomrah
|
4bad25e682
|
Msg box added and background image saving complete
|
2012-04-18 22:01:12 +08:00 |
|
Harry Bomrah
|
b4bf81d40a
|
background image…
|
2012-04-18 18:20:39 +08:00 |
|
Harry Bomrah
|
6b35cf821e
|
some updates
|
2012-04-18 18:15:02 +08:00 |
|
Harry Bomrah
|
30a6dc6a95
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-04-18 17:58:49 +08:00 |
|
Harry Bomrah
|
11a0875c44
|
color changes in custom color…
|
2012-04-18 17:57:47 +08:00 |
|
Harry Bomrah
|
d14630769a
|
Bg color fixed…
|
2012-04-18 14:57:00 +08:00 |
|
devin
|
b743413be9
|
function update
|
2012-04-18 13:17:12 +08:00 |
|
Harry Bomrah
|
7b391904f7
|
Merge branch 'desktop_devin' of https://github.com/Rulingcom/orbit into desktop_devin
|
2012-04-17 21:20:36 +08:00 |
|
Harry Bomrah
|
95a1e266ae
|
Custom thème done and theme id done…
|
2012-04-17 21:15:40 +08:00 |
|
devin
|
1f44a10206
|
wallpaper added
|
2012-04-17 18:06:07 +08:00 |
|
Harry Bomrah
|
b2d72902c3
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-04-17 16:35:58 +08:00 |
|
Harry Bomrah
|
02c6933d0b
|
Tiles position saved in db and also change them from section manager
|
2012-04-17 16:33:41 +08:00 |
|
devin
|
8cd4844689
|
html change
|
2012-04-17 16:32:11 +08:00 |
|
devin
|
4f18257733
|
try
|
2012-04-17 01:32:53 +08:00 |
|
Harry Bomrah
|
8d2e5210a1
|
alert removes
|
2012-04-13 17:06:27 +08:00 |
|
Harry Bomrah
|
d92451d079
|
alert removed
|
2012-04-13 17:05:47 +08:00 |
|
Harry Bomrah
|
7479a64c95
|
width changes in section page
|
2012-04-13 17:01:11 +08:00 |
|
Matthew K. Fu JuYuan
|
430b0fd9ae
|
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
Conflicts:
app/views/admin/ad_banners/_ad_image_update.html.erb
|
2012-04-13 16:52:14 +08:00 |
|
Matthew K. Fu JuYuan
|
4af73ecf6f
|
fix preview window size.
|
2012-04-13 16:46:16 +08:00 |
|
Matthew K. Fu JuYuan
|
0fe5baf93f
|
fix for letting ad_banner display even when file in not uploaded
|
2012-04-13 16:14:43 +08:00 |
|
Christophe Vilayphiou
|
957d4eaebb
|
Merge branch 'master' into desktop_harry
|
2012-04-13 16:03:43 +08:00 |
|
Christophe Vilayphiou
|
ca0fc4c767
|
Comment out code that bugged upload image in ad_banner
|
2012-04-13 15:53:25 +08:00 |
|
Christophe Vilayphiou
|
f54dba8b0b
|
Merge branch 'master' into desktop_harry
|
2012-04-13 13:39:00 +08:00 |
|
Harry Bomrah
|
64a9579b92
|
final on 13 april 00:00
|
2012-04-13 00:00:24 +08:00 |
|
Harry Bomrah
|
6b43e70f53
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-04-12 22:21:05 +08:00 |
|
Harry Bomrah
|
193cee2df7
|
new icons and widgets
|
2012-04-12 22:18:58 +08:00 |
|
Christophe Vilayphiou
|
f8873267a2
|
Ray's fix for announcement list
|
2012-04-12 18:41:14 +08:00 |
|
devin
|
eabbba76fc
|
css change
|
2012-04-12 18:14:26 +08:00 |
|
Christophe Vilayphiou
|
93ac99d235
|
Add missing css in "inc"
|
2012-04-12 18:12:46 +08:00 |
|
Harry Bomrah
|
92427e8831
|
section page done…
|
2012-04-12 16:25:06 +08:00 |
|
Harry Bomrah
|
7b423877bf
|
new updates
|
2012-04-12 14:50:45 +08:00 |
|
Harry Bomrah
|
48323ac1af
|
lot of changes in fetching
|
2012-04-12 14:44:08 +08:00 |
|
devin
|
67d1f7ad08
|
lots of change
|
2012-04-12 14:19:53 +08:00 |
|
Matthew K. Fu JuYuan
|
83b4443910
|
add pic and js for permission checkbox and filter
|
2012-04-12 07:14:06 +08:00 |
|
Matthew K. Fu JuYuan
|
57402b8602
|
add permission-checkbox js
|
2012-04-12 07:14:06 +08:00 |