Commit Graph

485 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan d047a3d62a chris tags update 2013-04-26 11:26:10 +08:00
Spen 697944a029 user id set & user fields set & role set & member frontend list & user translation & create new member bug fix 2013-04-25 19:59:59 +08:00
Matt K. Fu b198b1a17b system preference 2013-04-24 19:21:11 +08:00
Matt K. Fu 62fa589e8a add msg when user session expired at page admin 2013-04-24 11:58:48 +08:00
Matt K. Fu 5ff7dfbac6 fronted open switch and backend openness 2013-04-23 18:48:18 +08:00
Matt K. Fu 3de4591413 fix frontend ajax respond 404 due to javascript overwritten after assets precompile 2013-04-17 14:19:32 +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
Fu Matthew 9815950083 now default options can be chosen by developer at init 2013-04-17 11:07:45 +08:00
Fu Matthew 69a49a69aa style for front end 2013-04-17 11:05:57 +08:00
Fu Matthew 8e98cb3ec9 put add admin pages using orbit back end controller 2013-04-17 10:54:38 +08:00
chris b864cc0268 Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
Spen d7d480ac12 archive edit & plugins edit 2013-03-07 21:12:31 +08:00
Fu Matthew 15b9839b76 fix archive category
fix page adding failed
2013-03-04 14:40:29 +08:00
Fu Matthew 0dabd5b95f fix widget field reload 2013-02-27 10:51:41 +08:00
Fu Matthew 071e8a349c link to more 2013-02-27 10:50:50 +08:00
Fu Matthew 8a8bfcb8fb fix default widget link 2013-02-27 10:50:47 +08:00
Fu Matthew d7699e1a46 fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init 2013-02-27 10:49:51 +08:00
Fu Matthew 0e6599e9b9 fix javascript disable checkbox failed after cate and tags being reloaded. 2013-02-27 10:49:51 +08:00
Fu Matthew 99e67c8719 first version of multi categories and tags 2013-02-27 10:49:48 +08:00
chris 3572856486 Fix selection of sub_menu for widget (the value wasn't set) 2013-02-25 10:35:59 +08:00
chris caac9191ce Fix public_r_tag selection 2013-02-23 16:52:37 +08:00
unknown d46abd7caf member list edit 2013-02-21 14:13:46 +08:00
chris 1f11293fbe Fix sitemap in page edit 2013-02-19 17:39:43 +08:00
Rueshyna 2a61470f8b back_end widget breadcrumb finish 2013-02-19 17:24:19 +08:00
Fu Matthew 0a115906f1 fix i18n,reload problems 2013-02-19 14:21:54 +08:00
chris 9771d42587 migrate for app config. fix panel style intro misplace 2013-02-04 18:10:39 +08:00
chris b1a11b4dad Remove isotope 2013-02-04 18:01:42 +08:00
unknown 0b18cf48e3 member roles edit 2013-02-04 18:01:03 +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
Fu Matthew 9630d0a841 Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface 2013-01-16 14:09:05 +08:00
Fu Matthew 9edf0dca54 ika re-redesign module widget 2013-01-16 14:07:09 +08:00
Fu Matthew 91afad23ba Merge branch 'new_widget_setting_interface' 2013-01-15 12:03:56 +08:00
Fu Matthew ba75c02622 fix wrong behavior of new interface when a new page is newed 2013-01-15 12:02:13 +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
unknown 504f5027cc member role edit 2013-01-14 19:00:08 +08:00
Fu Matthew 46b1d55ff6 Complete new interface 2013-01-14 18:49:23 +08:00
unknown 84e4a558be member roles edit 2013-01-14 17:02:51 +08:00
chris de39bce4ce Fix the tooltips 2013-01-11 12:13:16 +08:00
Fu Matthew ca51ebc08c apply view 2013-01-10 18:00:58 +08:00
chris 02e5e52159 Translation typo
Remove test values in ad_image form
Remove NeedReset
2013-01-09 21:17:50 +08:00
chris b49251afee Date picker separated: reset time when reset date 2013-01-09 21:17:50 +08:00
chris 41dff814fb Change icons 2013-01-09 21:17:50 +08:00