This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.
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 |
.. |
admin
|
fix ajax error when edit new page
|
2013-01-24 13:39:08 +08:00 |
admin_helper.rb
|
default widgets and sidebar.
|
2012-12-24 16:38:35 +08:00 |
application_helper.rb
|
ika re-redesign module widget
|
2013-01-16 14:07:09 +08:00 |
attribute_fields_helper.rb
|
Change translation
|
2013-01-14 17:02:51 +08:00 |
attribute_values_helper.rb
|
Translation changes
|
2012-12-03 23:00:04 +08:00 |
default_widget_helper.rb
|
daily commit
|
2013-01-23 18:51:18 +08:00 |
front_helper.rb
|
Fix for link in ad banner
|
2013-01-11 11:28:13 +08:00 |
orbit_backend_helper.rb
|
Merge branch 'various_bugs' into nccu_master
|
2012-10-29 16:10:07 +08:00 |
orbit_form_helper.rb
|
Update disable time when separated picker new or reset date
|
2013-01-09 21:17:50 +08:00 |