developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/views/admin
History
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
..
ad_banners Translation typo 2013-01-09 21:17:50 +08:00
ad_images Fix the tooltips 2013-01-11 12:13:16 +08:00
app_auths Translation changes 2012-12-03 23:00:04 +08:00
asset_categories Translation changes 2012-12-03 23:00:04 +08:00
assets Translation changes 2012-12-03 23:00:04 +08:00
attributes member role edit 2013-01-14 19:00:08 +08:00
components Translation changes 2012-12-03 23:00:04 +08:00
dashboards Change icons 2013-01-09 21:17:50 +08:00
designs Remove test 2012-12-07 12:32:43 +08:00
items soft structure order 2012-12-27 14:37:29 +08:00
links Translation changes 2012-12-03 23:00:04 +08:00
member_selects member selects 2012-11-26 10:25:34 +08:00
module_apps page can use default widget 2013-01-21 16:56:37 +08:00
module_apps_new_interface Translation changes 2012-12-03 23:00:04 +08:00
module_store Redirect to designs after buying template 2012-12-07 09:07:49 +08:00
object_auths Translation changes 2012-12-03 23:00:04 +08:00
object_auths_new_interface Translation changes 2012-12-03 23:00:04 +08:00
page_parts Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config 2013-01-24 16:30:02 +08:00
pages daily commit 2013-01-23 18:51:18 +08:00
plugins Change icons 2013-01-09 21:17:50 +08:00
purchases Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
roles member role edit 2013-01-14 19:00:08 +08:00
sites Add mobile version in site settings 2013-01-07 03:57:36 +08:00
tags Translation changes 2012-12-03 23:00:04 +08:00
template_store Redirect to designs after buying template 2012-12-07 09:07:49 +08:00
users_new_interface member role edit 2013-01-14 19:00:08 +08:00