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

635 Commits

Author SHA1 Message Date
Fu Matthew 0a115906f1 fix i18n,reload problems 2013-02-19 14:21:54 +08:00
Fu Matthew 3a13ab4634 fix link for default widget 2013-02-18 17:03:18 +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
Rueshyna 8f334f6948 modularize conference 2013-02-04 18:01:42 +08:00
Rueshyna d4df7c82d3 relpace seminar to conference 2013-02-04 18:01:38 +08:00
unknown 18a51f070e member roles edit 2013-02-04 18:01:03 +08:00
chris 87a89f81ce Fix bug for mobile app routes 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
chris 91830f86aa Fix bug for mobile app routes 2013-01-16 08:14:42 +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
Rueshyna bf31d0c3dd modularized personal journal 2013-01-14 17:54:52 +08:00
Rueshyna 758cab5ecd move journal code to persional_journal modulaar 2013-01-14 17:53:59 +08:00
Rueshyna 284bf34fec amend file value to correct format 2013-01-14 17:53:59 +08:00
chris 282604d1fa Merge branch 'back' of github.com:Rulingcom/orbit into back 
Conflicts:
	app/assets/javascripts/mobile/orbit.mobile.js.erb
	app/assets/stylesheets/mobile.css
	app/assets/stylesheets/mobile/orbit-mobile.css.erb
	app/controllers/application_controller.rb
	app/controllers/mobile_controller.rb
	app/views/layouts/mobile.mobile.erb
	app/views/mobile/_footer.mobile.erb
	app/views/mobile/_header.mobile.erb
	app/views/mobile/_menu.mobile.erb
	app/views/mobile/index.mobile.erb
	config/routes.rb
 2013-01-14 17:46:27 +08:00
unknown 84e4a558be member roles edit 2013-01-14 17:02:51 +08:00
chris 4e2cbac027 Remove bottom padding if no footer in mobile 
Add a method in routes
Copy mobile routes under the scope 'app' for app usage
 2013-01-11 19:14:48 +08:00
Fu Matthew b950ad64c0 fix for fronted editing not responding for announcement. 2013-01-10 18:17:27 +08:00
Rueshyna 08adb887c5 change *default* to *defulat* 2013-01-10 09:40:52 +08:00
chris 41dff814fb Change icons 2013-01-09 21:17:50 +08:00
Fu Matthew 5ab4bbd367 add ad_banner inner page,pic title. 2013-01-09 16:54:33 +08:00
chris 1d80b39dcb Fix no responding when trying to access front end page 2013-01-09 11:23:18 +08:00
chris fac4faad6c Change date picker 2013-01-09 05:18:16 +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
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 6c6bda988d Add mobile version in site settings 2013-01-07 03:57:36 +08:00
chris 37740adb24 Add mobile but remove news in it 2013-01-07 03:03:38 +08:00
chris c6111460f5 Fix album widget options 2013-01-07 00:40:43 +08:00
Rueshyna 3e8b029c5f change bulletin object to bulletin title 2013-01-04 10:50:08 +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 5b289bc1d2 Fix old tags 2013-01-03 19:15:08 +08:00
Fu Matthew 1856d2395d complete page error handler logic 2013-01-03 15:35:14 +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 2c632551e5 fix preview filed after ad_banner created. 2013-01-02 17:51:53 +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 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 37309a452d Fix site map and menu order 2012-12-28 11:37:37 +08:00
Fu Matthew cfb65dd056 Preventing site default design being deleted. 2012-12-27 10:26:27 +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
chris 3a9106c10d Add mobile but remove news in it 2012-12-20 03:21:50 +08:00
Rueshyna b4633a2ccb .not_guest_user 2012-12-19 19:48:13 +08:00
Rueshyna 3d39c2c3c3 hidden guest user 2012-12-19 19:48:13 +08:00
chris fcbba6660b Only one parser for front end 
Separate site map for i18n
 2012-12-19 17:15:31 +08:00
Harry Bomrah 9dde79414d all sections and sections megerd 2012-12-07 12:38:23 +08:00
chris ff435a4af4 Change the design for the whole site form designs index 2012-12-07 12:14:31 +08:00
chris c74ead8318 Redirect to designs after buying template 
Randomise buy counts
 2012-12-07 09:07:49 +08:00
Rueshyna 39b5959de7 fixed bug about co-author-relation 2012-12-07 04:21:26 +08:00
chris af381e75de Add images to store 2012-12-07 02:37:05 +08:00
chris 6f1748d2b3 - template list/show is loaded from central server 
- buy a template downloads and creates it in DB
- changes in designs index
 2012-12-06 23:20:27 +08:00
Harry Bomrah 3d1fb48489 edit coauthor relation done 2012-12-06 07:59:44 +08:00
Rueshyna 4681f0ee36 sort co_author name 2012-12-06 07:59:44 +08:00
Rueshyna 6d08ca996f add back buton in relation page 2012-12-06 07:59:44 +08:00
Rueshyna b4a99e58cf sort author email 2012-12-06 07:59:44 +08:00
Rueshyna b89e371393 can update co-author relation 2012-12-06 07:59:43 +08:00
Rueshyna e7fdac1d23 make coauthor relation can be edit 2012-12-06 07:59:43 +08:00
Rueshyna 4ae7ac8388 clean route table about desktop 2012-12-06 07:59:42 +08:00
Rueshyna 05027afa63 make journal list easy to read 2012-12-06 07:59:42 +08:00
Rueshyna 4f31b1362b fixed new co-author relation bug.... 2012-12-06 07:59:42 +08:00
Rueshyna 1289ad9f9d fixed co-author relation bug.... 2012-12-06 07:59:42 +08:00
Rueshyna afd8e7e380 when delete co-author relation, the co-author will be reset nil 2012-12-06 07:59:42 +08:00
unknown 7d3c535e01 add info field 2012-12-06 07:58:39 +08:00
Rueshyna 9759a32394 can display relation between author 2012-12-04 00:31:46 +08:00
Harry Bomrah 49d1ca6997 new type fixed 2012-12-04 00:31:46 +08:00
Rueshyna e143f9a345 can select relection from relation db 2012-12-04 00:31:46 +08:00
Rueshyna 0affc73370 modify delete co-author message 2012-12-04 00:31:07 +08:00
Rueshyna 7822ffc33d can add relation between co-author 2012-12-04 00:31:06 +08:00
Rueshyna 5dabfe9319 refine co-authro page 2012-12-04 00:31:06 +08:00
Rueshyna 5986817e16 add journal_list. now, those pair, (journal_title, journal_levels), is uniq 2012-12-04 00:31:06 +08:00
Rueshyna 184f903b1c correct user passwd and sent json to front-end 2012-12-04 00:31:06 +08:00
Rueshyna 7f7b33f310 fixed journal update method 2012-12-04 00:31:06 +08:00
Harry Bomrah ee830f148e jumping menus updated.. 2012-12-04 00:30:10 +08:00
Rueshyna 5a9d9151d9 add journal list template 2012-12-04 00:25:58 +08:00
chris dc3be3c9a1 Translation changes 2012-12-03 23:00:04 +08:00
chris 036d7bbb0e Module store 2012-11-29 02:02:37 +08:00
chris 06335f9bd1 Joshua's html 2012-11-29 00:59:46 +08:00
Rueshyna 0125010a05 modified error msgs and cancle button, but those two have bug... 2012-11-26 15:45:51 +08:00
Rueshyna 065d38c797 add autocomplete js 2012-11-26 14:44:35 +08:00
unknown 8a79d7ff2e member selects 2012-11-26 10:25:34 +08:00
Rueshyna 9061448c5f add paper status textfield 2012-11-26 10:23:50 +08:00
Matthew K. Fu JuYuan 9a684f54b4 fix for showing subroles 2012-11-26 10:22:36 +08:00
chris 1e89c30150 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP 2012-11-26 05:02:58 +08:00
Harry Bomrah 3933c048b0 delete fixed 2012-11-23 13:22:01 +08:00
Rueshyna 8009c6aa34 fixed delete function 2012-11-23 12:28:36 +08:00
Rueshyna 996a69f595 add co-author json 2012-11-23 10:44:48 +08:00
Matthew K. Fu JuYuan 5b39d10ac6 user roles starts 2012-11-22 21:10:35 +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
Rueshyna e29583ed1f add delete link 2012-11-22 21:06:30 +08:00
Rueshyna 78500e0661 fixed add journal and co-author curd problem, but have redirect problem... 2012-11-22 21:06:30 +08:00
Rueshyna c281ae9447 hidden file field, and fixed updated function 2012-11-22 21:06:30 +08:00