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 |
|
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
|
ebf9a896aa
|
Merge branches 'dashboard' and 'dashboard' of github.com:Rulingcom/orbit into dashboard
|
2012-04-13 15:57:42 +08:00 |
unknown
|
31baa2cb63
|
new archive
|
2012-04-13 15:57:15 +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 |
|
unknown
|
0bcb74d793
|
new archive
|
2012-04-13 15:24:19 +08:00 |
|
Christophe Vilayphiou
|
5f16059301
|
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
|
2012-04-13 13:53:00 +08:00 |
|
Matthew K. Fu JuYuan
|
de035cb89a
|
fix date selector value fill back problem
|
2012-04-13 13:52:01 +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 |
|
Matthew K. Fu JuYuan
|
0a9ad1dfb6
|
starting Resque
|
2012-04-13 12:10:47 +08:00 |
|
Christophe Vilayphiou
|
f8873267a2
|
Ray's fix for announcement list
|
2012-04-12 18:41:14 +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
|
167f6d07a0
|
Remove extra "]"
|
2012-04-12 18:13:26 +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 |
|
Christophe Vilayphiou
|
c7d6929c21
|
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
|
2012-04-12 07:15:12 +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 |
|
Matthew K. Fu JuYuan
|
0909156eb4
|
fix i18n var for fact check pending
|
2012-04-12 07:14:06 +08:00 |
|
Matthew K. Fu JuYuan
|
1fd38c8135
|
factcheck status for and
|
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 |