saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								55fa1cef4f
								
							
						 | 
						
							
							
								
								Added Enable and disable terms of use, sitemap
							
							
							
							
							
						 | 
						
							2013-10-11 13:14:37 +00:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								315a24556c
								
							
						 | 
						
							
							
								
								Fix parser common to skip not found module_app
							
							
							
							
							
							
							
							Do not show default widget if there's no data 
							
						 | 
						
							2013-10-08 16:42:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								856898016b
								
							
						 | 
						
							
							
								
								New UI changes(tags, categories, authorisations, module index…)
							
							
							
							
							
							
							
							To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details) 
							
						 | 
						
							2013-07-02 16:46:44 +08: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
							
						 | 
						
							
							
							
							
							
								
							
							
								ec9c68f039
								
							
						 | 
						
							
							
								
								Remove breadcrumb when home
							
							
							
							
							
						 | 
						
							2013-02-19 17:49:22 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								25d9a3d9b9
								
							
						 | 
						
							
							
								
								Add home to breadcrum
							
							
							
							
							
						 | 
						
							2013-02-19 17:49:22 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								1f11293fbe
								
							
						 | 
						
							
							
								
								Fix sitemap in page edit
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f36bcb8801
								
							
						 | 
						
							
							
								
								Put missing changes for breadcrumb in page edit
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								bfad8467c8
								
							
						 | 
						
							
							
								
								breadcrumb widget of front-end has done
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/front_controller.rb
	lib/parsers/parser_common.rb 
							
						 | 
						
							2013-02-19 17:39:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								f3bfe67e68
								
							
						 | 
						
							
							
								
								breadcrumb widget of back-end has done, front-end has bug...
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/front_controller.rb
	app/views/front/show_breadcrumb.html.erb
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb 
							
						 | 
						
							2013-02-19 17:39:41 +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 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								5793f0fe5d
								
							
						 | 
						
							
							
								
								default widget link.
							
							
							
							
							
							
							
							make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app 
							
						 | 
						
							2013-01-07 17:20:37 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								c6111460f5
								
							
						 | 
						
							
							
								
								Fix album widget options
							
							
							
							
							
						 | 
						
							2013-01-07 00:40:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								2d8400d1cc
								
							
						 | 
						
							
							
								
								Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu
							
							
							
							
							
						 | 
						
							2012-12-28 15:34:24 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								61b0f94c04
								
							
						 | 
						
							
							
								
								Remove I18n.locale for announcement front-end
							
							
							
							
							
							
							
							Fix counter in back-end edit 
							
						 | 
						
							2012-12-28 15:34:04 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								37309a452d
								
							
						 | 
						
							
							
								
								Fix site map and menu order
							
							
							
							
							
						 | 
						
							2012-12-28 11:37:37 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								ec96a2e0e7
								
							
						 | 
						
							
							
								
								Add page counter
							
							
							
							
							
						 | 
						
							2012-12-28 10:36:18 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								751d3b1220
								
							
						 | 
						
							
							
								
								Announcement widget: remove I18n.locale
							
							
							
							
							
							
							
							Add part_id in url 
							
						 | 
						
							2012-12-27 16:52:58 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								269e5b033f
								
							
						 | 
						
							
							
								
								Fix for page_part and widget back-end
							
							
							
							
							
						 | 
						
							2012-12-27 16:20:40 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								5f712622ad
								
							
						 | 
						
							
							
								
								default widgets and sidebar.
							
							
							
							
							
						 | 
						
							2012-12-24 16:38:35 +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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								fbe2b26e9f
								
							
						 | 
						
							
							
								
								Do not create layout part if it already exists
							
							
							
							
							
						 | 
						
							2012-12-03 18:59:32 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								2d0e8b37b2
								
							
						 | 
						
							
							
								
								Fix:
							
							
							
							
							
							
							
							- Widgets for announcement
  - Facebook link
  - AdBanner nav 
							
						 | 
						
							2012-11-21 18:42:14 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3beed406a7
								
							
						 | 
						
							
							
								
								Fix Nokogiri when '.first' returns nothing
							
							
							
							
							
						 | 
						
							2012-11-20 12:00:18 +08:00 |