saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,227 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

71 Commits

Author SHA1 Message Date
Christophe Vilayphiou 5f88408dcb Check for 'http' or 'https' before saving a link 2012-08-04 16:29:31 +08:00
Matthew K. Fu JuYuan acebec8904 don't dislay web links if no eng. lists in widget is now sorted. 2012-08-01 15:24:55 +08:00
Christophe Vilayphiou c951cc6b6f Fix for data_migration 2012-08-01 00:58:59 +08:00
Matthew K. Fu JuYuan b2f28eabaf Merge branch 'master' of github.com:Rulingcom/NCCU 2012-07-31 18:23:01 +08:00
Matthew K. Fu JuYuan b989f458d3 Do not show news/anc if no context. 2012-07-31 18:22:40 +08:00
Christophe Vilayphiou 0078c97b19 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-07-31 14:27:44 +08:00
Christophe Vilayphiou 9f859b903d Add custom validator and fix .html_safe with rescue 2012-07-31 14:25:46 +08:00
Matthew K. Fu JuYuan af4865ceb7 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-07-31 11:01:11 +08:00
Matthew K. Fu JuYuan 4dea025c8a fix for 
1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code.
 2012-07-31 10:59:48 +08:00
Christophe Vilayphiou f3ccbce5c8 Put back impressions for new and bulletin. 
Add view_count field to tag.
 2012-07-30 17:57:55 +08:00
Matthew K. Fu JuYuan bb154f5be6 fix error when creating bulletin and news 2012-07-30 16:38:02 +08:00
Matthew K. Fu JuYuan effad63c92 make sure no pending news or announcement will be searched out 2012-07-30 14:39:40 +08:00
Christophe Vilayphiou 23854e7adc Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var 
Conflicts:
	app/controllers/pages_controller.rb
	app/models/item.rb
	app/models/site.rb
	config/environments/development.rb
	vendor/built_in_modules/announcement/app/models/bulletin.rb
 2012-07-27 19:21:39 +08:00
Christophe Vilayphiou 8eec7b4dac Fix announcement for i18n_variable removal 2012-07-27 19:12:58 +08:00
Christophe Vilayphiou e2ebd48b22 Remove i18n_variable for announcement 2012-07-27 19:12:58 +08:00
Christophe Vilayphiou 875fad848c Fix announcement for i18n_variable removal 2012-07-26 03:29:06 +08:00
Christophe Vilayphiou b9cf5263f6 Remove i18n_variable for announcement 2012-07-26 02:27:43 +08:00
Matthew K. Fu JuYuan f9bdb4a327 New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00
Matthew K. Fu JuYuan a7b92ed3e8 fix rejection for announcement and news. 2012-07-17 10:22:42 +08:00
Matthew K. Fu JuYuan ca2c056a07 fix for not displaying bulletin at fronted when it's parent category is disable 2012-07-11 17:17:44 +08:00
Matthew K. Fu JuYuan 773371e885 fix from messy search 2012-07-09 16:48:23 +08:00
Matthew K. Fu JuYuan 09d46f2f75 NCCU 上傳版本 0709 
Merge branch 'nccu0621'

Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
 2012-07-09 16:02:59 +08:00
Matthew K. Fu JuYuan c5fdff764e orbit disable object for categories 2012-07-05 16:00:45 +08:00
Matthew K. Fu JuYuan ae2cbb728e archive for announcement 2012-07-04 17:36:51 +08:00
Matthew K. Fu JuYuan 4fe92b844e Add sorting order for NCCU request 2012-07-03 15:47:28 +08:00
Matthew K. Fu JuYuan f66c3d9c0c fix bugs. 2012-06-29 11:17:35 +08:00
Matthew K. Fu JuYuan 243c9e2946 fix relation between bulletin and category (news also) 2012-06-27 15:16:16 +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
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 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
Matt 6a022c90da Changes on nccu 2012-05-18 15:20:45 +08:00
Christophe Vilayphiou 4467bc5e48 Change Date to DateTime 
Fix filename error
 2012-05-17 09:59:49 +08:00
Christophe Vilayphiou e54f4409fb Add impressionist 2012-05-15 21:26:09 +08:00
Matthew K. Fu JuYuan 9ba4c2cf2f Change to apply page to had object_auth 2012-05-14 12:40:50 +08:00
Matthew K. Fu JuYuan 0119ab1a74 New Interface for App Auth and Object Auth 2012-05-14 00:50:12 +08:00
Matthew K. Fu JuYuan 07815eee8f fix display for announcement and remove ut field 2012-05-10 10:29:18 +08:00
Matthew K. Fu JuYuan 119d8ff13a add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data. 2012-05-04 15:50:45 +08:00
Christophe Vilayphiou 32faef0c70 DRY code for sorting 2012-04-30 06:30:52 +08:00
Christophe Vilayphiou b502bedd0f Fix filter and sort for status in announcement 2012-04-24 00:46:34 +08:00
Matthew K. Fu JuYuan d2e77d6bf8 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner 2012-04-09 12:45:27 +08:00
Matthew K. Fu JuYuan d1dce81b3e factcheck status for and 2012-04-05 18:27:23 +08:00
unknown d45725cf3b fix announcement & add lang tab 2012-04-05 15:23:20 +08:00
Matt Fu 3ba89ecbcf Fact check program completed,Lin checked 2012-03-27 18:54:03 +08:00
Christophe Vilayphiou 33955b4554 Delete files with Chinese characters in name 2012-03-27 14:21:32 +08:00
Christophe Vilayphiou c4299245de Delete files with Chinese characters in name 2012-03-27 14:19:58 +08:00
Matt Fu 9c8b0235b0 add new files 2012-03-19 10:55:58 +08:00
unknown 6f6e84b015 fix dashboard & announcement 2012-03-16 14:44:57 +08:00
Matt Fu 13b6892f87 code for new fact check 2012-03-16 11:09:44 +08:00
Matt Fu cceb785a8d change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action. 2012-02-29 18:58:33 +08:00
Matthew Kaito Juyuan Fu cc550c5745 First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00