|  Christophe Vilayphiou | e2ebd48b22 | Remove i18n_variable for announcement | 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 | 4768da3c7a | fix announcement loading failed caused by impression. disable pinyin search. | 2012-07-25 18:26:05 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 397b444390 | fix for bugs | 2012-07-24 20:58:34 +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 | 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 | 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 | c0b3798bad | fix for date for qu menu | 2012-06-29 11:41:06 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | f66c3d9c0c | fix bugs. | 2012-06-29 11:17:35 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 6c4c1046bc | fix date select cause error back to the time of Jesus | 2012-06-28 15:19: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 | 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 | 
				
					
						|  Christophe Vilayphiou | c062b43069 | Merge branch 'design_team' into ldap | 2012-05-23 12:11:38 +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 | 
				
					
						|  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 | 815e6a8361 | Fix matt's code and add it to filters | 2012-05-19 03:19:55 +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 | f72d0bc7e0 | Merge branch 'design_team' into ldap | 2012-05-18 10:51:20 +08:00 | 
				
					
						|  Christophe Vilayphiou | d9c12ea5a4 | Proof authed_users for case when no category | 2012-05-18 10:50:51 +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 | 
				
					
						|  Christophe Vilayphiou | f950f77f36 | Merge branch 'design_team' into ldap Conflicts:
	Gemfile
	app/models/ad_banner.rb | 2012-05-15 23:02:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | e54f4409fb | Add impressionist | 2012-05-15 21:26:09 +08:00 | 
				
					
						|  Christophe Vilayphiou | ebc8dd33ec | Merge branch 'design_team' into ldap Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json | 2012-05-14 00:57:17 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | b804ba4d96 | Fix for manager and admin can see all post in announcement. Haven't applied to news | 2012-05-14 00:50:36 +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 | 87449ec6a8 | Merge branch 'design_team' into ldap | 2012-05-10 10:34:28 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 07815eee8f | fix display for announcement and remove ut field | 2012-05-10 10:29:18 +08:00 | 
				
					
						|  Christophe Vilayphiou | de739d7d20 | Merge branch 'design_team' into ldap Conflicts:
	vendor/built_in_modules/web_resource/web_resource.json | 2012-05-10 00:34:23 +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 | c82d701b55 | Permission setting for announcement for bulletin cate | 2012-05-09 15:28:02 +08:00 | 
				
					
						|  Christophe Vilayphiou | d88d4e58dc | Merge branch 'design_team' into ldap Conflicts:
	config/environments/development.rb | 2012-05-09 13:51:00 +08:00 | 
				
					
						|  Christophe Vilayphiou | 41424d2829 | Fix error in front-end announcement index | 2012-05-08 17:40:14 +08:00 | 
				
					
						|  Christophe Vilayphiou | 55bfaea43e | Can show announcement and news list by tag's key | 2012-05-08 17:27:42 +08:00 |