Matthew K. Fu JuYuan
|
35452c039d
|
Fix ad_banner
|
2012-04-23 17:03:55 +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 |
|
Christophe Vilayphiou
|
1ebf460f7e
|
Fix 'loading fail' in front-end for announcement
The show action was returning an array instead of a bulletin
|
2012-04-23 14:47:33 +08:00 |
Christophe Vilayphiou
|
499930a680
|
Pull from github
|
2012-04-23 14:29:55 +08:00 |
|
Christophe Vilayphiou
|
09910ca4ae
|
Rmove therubyraces from Gemfile.lock
|
2012-04-23 14:12:18 +08:00 |
|
Christophe Vilayphiou
|
d71d0f7e89
|
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
app/views/admin/ad_images/_form.html.erb
|
2012-04-23 14:08:23 +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 |
|
Matthew K. Fu JuYuan
|
e353afb5ac
|
fix i18n vars in ad_banner
|
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 |
|
Matthew K. Fu JuYuan
|
30edc317b2
|
text area for ad_image
|
2012-04-23 14:06:36 +08:00 |
|
Matthew K. Fu JuYuan
|
ff472714de
|
AdBanner i18n vars patch
|
2012-04-23 14:05:18 +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
|
c3eef6eaa6
|
ok this is final hahaha…
|
2012-04-19 17:06:19 +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 |
|
Matthew K. Fu JuYuan
|
170c12bcdd
|
fix js
|
2012-04-18 16:24:17 +08:00 |
|
Matthew K. Fu JuYuan
|
0ddb66a3c9
|
add i18n vars
|
2012-04-18 15:33:11 +08:00 |
|
Matthew K. Fu JuYuan
|
8d776fd30d
|
AdImage and AnBanner JS fixed
|
2012-04-18 15:26:59 +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 |
|
Matthew K. Fu JuYuan
|
51190a79cb
|
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-17 16:03:48 +08:00 |
|
Matthew K. Fu JuYuan
|
a9a4ca6ede
|
fix i18n vars in ad_banner
|
2012-04-17 15:21:43 +08:00 |
|
Matthew K. Fu JuYuan
|
06a3128be5
|
realtime preview is working. but save to object when preview
|
2012-04-17 11:34:25 +08:00 |
|
devin
|
4f18257733
|
try
|
2012-04-17 01:32:53 +08:00 |
|
Matthew K. Fu JuYuan
|
6cdebb440d
|
Ray's fix for ad_banner
|
2012-04-13 18:02:36 +08:00 |
|
Matthew K. Fu JuYuan
|
7cf00d1d93
|
text area for ad_image
|
2012-04-13 17:51:19 +08:00 |
|
Matthew K. Fu JuYuan
|
d81ca40f90
|
AdBanner i18n vars patch
|
2012-04-13 17:24:30 +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 |