|  Christophe Vilayphiou | 61c1af7316 | Remove i18n_variable for news | 2012-07-27 19:12:58 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | fb1f08327d | fix redis search limit for 10 items | 2012-07-26 12:12: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 | 033667f99b | fix for missing disable category at frontend and widget | 2012-07-17 11:26:50 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | a4b1681d39 | fix  rejection for announcement and news. | 2012-07-17 10:21:46 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 4daf36908c | working cache | 2012-07-13 15:36:10 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 85d6bbe1c9 | add i18n variable. fix web_links for disable category | 2012-07-11 17:56:31 +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 | 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 | 49862e70f9 | hide category at front end | 2012-07-09 12:05:21 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 56caf4b34e | category disable for backend | 2012-07-06 18:11:55 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | c5fdff764e | orbit disable object for categories | 2012-07-05 16:00:45 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 6a4abc6c43 | fix news error | 2012-06-27 09:59:32 +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 | 4f484599b7 | Clean up code , cache other auths.  Fix sidebar | 2012-05-29 15:23:50 +08:00 | 
				
					
						|  Christophe Vilayphiou | 75b67dddf5 | Fix date bugs | 2012-05-25 09:59:39 +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 | 
				
					
						|  Matthew K. Fu JuYuan | e0260542d3 | fix code | 2012-05-22 16:11:52 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 79f67208fa | js for preventing user do stupid things durning ajax | 2012-05-22 14:59:54 +08:00 | 
				
					
						|  Christophe Vilayphiou | 27cf99462e | Fix bug in page and news | 2012-05-22 14:42:19 +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 | 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 | e54f4409fb | Add impressionist | 2012-05-15 21:26:09 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 7a6d30ad62 | Remove unless files and change routes. | 2012-05-14 00:50:36 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 8b42c595b3 | Don't display admin in any premission select. Fix not necessary header for UT data | 2012-05-14 00:49:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | 62e9a772f6 | Fix titles for widgets Add translations | 2012-05-13 23:09:48 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4ae8299949 | Add custom title to widgets Fix pagination conflict with main_content and widgets | 2012-05-13 22:35:00 +08:00 | 
				
					
						|  Christophe Vilayphiou | 281cfa6518 | Changes for widgets | 2012-05-13 21:55:39 +08:00 | 
				
					
						|  Christophe Vilayphiou | 13587306bc | Add list widgets for announcement, news and links with categories and tags | 2012-05-10 00:25:30 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | a9c241658a | Repeat code for news module | 2012-05-09 15:28:02 +08:00 | 
				
					
						|  Christophe Vilayphiou | 55bfaea43e | Can show announcement and news list by tag's key | 2012-05-08 17:27:42 +08:00 | 
				
					
						|  Christophe Vilayphiou | f190ce18ee | Put sorting in web_link, page_context and design | 2012-05-05 21:20:20 +08:00 | 
				
					
						|  Christophe Vilayphiou | 8e6fd277c2 | Fix bug: preview was always true | 2012-05-04 19:02:40 +08:00 | 
				
					
						|  Christophe Vilayphiou | e9b337a385 | Copy changes into news after merge | 2012-05-04 18:49:07 +08:00 | 
				
					
						|  Christophe Vilayphiou | b8f52fa1ec | Separate announcement and news | 2012-04-30 06:31:46 +08:00 |