Harry Bomrah
|
11a0875c44
|
color changes in custom color…
|
2012-04-18 17:57:47 +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 |
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
|
d1feb102d0
|
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
|
2012-04-13 15:27:10 +08:00 |
Matthew K. Fu JuYuan
|
d646a9dff1
|
fix new ad_image data selector bug
|
2012-04-13 15:24:59 +08:00 |
Christophe Vilayphiou
|
8167172ca9
|
Merge branch 'master' into desktop_harry
|
2012-04-13 14:05:08 +08:00 |
Matthew K. Fu JuYuan
|
de035cb89a
|
fix date selector value fill back problem
|
2012-04-13 13:52:01 +08:00 |
Christophe Vilayphiou
|
f54dba8b0b
|
Merge branch 'master' into desktop_harry
|
2012-04-13 13:39:00 +08:00 |
Matthew K. Fu JuYuan
|
1e43349eb8
|
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
|
2012-04-13 12:48:57 +08:00 |
Matthew K. Fu JuYuan
|
fe59446c16
|
fix date selector value fill back problem
|
2012-04-13 12:47:57 +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
|
6728c35023
|
Fix side_bar.
In the case of tags, take the uri instead of controller name
|
2012-04-12 18:14:00 +08:00 |
Christophe Vilayphiou
|
015c0cb452
|
Delete useless code in items
|
2012-04-12 18:13:10 +08:00 |
Christophe Vilayphiou
|
93ac99d235
|
Add missing css in "inc"
|
2012-04-12 18:12:46 +08:00 |
Harry Bomrah
|
01af32aa60
|
added divs with id
|
2012-04-12 16:52:32 +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
|
b54578ce1e
|
ad banner preview
|
2012-04-12 07:14:06 +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 |
Matthew K. Fu JuYuan
|
e4c41ab54c
|
A filter UI for permission select. with Harry's JS
|
2012-04-12 07:14:06 +08:00 |
Christophe Vilayphiou
|
5417c6fec0
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
|
2012-04-12 07:13:13 +08:00 |
Christophe Vilayphiou
|
7bca339a5b
|
Ray's fix for columns width in bulletins
|
2012-04-12 07:01:34 +08:00 |
Christophe Vilayphiou
|
486845460c
|
Filter and delete for bulletins
|
2012-04-12 06:50:36 +08:00 |
Harry Bomrah
|
25ca29403c
|
section page added
|
2012-04-11 17:58:52 +08:00 |
Harry Bomrah
|
5a6541a592
|
Setting page update
|
2012-04-11 17:26:25 +08:00 |
Harry Bomrah
|
c55cd5c9bb
|
Last commit
|
2012-04-11 15:50:27 +08:00 |
Harry Bomrah
|
68803c0c97
|
Lets see
|
2012-04-11 15:36:32 +08:00 |
Harry Bomrah
|
edf6089e0c
|
Devin complete
|
2012-04-11 15:34:19 +08:00 |
Harry Bomrah
|
4875b339f8
|
Fetching desktop from db
|
2012-04-11 15:31:10 +08:00 |
devin
|
1fabe3d8f7
|
theme setting update
|
2012-04-11 15:22:05 +08:00 |
devin
|
0219c3df28
|
various update
|
2012-04-11 15:04:00 +08:00 |
devin
|
42f45aa137
|
theme setting update
|
2012-04-11 13:46:32 +08:00 |