chris
							
						 
						
							 
							
							
							
							
								
							
							
								aacfcf1997 
								
							 
						 
						
							
							
								
								Fix typo in translations  
							
							 
							
							
							
						 
						
							2013-03-18 21:52:52 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								b864cc0268 
								
							 
						 
						
							
							
								
								Changes in I18n (except personal_conference and personal_journal)  
							
							 
							
							
							
						 
						
							2013-03-12 18:13:48 +08:00  
						
					 
				
					
						
							
							
								 
								Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								0dabd5b95f 
								
							 
						 
						
							
							
								
								fix widget field reload  
							
							 
							
							
							
						 
						
							2013-02-27 10:51:41 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								680d7908b9 
								
							 
						 
						
							
							
								
								member plugin init edit  
							
							 
							
							
							
						 
						
							2013-02-21 17:53:08 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								4709c08ad1 
								
							 
						 
						
							
							
								
								Temporary fix zh_tw.yml  
							
							 
							
							... 
							
							
							
							New Gemfile.lock 
							
						 
						
							2013-02-21 14:43:49 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								d46abd7caf 
								
							 
						 
						
							
							
								
								member list edit  
							
							 
							
							
							
						 
						
							2013-02-21 14:13:46 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								13c757e8a9 
								
							 
						 
						
							
							
								
								clean add/edit page and add conference list page  
							
							 
							
							
							
						 
						
							2013-02-21 13:58:30 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								f59da3ce81 
								
							 
						 
						
							
							
								
								member plugin init edit  
							
							 
							
							
							
						 
						
							2013-02-20 18:05:09 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								bc44d38948 
								
							 
						 
						
							
							
								
								member plugin edit  
							
							 
							
							
							
						 
						
							2013-02-20 17:25:20 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								a7bc19768e 
								
							 
						 
						
							
							
								
								member list edit  
							
							 
							
							
							
						 
						
							2013-02-20 11:12:08 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								a9fecec985 
								
							 
						 
						
							
							
								
								Add pagination to default widget for front end page  
							
							 
							
							
							
						 
						
							2013-02-19 17:41:01 +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
							
						 
						
							 
							
							
							
							
								
							
							
								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
							
						 
						
							 
							
							
							
							
								
							
							
								96455f31e1 
								
							 
						 
						
							
							
								
								deliver app config. fix wrong value cause error for default widget  
							
							 
							
							
							
						 
						
							2013-02-18 19:04:04 +08:00  
						
					 
				
					
						
							
							
								 
								Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								a6f6dc271c 
								
							 
						 
						
							
							
								
								fix i18n,reload problems  
							
							 
							
							
							
						 
						
							2013-02-18 15:13:31 +08:00  
						
					 
				
					
						
							
							
								 
								Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								29bb92f841 
								
							 
						 
						
							
							
								
								fix member sidebar  
							
							 
							
							... 
							
							
							
							add i18n for modules and default_widgets 
							
						 
						
							2013-02-06 17:44:38 +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  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								d4df7c82d3 
								
							 
						 
						
							
							
								
								relpace seminar to conference  
							
							 
							
							
							
						 
						
							2013-02-04 18:01:38 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								87a89f81ce 
								
							 
						 
						
							
							
								
								Fix bug for mobile app routes  
							
							 
							
							
							
						 
						
							2013-02-04 18:01:03 +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
							
						 
						
							 
							
							
							
							
								
							
							
								979df9ac80 
								
							 
						 
						
							
							
								
								daily commit  
							
							 
							
							
							
						 
						
							2013-01-23 18:51:18 +08:00  
						
					 
				
					
						
							
							
								 
								Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								0cc616f988 
								
							 
						 
						
							
							
								
								page can use default widget  
							
							 
							
							
							
						 
						
							2013-01-21 16:56:37 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								91830f86aa 
								
							 
						 
						
							
							
								
								Fix bug for mobile app routes  
							
							 
							
							
							
						 
						
							2013-01-16 08:14:42 +08:00  
						
					 
				
					
						
							
							
								 
								Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								e1e003af6e 
								
							 
						 
						
							
							
								
								Complete new interface  
							
							 
							
							
							
						 
						
							2013-01-14 19:18:25 +08:00  
						
					 
				
					
						
							
							
								 
								Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								16cfd27fe9 
								
							 
						 
						
							
							
								
								apply view  
							
							 
							
							
							
						 
						
							2013-01-14 19:18:25 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								bf31d0c3dd 
								
							 
						 
						
							
							
								
								modularized personal journal  
							
							 
							
							
							
						 
						
							2013-01-14 17:54:52 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								141eb7e723 
								
							 
						 
						
							
							
								
								Add mobile but remove news in it  
							
							 
							
							
							
						 
						
							2013-01-14 17:38:44 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								84e4a558be 
								
							 
						 
						
							
							
								
								member roles edit  
							
							 
							
							
							
						 
						
							2013-01-14 17:02:51 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								4e2cbac027 
								
							 
						 
						
							
							
								
								Remove bottom padding if no footer in mobile  
							
							 
							
							... 
							
							
							
							Add a method in routes
Copy mobile routes under the scope 'app' for app usage 
							
						 
						
							2013-01-11 19:14:48 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								02e5e52159 
								
							 
						 
						
							
							
								
								Translation typo  
							
							 
							
							... 
							
							
							
							Remove test values in ad_image form
Remove NeedReset 
							
						 
						
							2013-01-09 21:17:50 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								1d405c3ffe 
								
							 
						 
						
							
							
								
								Add "tag" icon to orbit bar  
							
							 
							
							
							
						 
						
							2013-01-09 21:17:50 +08:00  
						
					 
				
					
						
							
							
								 
								Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								5ab4bbd367 
								
							 
						 
						
							
							
								
								add ad_banner inner page,pic title.  
							
							 
							
							
							
						 
						
							2013-01-09 16:54:33 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								fac4faad6c 
								
							 
						 
						
							
							
								
								Change date picker  
							
							 
							
							
							
						 
						
							2013-01-09 05:18:16 +08:00  
						
					 
				
					
						
							
							
								 
								Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								81d4481797 
								
							 
						 
						
							
							
								
								Merge commit '5b13c53ed99858f69d19bd03fe1a6bb74071a007' into sidebar_config  
							
							 
							
							
							
						 
						
							2013-01-08 14:18:04 +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
							
						 
						
							 
							
							
							
							
								
							
							
								e3d34263e3 
								
							 
						 
						
							
							
								
								Schedule job for tag_cloud  
							
							 
							
							
							
						 
						
							2013-01-08 12:36:50 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								a34da20e48 
								
							 
						 
						
							
							
								
								Merge branch 'master' into desktop  
							
							 
							
							... 
							
							
							
							* master: (57 commits)
  Add translations
  Add mobile version in site settings
  Add mobile but remove news in it
  Remove mysql
  Fix album widget options
  Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
  Add link to default widget (temporary)
  Ika's fix for width
  Ika's fix for width
  Gallery i18n
  Ika's changes for css default widgets
  Ika's changes for css default widgets
  change bulletin object to bulletin title
  fixing default widget error when needs image
  make default widget works without init
  Fix order in structure
  Fix old tags
  correct pic file format
  complete page error handler logic
  change sub_menu to header in site setting
  ... 
							
						 
						
							2013-01-07 16:44:05 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								4ee683aa9b 
								
							 
						 
						
							
							
								
								fixed desktop route  
							
							 
							
							
							
						 
						
							2013-01-07 16:38:02 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								83935aaa60 
								
							 
						 
						
							
							
								
								Add translations  
							
							 
							
							
							
						 
						
							2013-01-07 10:42:17 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								6c6bda988d 
								
							 
						 
						
							
							
								
								Add mobile version in site settings  
							
							 
							
							
							
						 
						
							2013-01-07 03:57:36 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								37740adb24 
								
							 
						 
						
							
							
								
								Add mobile but remove news in it  
							
							 
							
							
							
						 
						
							2013-01-07 03:03:38 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								9745bcf7f1 
								
							 
						 
						
							
							
								
								Remove mysql  
							
							 
							
							
							
						 
						
							2013-01-07 03:02:16 +08:00  
						
					 
				
					
						
							
							
								 
								Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								a70110f787 
								
							 
						 
						
							
							
								
								make default widget works without init  
							
							 
							
							
							
						 
						
							2013-01-03 19:38:14 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								cb3a9ea98b 
								
							 
						 
						
							
							
								
								change sub_menu to header in site setting  
							
							 
							
							
							
						 
						
							2013-01-03 14:46:02 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								ec96a2e0e7 
								
							 
						 
						
							
							
								
								Add page counter  
							
							 
							
							
							
						 
						
							2012-12-28 10:36:18 +08:00  
						
					 
				
					
						
							
							
								 
								Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								0655baab19 
								
							 
						 
						
							
							
								
								make longer devise timeout  
							
							 
							
							
							
						 
						
							2012-12-27 15:05:53 +08:00