Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								369bbe4d72
								
							
						 | 
						
							
							
								
								category click, event click and more button fix
							
							
							
							
							
						 | 
						
							2013-11-18 17:15:36 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4888195566
								
							
						 | 
						
							
							
								
								more button works according to categories
							
							
							
							
							
						 | 
						
							2013-11-15 22:35:20 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								6d5b3a35e9
								
							
						 | 
						
							
							
								
								Alternative fix in parser frontend
							
							
							
							
							
						 | 
						
							2013-11-13 13:23:12 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								2e5b3e8ef7
								
							
						 | 
						
							
							
								
								Fix for Reloading bug
							
							
							
							
							
						 | 
						
							2013-11-13 13:02:20 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								5e0696890a
								
							
						 | 
						
							
							
								
								Updated Remember me, and Homepage widget more link
							
							
							
							
							
						 | 
						
							2013-11-11 17:23:03 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								82ce516d7a
								
							
						 | 
						
							
							
								
								Fix for more link
							
							
							
							
							
						 | 
						
							2013-11-08 18:28:09 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								a14d69211b
								
							
						 | 
						
							
							
								
								PagePart widgets for "system widget"
							
							
							
							
							
							
							
							Delete useless code 
							
						 | 
						
							2013-10-28 16:29:23 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								218cb03641
								
							
						 | 
						
							
							
								
								PagePart widgets except "system widget"
							
							
							
							
							
						 | 
						
							2013-10-28 16:29:23 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f3b3c94b42
								
							
						 | 
						
							
							
								
								Item control iframe dom
							
							
							
							
							
							
							
							Css for preview 
							
						 | 
						
							2013-10-26 18:58:53 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								2530dace02
								
							
						 | 
						
							
							
								
								Change the parser_front_end to be used in the structure for page edit, new_ui:save_pages must be run
							
							
							
							
							
						 | 
						
							2013-10-20 18:44:04 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								55fa1cef4f
								
							
						 | 
						
							
							
								
								Added Enable and disable terms of use, sitemap
							
							
							
							
							
						 | 
						
							2013-10-11 13:14:37 +00:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								7729161123
								
							
						 | 
						
							
							
								
								fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.
							
							
							
							
							
						 | 
						
							2013-06-06 17:38:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								f2706ff2c1
								
							
						 | 
						
							
							
								
								make default widget work with params[tag_id] params[category_id]
							
							
							
							
							
						 | 
						
							2013-06-06 17:36:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								5c94200b77
								
							
						 | 
						
							
							
								
								fix argument passing problem for more link and tag cloud, incomplete code.
							
							
							
							
							
						 | 
						
							2013-06-06 17:21:27 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								253cca06cc
								
							
						 | 
						
							
							
								
								New widget for tag cloud
							
							
							
							
							
						 | 
						
							2013-06-06 17:17:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								41168f4c99
								
							
						 | 
						
							
							
								
								fix for fronted routing failed
							
							
							
							
							
						 | 
						
							2013-04-23 10:01:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3098496083
								
							
						 | 
						
							
							
								
								widget link followed by setting
							
							
							
							
							
						 | 
						
							2013-04-17 14:19:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								dc3966be81
								
							
						 | 
						
							
							
								
								fix cates and tags
							
							
							
							
							
						 | 
						
							2013-03-05 18:34:41 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								6d1f919bb7
								
							
						 | 
						
							
							
								
								Fix links in default widget
							
							
							
							
							
						 | 
						
							2013-02-19 18:09:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								82a8f99208
								
							
						 | 
						
							
							
								
								Fix [again] error in parser for category
							
							
							
							
							
						 | 
						
							2013-02-19 17:50:46 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								ee59228665
								
							
						 | 
						
							
							
								
								Fix error in parser for category
							
							
							
							
							
						 | 
						
							2013-02-19 17:50:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3e79b787bb
								
							
						 | 
						
							
							
								
								Set default widget sort to created_at
							
							
							
							
							
							
							
							Don't use page category when home 
							
						 | 
						
							2013-02-19 17:49:23 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f5728a4f92
								
							
						 | 
						
							
							
								
								Enable designer to add the class "page_breadcrumb"
							
							
							
							
							
						 | 
						
							2013-02-19 17:48:07 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								0cacfb7c05
								
							
						 | 
						
							
							
								
								Fix path error in parser for breadcrumb
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								29b8fec89a
								
							
						 | 
						
							
							
								
								Temporary fix: show for default widget
							
							
							
							
							
							
							
							- the task migrate:recreate_page_parts must be run
	- "create_parts" in page.rb must be unprotected 
							
						 | 
						
							2013-02-19 17:39:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								bca4478f68
								
							
						 | 
						
							
							
								
								front_end widget breadcrumb done
							
							
							
							
							
						 | 
						
							2013-02-19 17:24:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								2a61470f8b
								
							
						 | 
						
							
							
								
								back_end widget breadcrumb finish
							
							
							
							
							
						 | 
						
							2013-02-19 17:24:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								bbd30759f5
								
							
						 | 
						
							
							
								
								fix web resource frontend page
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								bfaa22052f
								
							
						 | 
						
							
							
								
								Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/admin/page_parts_controller.rb
	app/controllers/default_widget_controller.rb
	app/uploaders/gprs_uploader.rb
	app/uploaders/location_uploader.rb
	app/views/admin/page_parts/_module_widget.html.erb
	app/views/admin/page_parts/reload_widget_styles.js.erb
	app/views/admin/page_parts/reload_widgets.js.erb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
	vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
	vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/README.rdoc
	vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
	vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
	vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/models/location.rb
	vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
	vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
	vendor/built_in_modules/location/config/routes.rb
	vendor/built_in_modules/location/lib/location.rb
	vendor/built_in_modules/location/location.gemspec
	vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb 
							
						 | 
						
							2013-01-24 16:30:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								0cc616f988
								
							
						 | 
						
							
							
								
								page can use default widget
							
							
							
							
							
						 | 
						
							2013-01-21 16:56:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								76296ab29b
								
							
						 | 
						
							
							
								
								Merge branch 'sidebar_config' into ntu
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/controllers/orbit_backend_controller.rb
	app/controllers/orbit_widget_controller.rb
	app/models/module_app.rb
	app/views/admin/page_parts/_module_widget.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb 
							
						 | 
						
							2013-01-08 14:17:21 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								c6111460f5
								
							
						 | 
						
							
							
								
								Fix album widget options
							
							
							
							
							
						 | 
						
							2013-01-07 00:40:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								5587e83419
								
							
						 | 
						
							
							
								
								Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
							
							
							
							
							
						 | 
						
							2012-12-28 15:31:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								baf1240b76
								
							
						 | 
						
							
							
								
								gallery options
							
							
							
							
							
						 | 
						
							2012-12-28 15:30:46 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								974a190eaf
								
							
						 | 
						
							
							
								
								Fix orbit_front parser
							
							
							
							
							
						 | 
						
							2012-12-28 11:51:56 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								0a0298aaad
								
							
						 | 
						
							
							
								
								Fix counter front-end
							
							
							
							
							
						 | 
						
							2012-12-28 11:44:33 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								ec96a2e0e7
								
							
						 | 
						
							
							
								
								Add page counter
							
							
							
							
							
						 | 
						
							2012-12-28 10:36:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								71fc85c24e
								
							
						 | 
						
							
							
								
								fix widget.
							
							
							
							
							
						 | 
						
							2012-12-26 19:01:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								47a63e3dab
								
							
						 | 
						
							
							
								
								fix widget.
							
							
							
							
							
						 | 
						
							2012-12-25 10:45:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								b89cd80800
								
							
						 | 
						
							
							
								
								fix widget bug
							
							
							
							
							
						 | 
						
							2012-12-24 14:04:32 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3c79200c2f
								
							
						 | 
						
							
							
								
								Fix wrong deletion in parser for gallery
							
							
							
							
							
						 | 
						
							2012-12-20 16:02:03 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								fcbba6660b
								
							
						 | 
						
							
							
								
								Only one parser for front end
							
							
							
							
							
							
							
							Separate site map for i18n 
							
						 | 
						
							2012-12-19 17:15:31 +08:00 | 
						
					
				
					
						
							
							
								 
								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 |