saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,628 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

342 Commits

Author SHA1 Message Date
Fu Matthew 0a115906f1 fix i18n,reload problems 2013-02-19 14:21:54 +08:00
Fu Matthew b7d797f9dd fix member sidebar 
add i18n for modules and default_widgets
 2013-02-19 14:21:54 +08:00
Fu Matthew fcb49723b4 fix sidebar icon for page. 
fix i18n on sidebar
make sidebar sortable by changing db value. Need interface
 2013-02-19 14:21:53 +08:00
chris 9771d42587 migrate for app config. fix panel style intro misplace 2013-02-04 18:10:39 +08:00
Fu Matthew bbd30759f5 fix web resource frontend page 2013-02-04 18:01:42 +08:00
Rueshyna d4df7c82d3 relpace seminar to conference 2013-02-04 18:01:38 +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 fc702a6210 add front-end page for web_resource 2013-01-24 13:54:14 +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 46b1d55ff6 Complete new interface 2013-01-14 18:49:23 +08:00
Fu Matthew 5ab4bbd367 add ad_banner inner page,pic title. 2013-01-09 16:54:33 +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 b71ebb3982 clean default widget 2013-01-07 17:20:37 +08:00
Fu Matthew 5793f0fe5d default widget link. 
make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app
 2013-01-07 17:20:37 +08:00
chris c6111460f5 Fix album widget options 2013-01-07 00:40:43 +08:00
Fu Matthew 39f715319b Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 
Conflicts:
	lib/tasks/migrate.rake
 2013-01-03 19:41:52 +08:00
Fu Matthew a70110f787 make default widget works without init 2013-01-03 19:38:14 +08:00
chris fa83dbf791 Fix order in structure 2013-01-03 19:15:08 +08:00
Fu Matthew 6da528ef98 show error message when trying to show a not existed page 2013-01-03 13:50:27 +08:00
Fu Matthew 5d6279a9ea fix calendar broken 2013-01-03 10:58:52 +08:00
Fu Matthew 641b5310b0 fix NTU album module_app data 2013-01-02 16:04:11 +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
chris 2d8400d1cc Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-28 15:34:24 +08:00
chris 61b0f94c04 Remove I18n.locale for announcement front-end 
Fix counter in back-end edit
 2012-12-28 15:34:04 +08:00
Fu Matthew 5587e83419 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-28 15:31:32 +08:00
Fu Matthew baf1240b76 gallery options 2012-12-28 15:30:46 +08:00
chris 974a190eaf Fix orbit_front parser 2012-12-28 11:51:56 +08:00
chris 0a0298aaad Fix counter front-end 2012-12-28 11:44:33 +08:00
chris 37309a452d Fix site map and menu order 2012-12-28 11:37:37 +08:00
chris ec96a2e0e7 Add page counter 2012-12-28 10:36:18 +08:00
chris 751d3b1220 Announcement widget: remove I18n.locale 
Add part_id in url
 2012-12-27 16:52:58 +08:00
chris 269e5b033f Fix for page_part and widget back-end 2012-12-27 16:20:40 +08:00
Fu Matthew 2d6b70b97f regenerate pageparts 2012-12-27 15:50:05 +08:00
Rueshyna 81b0e3c38f change ActiveSupport::SecureRandom to SecureRandom in orbit core 2012-12-27 12:19:42 +08:00
Matthew K. Fu JuYuan 71fc85c24e fix widget. 2012-12-26 19:01:17 +08:00
Matthew K. Fu JuYuan 47a63e3dab fix widget. 2012-12-25 10:45:08 +08:00
Matthew K. Fu JuYuan 062ebecae3 fix serval bugs on sidebar. 2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan 53afb6ea0c sidebar rewrited 2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan 5f712622ad default widgets and sidebar. 2012-12-24 16:38:35 +08:00
Matthew K. Fu JuYuan 6995bb1622 put module app json into init,making orbit app work with module app. 2012-12-24 16:23:16 +08:00
Matthew K. Fu JuYuan 36f6a6fdd6 first version of confined sidebar render 2012-12-24 16:17:00 +08:00
Matthew K. Fu JuYuan b89cd80800 fix widget bug 2012-12-24 14:04:32 +08:00
chris 3c79200c2f Fix wrong deletion in parser for gallery 2012-12-20 16:02:03 +08:00
chris fcbba6660b Only one parser for front end 
Separate site map for i18n
 2012-12-19 17:15:31 +08:00
chris fbe2b26e9f Do not create layout part if it already exists 2012-12-03 18:59:32 +08:00
Matthew K. Fu JuYuan 77386f0284 disable data transform when switching attribute field type. new member stable 2012-11-22 21:10:35 +08:00
chris 475642d375 Remove news and fix default_url in ImageUploader 2012-11-22 09:30:25 +08:00
chris 2d0e8b37b2 Fix: 
- Widgets for announcement
  - Facebook link
  - AdBanner nav
 2012-11-21 18:42:14 +08:00