Commit Graph

344 Commits

Author SHA1 Message Date
Matt K. Fu 5ff7dfbac6 fronted open switch and backend openness 2013-04-23 18:48:18 +08:00
Matt K. Fu 425a320c02 fix widget and fronted setting interface. checked with Spen 2013-04-17 14:16:24 +08:00
Matt K. Fu 0781779ac0 solved conflicts 2013-04-17 14:14:24 +08:00
Matt K. Fu 0f6f5aafce fix for both part and page part settings
Conflicts:
	app/helpers/admin/page_parts_helper.rb
	app/views/admin/pages/reload_front_end_setting.js.erb
	app/views/admin/pages/reload_frontend_pages.js.erb
2013-04-17 14:12:52 +08:00
Fu Matthew f6b600df59 deliver API 2013-04-17 14:09:01 +08:00
chris 6af375efa4 Fix bug in setup_app_frontend_and_style 2013-04-17 14:09:00 +08:00
Fu Matthew 1709773b0a style for front end 2013-04-17 14:08:01 +08:00
Fu Matthew 6efef253a6 add conditions for making multi cates and tags more stable 2013-04-17 11:08:57 +08:00
Fu Matthew 4a08a1992b 1.make module app forbid unearthed access except from admin
2.override sidebar link when it's object_auth or app_auth.
2013-04-17 10:56:15 +08:00
Fu Matthew 8e98cb3ec9 put add admin pages using orbit back end controller 2013-04-17 10:54:38 +08:00
chris 3e96cfe514 Changes for FAQ to work with not latest but stable code 2013-03-28 15:05:52 +08:00
chris ff30b3d05e Fix link not showing for default front end 2013-03-19 18:23:35 +08:00
chris f3c809fd58 Fix link switch not showing for default front end 2013-03-19 17:49:46 +08:00
chris e208e99a73 Fix page part update when no tag or category 2013-03-13 15:45:30 +08:00
Spen d7d480ac12 archive edit & plugins edit 2013-03-07 21:12:31 +08:00
chris 147b7b9292 Fix update when no tag or category 2013-03-07 17:30:49 +08:00
Fu Matthew 285119a5f3 fix for multi select cates and tags 2013-03-04 19:29:45 +08:00
Fu Matthew 0dabd5b95f fix widget field reload 2013-02-27 10:51:41 +08:00
Fu Matthew 8a8bfcb8fb fix default widget link 2013-02-27 10:50:47 +08:00
Fu Matthew 99e67c8719 first version of multi categories and tags 2013-02-27 10:49:48 +08:00
chris 5b0b8e6c79 Fix bug in widget selection 2013-02-23 17:25:07 +08:00
chris caac9191ce Fix public_r_tag selection 2013-02-23 16:52:37 +08:00
chris 680d7908b9 member plugin init edit 2013-02-21 17:53:08 +08:00
unknown d46abd7caf member list edit 2013-02-21 14:13:46 +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 9e9620c04a Fix item looking for widget when no front end 2013-02-19 18:09:54 +08:00
chris 17ac564fbb Fix sitemap nil
Fix namespace of role in subrole
2013-02-19 17:39:43 +08:00
chris 61648d23e1 Change delete_all to destroy_all 2013-02-19 17:39:42 +08:00
Fu Matthew 0a115906f1 fix i18n,reload problems 2013-02-19 14:21:54 +08:00
Fu Matthew a6f6dc271c fix i18n,reload problems 2013-02-18 15:13:31 +08:00
chris e9f2983176 Fix page part kind being removed 2013-02-04 18:02:09 +08:00
unknown 18a51f070e member roles edit 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
unknown d0dcd71707 member roles edit 2013-01-18 11:25:11 +08:00
Fu Matthew e1e003af6e Complete new interface 2013-01-14 19:18:25 +08:00
unknown 504f5027cc member role edit 2013-01-14 19:00:08 +08:00
unknown 84e4a558be member roles edit 2013-01-14 17:02:51 +08:00
Fu Matthew b950ad64c0 fix for fronted editing not responding for announcement. 2013-01-10 18:17:27 +08:00
chris 1d80b39dcb Fix no responding when trying to access front end page 2013-01-09 11:23:18 +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
Fu Matthew 7594e1b9a6 fix member has no module_app 2013-01-07 17:20:37 +08:00
chris c6111460f5 Fix album widget options 2013-01-07 00:40:43 +08:00
chris 5b289bc1d2 Fix old tags 2013-01-03 19:15:08 +08:00
Fu Matthew 32c6f17613 fix object auth. show error message if user try to do object auth in a wrong way. 2013-01-02 14:34:34 +08:00
Fu Matthew baf1240b76 gallery options 2012-12-28 15:30:46 +08:00