|  Christophe Vilayphiou | 7440727acd | Fix: "._type" to ".class" | 2012-07-30 17:21:37 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | f76b1c02b5 | first version of mid_site_sync for new i18n var | 2012-07-27 19:13:40 +08:00 | 
				
					
						|  Christophe Vilayphiou | a8cc581279 | Sitemap done for backend and fronted | 2012-07-27 19:13:40 +08:00 | 
				
					
						|  Christophe Vilayphiou | ad3ec43a00 | Remove comments in migrate task | 2012-07-27 19:13:39 +08:00 | 
				
					
						|  Christophe Vilayphiou | 804695749d | Fix bugs after removal of i18n_variable | 2012-07-27 19:13:39 +08:00 | 
				
					
						|  Christophe Vilayphiou | 780386d7f1 | Remove i18n_variable for parser | 2012-07-27 19:13:39 +08:00 | 
				
					
						|  Christophe Vilayphiou | 49dd3a1770 | Remove i18n_variable for controllers, helpers and models | 2012-07-27 19:13:39 +08:00 | 
				
					
						|  Christophe Vilayphiou | 327996a7b0 | Task part for i18n_variable removal for web_resource | 2012-07-27 19:12:59 +08:00 | 
				
					
						|  Christophe Vilayphiou | 207b0c5886 | Remove i18n_variable for web_resource | 2012-07-27 19:12:59 +08:00 | 
				
					
						|  Christophe Vilayphiou | 50813eb57d | Remove i18n_variable for page_content | 2012-07-27 19:12:59 +08:00 | 
				
					
						|  Christophe Vilayphiou | 61c1af7316 | Remove i18n_variable for news | 2012-07-27 19:12:58 +08:00 | 
				
					
						|  Christophe Vilayphiou | e2ebd48b22 | Remove i18n_variable for announcement | 2012-07-27 19:12:58 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 7c3cc30784 | fix for rake encoding | 2012-07-26 16:58:17 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 30cc3431b9 | rename sub roles | 2012-07-26 14:12:52 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 397b444390 | fix for bugs | 2012-07-24 20:58:34 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 834fcddc52 | Add data migration for search widget for news and announcement. | 2012-07-20 16:30: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 | 4daf36908c | working cache | 2012-07-13 15:36:10 +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 | 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 | edef51d58c | DM for archive  bulletin categroy | 2012-07-04 17:56:51 +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 | 4014f8ee47 | fix over queue at resque | 2012-07-03 10:51:26 +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 | 3480fa2545 | Fix login and label.  Check sync jobs and update info function. | 2012-05-24 17:01:00 +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 | dd4c1697cd | Fix bug when object_auth was only built but not created | 2012-05-22 16:52:12 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 361722f252 | fix orbit core to adopt current user behavior | 2012-05-22 14:59:54 +08:00 | 
				
					
						|  Matt | 6a022c90da | Changes on nccu | 2012-05-18 15:20:45 +08:00 | 
				
					
						|  Christophe Vilayphiou | eba4671733 | Merge branch 'design_team' into ldap | 2012-05-17 06:46:29 +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 | 
				
					
						|  Christophe Vilayphiou | f950f77f36 | Merge branch 'design_team' into ldap Conflicts:
	Gemfile
	app/models/ad_banner.rb | 2012-05-15 23:02:22 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 77deffb512 | Nccu calendar and daily job. | 2012-05-15 14:03:54 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 551e1ef740 | Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly. | 2012-05-15 11:28:24 +08:00 | 
				
					
						|  Christophe Vilayphiou | 8fcb8ef8de | Change the way links are displayed in menus in front-end | 2012-05-14 21:43:10 +08:00 | 
				
					
						|  Christophe Vilayphiou | 59b55d1574 | Merge branch 'design_team' into ldap | 2012-05-14 12:42:06 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 9ba4c2cf2f | Change to apply page to had object_auth | 2012-05-14 12:40:50 +08:00 | 
				
					
						|  Christophe Vilayphiou | 1ecdb91778 | Merge branch 'design_team' into ldap | 2012-05-14 09:31:44 +08:00 | 
				
					
						|  Christophe Vilayphiou | f0dd1eb871 | Fix designs.rake | 2012-05-14 09:30:49 +08:00 | 
				
					
						|  Christophe Vilayphiou | 9837f8eae7 | Merge branch 'design_team' into ldap | 2012-05-14 09:07:36 +08:00 | 
				
					
						|  Christophe Vilayphiou | 33e3821e61 | Rake task to change design_ids | 2012-05-14 08:59:53 +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 | 0119ab1a74 | New Interface for App Auth and Object Auth | 2012-05-14 00:50:12 +08:00 | 
				
					
						|  Christophe Vilayphiou | cf8d20dc84 | Add category and tag to pages | 2012-05-14 00:33:52 +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 |