|  Christophe Vilayphiou | 82fa85def8 | Clean the parsers code | 2012-05-13 19:32:05 +08:00 | 
				
					
						|  Christophe Vilayphiou | 6a443f0976 | Add mongoid-tree to Item | 2012-05-11 16:16:09 +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 | 
				
					
						|  Christophe Vilayphiou | 5c7cf1aef2 | Add sub_menu to site_info | 2012-05-08 17:27:02 +08:00 | 
				
					
						|  Christophe Vilayphiou | e52119e258 | Add footer parser | 2012-05-07 13:33:29 +08:00 | 
				
					
						|  Christophe Vilayphiou | 8e6fd277c2 | Fix bug: preview was always true | 2012-05-04 19:02:40 +08:00 | 
				
					
						|  Christophe Vilayphiou | 3bd3820519 | Merge branch 'nccu0501_cust' of github.com:Rulingcom/orbit into nccu0501_cust Conflicts:
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/config/locales/en.yml
	vendor/built_in_modules/announcement/config/locales/zh_tw.yml | 2012-05-04 15:59:26 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 453cb21066 | Announcement preivew | 2012-05-04 15:50:45 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 2a14c8bad4 | Announcement preivew | 2012-05-03 14:57:10 +08:00 | 
				
					
						|  Christophe Vilayphiou | b8f52fa1ec | Separate announcement and news | 2012-04-30 06:31:46 +08:00 | 
				
					
						|  Christophe Vilayphiou | 32519f308f | Fix several bus when there is no design | 2012-04-02 02:41:42 +08:00 | 
				
					
						|  Christophe Vilayphiou | c5f6dbc1c4 | Nokogiri in parsers | 2012-03-27 19:00:03 +08:00 | 
				
					
						|  Christophe Vilayphiou | 0f60ab9fc2 | Add ad_banner to nokogiri | 2012-03-27 18:58:48 +08:00 | 
				
					
						|  Christophe Vilayphiou | 7eff06a378 | Trying nokogiri | 2012-03-27 18:58:48 +08:00 | 
				
					
						|  Christophe Vilayphiou | d02bbdbaa5 | Nokogiri in parsers | 2012-03-27 18:58:04 +08:00 | 
				
					
						|  Christophe Vilayphiou | 7efaddf57c | Add ad_banner to nokogiri | 2012-03-27 18:42:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | f5fd3dec7a | Trying nokogiri | 2012-03-27 18:42:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | a126935d2c | Clean the parsers and introduce the metas | 2012-03-21 18:30:12 +08:00 | 
				
					
						|  Christophe Vilayphiou | 3e22c6e61b | Add bootstrap-orbit.css in front-end | 2012-03-07 18:16:59 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4dd9b7ffa4 | Fix announcement pagination in front-end | 2012-03-07 18:16:59 +08:00 | 
				
					
						|  Christophe Vilayphiou | 6b2aeadde6 | Changes for nccu | 2012-02-29 16:01:50 +08:00 | 
				
					
						|  Christophe Vilayphiou | 6a30b0a1e4 | Add RSS event | 2012-02-28 18:29:13 +08:00 | 
				
					
						|  Christophe Vilayphiou | fdf4cfad2d | Add category for announcement widget | 2012-02-28 14:08:57 +08:00 | 
				
					
						|  Christophe Vilayphiou | 680b28023a | Fix ad_banner loading | 2012-02-27 18:50:56 +08:00 | 
				
					
						|  Christophe Vilayphiou | 8f531a6fe5 | Fix bus for pages and page content | 2012-02-24 15:14:23 +08:00 | 
				
					
						|  Christophe Vilayphiou | 63d7810b35 | Add isotope, categories for announcement page, sort for announcement | 2012-02-23 15:52:58 +08:00 | 
				
					
						|  unknown | 20c320961f | edit page_content | 2012-02-23 15:13:36 +08:00 | 
				
					
						|  Christophe Vilayphiou | 44a346ffe9 | Changes for orbit bar, login | 2012-02-19 16:33:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | 9cd3cbc478 | Modifications for design, pages, page_parts… Move orbit_bar out of kernel.js | 2012-02-17 02:09:32 +08:00 | 
				
					
						|  Christophe Vilayphiou | e0accbecaa | Changes into page_part edition. Can choose between 'text', 'public_r_tag' and 'widget' | 2012-02-16 13:09:09 +08:00 | 
				
					
						|  Matthew Kaito Juyuan Fu | 8ef2d4b02e | include ad_banner query code. cleaned up parser | 2012-02-15 00:34:21 +08:00 | 
				
					
						|  Christophe Vilayphiou | 8f885e8bb7 | Use key not title for module_app in parser. Modify announcement routes. | 2012-02-06 16:58:19 +08:00 | 
				
					
						|  Matthew Kaito Juyuan Fu | 394099c388 | Ad banner close complete,need validation | 2012-02-04 09:37:23 +08:00 | 
				
					
						|  Matthew Kaito Juyuan Fu | 68cea1ea49 | AdBanner is now working | 2012-02-04 09:37:23 +08:00 | 
				
					
						|  Matthew Kaito Juyuan Fu | f530eb7112 | Revert "mistake commit" This reverts commit 2608b72d65. | 2012-02-03 14:39:15 +08:00 | 
				
					
						|  Matthew Kaito Juyuan Fu | 2608b72d65 | mistake commit | 2012-02-03 14:28:08 +08:00 | 
				
					
						|  Christophe Vilayphiou | ccbde122df | Fix bugs in design. The static js were loaded after the page js.
parser_back_end.rb wasn't changed for the new routes.
The themes weren't parsed and saved correctly. | 2012-01-31 16:38:25 +08:00 | 
				
					
						|  Christophe Vilayphiou | 783eae4597 | Change "NewBlog" folders into "new_blog" in assets Modify routes and pages handling for clean front-end urls | 2012-01-24 18:16:58 +08:00 | 
				
					
						|  Christophe Vilayphiou | 5518ae362d | Ray's modification before redesign | 2012-01-24 11:57:27 +08:00 | 
				
					
						|  chris2tof | 62aaf79491 | Merge with sub_roles | 2011-12-23 18:34:21 +08:00 |