saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/models
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
..
design Change the design for the whole site form designs index 2012-12-07 12:14:31 +08:00
desktop delete onside widget in db 2012-12-06 07:59:42 +08:00
meta Remove i18n_variable for controllers, helpers and models 2012-07-27 19:13:39 +08:00
purchase Merge with sub_roles 2011-12-23 18:34:21 +08:00
user member role edit 2013-01-14 19:00:08 +08:00
ad_banner.rb Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working 2012-06-20 14:50:51 +08:00
ad_image.rb Put back some field so ad_image can work 2013-01-10 11:08:57 +08:00
app_auth.rb First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
app_manager.rb fix object auth without app_auth 2012-10-16 14:23:44 +08:00
asset.rb Add time to announcement quick edit 2012-08-14 14:38:21 +08:00
asset_category.rb Remove i18n_variable for controllers, helpers and models 2012-07-27 19:13:39 +08:00
asset_tag.rb Add tags to assets 2012-05-16 18:19:41 +08:00
component.rb - No more Home object 2011-05-09 18:49:57 +08:00
i18n_variable.rb working cache 2012-07-13 15:36:10 +08:00
item.rb Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00
link.rb Put inc/ajax_setting in new_admin 2012-05-22 16:11:00 +08:00
module_app.rb Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config 2013-01-24 16:30:02 +08:00
object_auth.rb default widgets and sidebar. 2012-12-24 16:38:35 +08:00
page.rb Fix order in structure 2013-01-03 19:15:08 +08:00
page_part.rb daily commit 2013-01-23 18:51:18 +08:00
preview.rb preview for association object 2012-09-10 14:19:39 +08:00
preview_association.rb add missing file 2012-09-10 14:23:45 +08:00
preview_file.rb complete preview for both new and announcement 2012-09-07 17:55:59 +08:00
proto_tag.rb basic function 2012-09-17 13:32:52 +08:00
prototype_auth.rb fix bugs with token 2012-02-29 18:56:42 +08:00
session.rb Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
site.rb Add mobile version in site settings 2013-01-07 03:57:36 +08:00
sub_role_tag.rb basic function 2012-09-17 13:32:52 +08:00
tag.rb Schedule job for tag_cloud 2013-01-08 12:36:50 +08:00