chris
							
						 | 
						
							
							
							
							
							
								
							
							
								b049e16634
								
							
						 | 
						
							
							
								
								Create part and save pages when layout is edited
							
							
							
							
							
						 | 
						
							2013-02-19 17:48:06 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								c27141ff5a
								
							
						 | 
						
							
							
								
								Fix query for category in default widget
							
							
							
							
							
						 | 
						
							2013-02-19 17:48:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								5a177f34a8
								
							
						 | 
						
							
							
								
								default widget query for category and tags
							
							
							
							
							
						 | 
						
							2013-02-19 17:45:24 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								a9fecec985
								
							
						 | 
						
							
							
								
								Add pagination to default widget for front end page
							
							
							
							
							
						 | 
						
							2013-02-19 17:41:01 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								0cacfb7c05
								
							
						 | 
						
							
							
								
								Fix path error in parser for breadcrumb
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								c7cf587581
								
							
						 | 
						
							
							
								
								Fix web links html and index query
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								236f68ba84
								
							
						 | 
						
							
							
								
								Fix archive module back end pagination and front end html
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								1f11293fbe
								
							
						 | 
						
							
							
								
								Fix sitemap in page edit
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								17ac564fbb
								
							
						 | 
						
							
							
								
								Fix sitemap nil
							
							
							
							
							
							
							
							Fix namespace of role in subrole 
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								61648d23e1
								
							
						 | 
						
							
							
								
								Change delete_all to destroy_all
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3676de8a14
								
							
						 | 
						
							
							
								
								Change validation for url: can include IPs
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								2a293734c7
								
							
						 | 
						
							
							
								
								Change breadcrumb html
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								7105f103e1
								
							
						 | 
						
							
							
								
								Task to delete settings for old version of default widget
							
							
							
							
							
						 | 
						
							2013-02-19 17:34:39 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								e604c38eb4
								
							
						 | 
						
							
							
								
								Push Gemfile.lock
							
							
							
							
							
						 | 
						
							2013-02-19 17:24:24 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								0b88f7d1f8
								
							
						 | 
						
							
							
								
								deliver app config. fix wrong value cause error for default widget
							
							
							
							
							
						 | 
						
							2013-02-19 14:21:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								572e512a1d
								
							
						 | 
						
							
							
								
								fix link for default widget
							
							
							
							
							
						 | 
						
							2013-02-19 14:21:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								0a115906f1
								
							
						 | 
						
							
							
								
								fix i18n,reload problems
							
							
							
							
							
						 | 
						
							2013-02-19 14:21:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								b7d797f9dd
								
							
						 | 
						
							
							
								
								fix member sidebar
							
							
							
							
							
							
							
							add i18n for modules and default_widgets 
							
						 | 
						
							2013-02-19 14:21:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								fcb49723b4
								
							
						 | 
						
							
							
								
								fix sidebar icon for page.
							
							
							
							
							
							
							
							fix i18n on sidebar
make sidebar sortable by changing db value. Need interface 
							
						 | 
						
							2013-02-19 14:21:53 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9771d42587
								
							
						 | 
						
							
							
								
								migrate for app config. fix panel style intro misplace
							
							
							
							
							
						 | 
						
							2013-02-04 18:10:39 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								2b3cbc50b3
								
							
						 | 
						
							
							
								
								Fix location namespace
							
							
							
							
							
						 | 
						
							2013-02-04 18:06:45 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								981854870a
								
							
						 | 
						
							
							
								
								Changes for mobile copyright
							
							
							
							
							
						 | 
						
							2013-02-04 18:02:11 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								6eb5061237
								
							
						 | 
						
							
							
								
								Changes for mobile map
							
							
							
							
							
						 | 
						
							2013-02-04 18:02:11 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								e9f2983176
								
							
						 | 
						
							
							
								
								Fix page part kind being removed
							
							
							
							
							
						 | 
						
							2013-02-04 18:02:09 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								774599a9f2
								
							
						 | 
						
							
							
								
								Set jquery-rails version to 2.1.4
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								b1a11b4dad
								
							
						 | 
						
							
							
								
								Remove isotope
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3791046e5a
								
							
						 | 
						
							
							
								
								Add missing link to writing conference index
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								bbd30759f5
								
							
						 | 
						
							
							
								
								fix web resource frontend page
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:42 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								e244493b55
								
							
						 | 
						
							
							
								
								member plugin edit
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								8e98aa10bc
								
							
						 | 
						
							
							
								
								modularize factories
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								8f334f6948
								
							
						 | 
						
							
							
								
								modularize conference
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								d4df7c82d3
								
							
						 | 
						
							
							
								
								relpace seminar to conference
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								e0fedb4454
								
							
						 | 
						
							
							
								
								change textfiled to  bilingual for co_author
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								85ca196dec
								
							
						 | 
						
							
							
								
								add bilingual for personal journal
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								b2bc62dadd
								
							
						 | 
						
							
							
								
								fixed orbit bar that like nccu bar now, and add rails version in Gemfile
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:03 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								0b18cf48e3
								
							
						 | 
						
							
							
								
								member roles edit
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:03 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								18a51f070e
								
							
						 | 
						
							
							
								
								member roles edit
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:03 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								87a89f81ce
								
							
						 | 
						
							
							
								
								Fix bug for mobile app routes
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:03 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								c33a723a2a
								
							
						 | 
						
							
							
								
								Fix css bug when precompile
							
							
							
							
							
						 | 
						
							2013-02-04 18:01:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								71d5abae2e
								
							
						 | 
						
							
							
								
								first version of app config and modified inits.
							
							
							
							
							
						 | 
						
							2013-01-29 20:33:40 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								fc702a6210
								
							
						 | 
						
							
							
								
								add front-end page for web_resource
							
							
							
							
							
						 | 
						
							2013-01-24 13:54:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								fea1726f6d
								
							
						 | 
						
							
							
								
								fix ajax error when edit new page
							
							
							
							
							
						 | 
						
							2013-01-24 13:39:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								979df9ac80
								
							
						 | 
						
							
							
								
								daily commit
							
							
							
							
							
						 | 
						
							2013-01-23 18:51:18 +08:00 |