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

1277 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan 86a4a6cbe2 put ldap setting into config file. should load be rails env. Also make god config more friendly. 2012-06-22 14:32:28 +08:00
Matthew K. Fu JuYuan 3f95fe4f13 tmp commit for search. start nccu0621 first 2012-06-22 11:34:10 +08:00
Matthew K. Fu JuYuan cb17fe0825 Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working 2012-06-20 14:50:51 +08:00
Matthew K. Fu JuYuan 8dd1ab32c1 Add this toolbar, and nccu calendar fix 2012-06-04 16:51:29 +08:00
Matthew K. Fu JuYuan 2f500ff460 For non-login user,show no drop down menu and return to home after press orbit button. 2012-05-29 16:33:38 +08:00
Matthew K. Fu JuYuan 4f484599b7 Clean up code , cache other auths. Fix sidebar 2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan ff620b41aa add script for cache user 2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan 6f0cf0e92e cache privilege user list. 2012-05-29 15:23:50 +08:00
Christophe Vilayphiou a663231c8c Merge branch 'design_team' into ldap 2012-05-25 10:01:41 +08:00
Christophe Vilayphiou 75b67dddf5 Fix date bugs 2012-05-25 09:59:39 +08:00
Matthew K. Fu JuYuan 3480fa2545 Fix login and label. Check sync jobs and update info function. 2012-05-24 17:01:00 +08:00
Christophe Vilayphiou c062b43069 Merge branch 'design_team' into ldap 2012-05-23 12:11:38 +08:00
Christophe Vilayphiou 71d4241a2f Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-23 12:11:26 +08:00
Christophe Vilayphiou 006b84f6a1 Ray's fix for ie 2012-05-23 12:06:09 +08:00
Christophe Vilayphiou 7c44e94285 Order list by created_at desc 
Add best image size in news new
 2012-05-23 11:46:19 +08:00
Christophe Vilayphiou f1c8bed29d Merge branch 'design_team' into ldap 
Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
 2012-05-22 20:33:07 +08:00
Christophe Vilayphiou eab82269c1 Remove seconds from date display 2012-05-22 20:19:04 +08:00
Christophe Vilayphiou d6b92fc604 Fixed bugs for nccu 2012-05-22 20:00:07 +08:00
Christophe Vilayphiou 11a371cbb9 Fix destroy in structure 
Fix sorting
 2012-05-22 17:55:45 +08:00
Christophe Vilayphiou 541aa5831e JS changes to load drag and drop 2012-05-22 17:37:15 +08:00
Christophe Vilayphiou 1c35e38097 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-22 16:54:35 +08:00
Christophe Vilayphiou dd4c1697cd Fix bug when object_auth was only built but not created 2012-05-22 16:52:12 +08:00
Christophe Vilayphiou 874a89d99b Ray's fix for structure side_bar 2012-05-22 16:48:57 +08:00
Christophe Vilayphiou f497851fe3 Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg 2012-05-22 16:12:00 +08:00
Matthew K. Fu JuYuan e0260542d3 fix code 2012-05-22 16:11:52 +08:00
Christophe Vilayphiou d0b030c47d Put inc/ajax_setting in new_admin 
Fix callback for link on save
 2012-05-22 16:11:00 +08:00
Matthew K. Fu JuYuan 1bbf89a354 fix code 2012-05-22 15:54:46 +08:00
Christophe Vilayphiou ef72a2330c Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg 2012-05-22 15:00:37 +08:00
Matthew K. Fu JuYuan 99bcdf6e1e clean up unless code 2012-05-22 14:59:54 +08:00
Matthew K. Fu JuYuan 79f67208fa js for preventing user do stupid things durning ajax 2012-05-22 14:59:54 +08:00
Matthew K. Fu JuYuan 361722f252 fix orbit core to adopt current user behavior 2012-05-22 14:59:54 +08:00
Christophe Vilayphiou 70b5654b35 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-22 14:47:40 +08:00
Christophe Vilayphiou 5e9836f371 Changes for structure 2012-05-22 14:45:49 +08:00
Christophe Vilayphiou 27cf99462e Fix bug in page and news 2012-05-22 14:42:19 +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
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