Matthew K. Fu JuYuan
|
db46803cda
|
R4-Billingual
|
2012-04-24 16:43:45 +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 |
|
Christophe Vilayphiou
|
51ee9a4bfa
|
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
|
2012-04-24 14:43:30 +08:00 |
|
Matthew K. Fu JuYuan
|
33640de184
|
Changes for Billingual
|
2012-04-24 14:37:06 +08:00 |
|
Matthew K. Fu JuYuan
|
bbcdaf00e7
|
Disable ad_banner_preview. Just show window
|
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 |
|
Matthew K. Fu JuYuan
|
04688608f7
|
Changes for Billingual
|
2012-04-24 14:30:30 +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 |
|
Matthew K. Fu JuYuan
|
6e431b6137
|
Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
|
2012-04-24 11:26:13 +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 |
|
Matthew K. Fu JuYuan
|
0836583694
|
Disable ad_banner_preview. Just show window
|
2012-04-23 18:29:23 +08:00 |
|
Matthew K. Fu JuYuan
|
a5db2382e7
|
Fix ad image date selector
|
2012-04-23 18:20:12 +08:00 |
|
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
|
499930a680
|
Pull from github
|
2012-04-23 14:29:55 +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 |
|
Christophe Vilayphiou
|
72efdbd742
|
changes before Chirs and Ray's trip
|
2012-04-19 11:50:54 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
Matthew K. Fu JuYuan
|
de035cb89a
|
fix date selector value fill back problem
|
2012-04-13 13:52:01 +08:00 |