Christophe Vilayphiou
|
dc4116bc3d
|
Fix page hits count
|
2012-05-19 01:59:17 +08:00 |
|
Christophe Vilayphiou
|
db410b9c50
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-18 19:44:18 +08:00 |
|
Christophe Vilayphiou
|
4d33c7a56d
|
Changes for dat and time format
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
|
2012-05-18 19:42:36 +08:00 |
Matthew K. Fu JuYuan
|
661fcafe70
|
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
Conflicts:
vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
|
2012-05-18 18:50:10 +08:00 |
|
Matthew K. Fu JuYuan
|
6ce6577e83
|
fix news approve and preview
|
2012-05-18 18:47:18 +08:00 |
|
Christophe Vilayphiou
|
e1bd5d8c8d
|
Put back db prototype_r4_development
|
2012-05-18 16:46:47 +08:00 |
Matt
|
6a022c90da
|
Changes on nccu
|
2012-05-18 15:20:45 +08:00 |
|
Christophe Vilayphiou
|
a4c5c8225f
|
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
|
2012-05-18 14:19:43 +08:00 |
|
Matthew K. Fu JuYuan
|
5f6696a358
|
fix view for different_user for ad_banner. add field 'best size' for ad_banner within form
|
2012-05-18 14:19:13 +08:00 |
|
Christophe Vilayphiou
|
7c6b807170
|
Change impression count to exclude when :referrer is nil
|
2012-05-18 14:13:11 +08:00 |
|
Matthew K. Fu JuYuan
|
1d9fc7eb75
|
Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509
|
2012-05-18 10:52:16 +08:00 |
|
Matt
|
2c16284f73
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-18 10:51:49 +08:00 |
|
Christophe Vilayphiou
|
f72d0bc7e0
|
Merge branch 'design_team' into ldap
|
2012-05-18 10:51:20 +08:00 |
|
Matthew K. Fu JuYuan
|
0306277c3d
|
fix view for different_user for ad_banner. add field 'best size' for ad_banner within form
|
2012-05-18 10:50:53 +08:00 |
|
Christophe Vilayphiou
|
d9c12ea5a4
|
Proof authed_users for case when no category
|
2012-05-18 10:50:51 +08:00 |
|
Matt
|
746f71dfee
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-18 10:37:40 +08:00 |
|
Christophe Vilayphiou
|
a4afd5c1d3
|
Merge branch 'design_team' into ldap
|
2012-05-18 10:36:32 +08:00 |
|
Christophe Vilayphiou
|
8ad7f70822
|
Proof i18n_variable for categories
|
2012-05-18 10:28:28 +08:00 |
|
Matt
|
69af2b7b5a
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 23:41:54 +08:00 |
|
Christophe Vilayphiou
|
cdff75b133
|
Merge branch 'nccu_0509' into ldap
|
2012-05-17 23:41:08 +08:00 |
|
Christophe Vilayphiou
|
a2637008e0
|
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
|
2012-05-17 23:40:11 +08:00 |
|
Matt
|
27fd48b730
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 23:37:15 +08:00 |
|
Christophe Vilayphiou
|
17b6a70506
|
Merge branch 'design_team' into ldap
|
2012-05-17 23:36:24 +08:00 |
|
Matthew K. Fu JuYuan
|
16ada34585
|
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
|
2012-05-17 23:35:46 +08:00 |
|
Christophe Vilayphiou
|
5d5e798b1a
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-17 23:35:14 +08:00 |
|
Christophe Vilayphiou
|
a0ad1f59b6
|
Comment out filename in FIleAssetUploader
|
2012-05-17 23:34:15 +08:00 |
|
Matthew K. Fu JuYuan
|
4013436027
|
Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509
|
2012-05-17 21:32:26 +08:00 |
|
Matthew K. Fu JuYuan
|
4981898266
|
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
|
2012-05-17 21:31:29 +08:00 |
Harry Bomrah
|
1b1c2c0032
|
image title and description callback fixed…
|
2012-05-17 20:19:31 +08:00 |
|
Matt
|
4153820dba
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 19:41:51 +08:00 |
|
Christophe Vilayphiou
|
60988f97fb
|
Merge branch 'design_team' into ldap
|
2012-05-17 19:41:24 +08:00 |
|
Christophe Vilayphiou
|
2f7d561310
|
Put back I18n for file_upload
|
2012-05-17 19:40:30 +08:00 |
|
Matt
|
9e6ea0b8dc
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 19:11:22 +08:00 |
|
Christophe Vilayphiou
|
25de941df7
|
Merge branch 'design_team' into ldap
|
2012-05-17 19:10:22 +08:00 |
|
Christophe Vilayphiou
|
606050627e
|
Remove I18n for file_upload html
|
2012-05-17 19:09:52 +08:00 |
|
Matt
|
5720de2e55
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 18:38:17 +08:00 |
|
Christophe Vilayphiou
|
698c750cd7
|
Merge branch 'design_team' into ldap
|
2012-05-17 18:37:56 +08:00 |
|
Christophe Vilayphiou
|
27fd2d0714
|
Hide assets links from side_bar
|
2012-05-17 18:37:46 +08:00 |
|
Christophe Vilayphiou
|
79f484300e
|
Merge branch 'design_team' into ldap
|
2012-05-17 18:32:06 +08:00 |
|
Christophe Vilayphiou
|
c9cbec4239
|
Asset changes, add description
|
2012-05-17 18:31:40 +08:00 |
|
Matt
|
0d69403f4a
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 16:42:07 +08:00 |
|
Christophe Vilayphiou
|
5e93fe51a9
|
Merge branch 'design_team' into ldap
|
2012-05-17 16:41:11 +08:00 |
|
Christophe Vilayphiou
|
29c54e6480
|
Add mandatory fields to assets
|
2012-05-17 16:40:09 +08:00 |
|
Matt
|
d1d25a12a1
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 10:00:35 +08:00 |
|
Christophe Vilayphiou
|
1e2b146c21
|
Merge branch 'design_team' into ldap
|
2012-05-17 10:00:07 +08:00 |
|
Christophe Vilayphiou
|
4467bc5e48
|
Change Date to DateTime
Fix filename error
|
2012-05-17 09:59:49 +08:00 |
|
Matt
|
e9dde4cefe
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 09:32:57 +08:00 |
|
Christophe Vilayphiou
|
bfad553cc3
|
Merge branch 'design_team' into ldap
|
2012-05-17 09:31:02 +08:00 |
|
Christophe Vilayphiou
|
84dac1d250
|
Create FileAssetUploader
|
2012-05-17 09:30:21 +08:00 |
|
Matt
|
3d08bd48de
|
Merge branch 'ldap' of github.com:Rulingcom/orbit into ldap
|
2012-05-17 06:47:03 +08:00 |