developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
937 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

937 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan 97e289f823 cache privilege user list. 2012-05-22 17:55:18 +08:00
Matthew K. Fu JuYuan 1bbf89a354 fix code 2012-05-22 15:54:46 +08:00
Matthew K. Fu JuYuan 7f3b090bb7 clean up unless code 2012-05-22 13:23:26 +08:00
Matthew K. Fu JuYuan ae006cc29f js for preventing user do stupid things durning ajax 2012-05-22 13:22:24 +08:00
Matthew K. Fu JuYuan e05cf2a2d6 fix orbit core to adopt current user behavior 2012-05-22 11:17:50 +08:00
Christophe Vilayphiou aa114568c4 Move design to site_settings side_bar 2012-05-21 18:20:39 +08:00
Christophe Vilayphiou c4d7079059 Fix's Matt code for not showing bulletins in index 2012-05-21 18:10:03 +08:00
Christophe Vilayphiou 815e6a8361 Fix matt's code and add it to filters 2012-05-19 03:19:55 +08:00
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
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
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
Christophe Vilayphiou 8ad7f70822 Proof i18n_variable for categories 2012-05-18 10:28:28 +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
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
Christophe Vilayphiou 2f7d561310 Put back I18n for file_upload 2012-05-17 19:40:30 +08:00
Christophe Vilayphiou 606050627e Remove I18n for file_upload html 2012-05-17 19:09:52 +08:00
Christophe Vilayphiou 27fd2d0714 Hide assets links from side_bar 2012-05-17 18:37:46 +08:00
Christophe Vilayphiou c9cbec4239 Asset changes, add description 2012-05-17 18:31:40 +08:00
Christophe Vilayphiou 29c54e6480 Add mandatory fields to assets 2012-05-17 16:40:09 +08:00
Christophe Vilayphiou 4467bc5e48 Change Date to DateTime 
Fix filename error
 2012-05-17 09:59:49 +08:00
Christophe Vilayphiou 84dac1d250 Create FileAssetUploader 2012-05-17 09:30:21 +08:00
Christophe Vilayphiou cd1640482a Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 
Conflicts:
	app/views/layouts/_side_bar.html.erb
 2012-05-17 06:45:30 +08:00
Matthew K. Fu JuYuan 0f354b8ccc fix ad_image size hints. fix orbit backend controller error when changing language. 2012-05-17 06:44:14 +08:00
Matthew K. Fu JuYuan a3acd865d7 AdBanner reopen new banner and delete. Rename title with content editable tag. 2012-05-17 06:44:14 +08:00
Matthew K. Fu JuYuan 7f2564a81e Fix sidebar and hide some links by roles 2012-05-17 06:43:39 +08:00
Matthew K. Fu JuYuan 82d78acbad First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued 2012-05-17 06:43:39 +08:00
Matthew K. Fu JuYuan 03387d3c07 Object auth for ad_banner 2012-05-17 06:42:33 +08:00
Matthew K. Fu JuYuan f663985a40 starting ad_banner auth 2012-05-17 06:42:33 +08:00
Christophe Vilayphiou c35cd2e3a6 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-17 06:31:07 +08:00
Christophe Vilayphiou b05836835a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-17 06:28:49 +08:00
Christophe Vilayphiou 26292f0dcc Asset upload 2012-05-17 06:28:29 +08:00
Christophe Vilayphiou aab030efa9 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-17 06:26:21 +08:00
Christophe Vilayphiou be7ce0bf45 Redmine change's 2012-05-17 06:25:38 +08:00
Harry Bomrah 27a0984da1 tinymce loading fixed… 2012-05-16 18:51:37 +08:00
Christophe Vilayphiou 9129835f23 Add tags to assets 2012-05-16 18:19:41 +08:00
Matthew K. Fu JuYuan 0647698012 fix ad_image size hints. fix orbit backend controller error when changing language. 2012-05-16 17:16:48 +08:00