developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,834 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

988 Commits

Author SHA1 Message Date
Harry Bomrah 6ae4e4d0ef layout fix 2013-03-04 15:48:24 +08:00
Harry Bomrah 9a32732ae4 layout fix 2013-03-04 14:57:36 +08:00
Fu Matthew 15b9839b76 fix archive category 
fix page adding failed
 2013-03-04 14:40:29 +08:00
Harry Bomrah e69679d3fe tinyscrollbar_bug fixed 2013-03-04 12:37:29 +08:00
Harry Bomrah 2ead541733 url handling modified.. tinyscrollbar modified… star checkbox fixed.. 2013-03-04 12:37:29 +08:00
Harry Bomrah 23c8c28b52 tinyscrollbar fixed 2013-03-04 12:37:29 +08:00
Rueshyna ee4b94ace0 Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop 
* 'desktop' of https://github.com/Rulingcom/orbit:
  fix widget field reload
  link to more
  fix default widget link
  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
  fix javascript disable checkbox failed after cate and tags being reloaded.
  first version of multi categories and tags
  fix widget field reload
  link to more
  fix default widget link
  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
  fix javascript disable checkbox failed after cate and tags being reloaded.
  first version of multi categories and tags
 2013-03-04 12:17:14 +08:00
Rueshyna 8f1d7b55ab authors auto-complete 2013-03-04 12:16:46 +08:00
Rueshyna e99fef9404 fixed paper title and journal title bug 2013-03-04 11:45:39 +08:00
Harry Bomrah c1cb5e5ffb tinyscrollbar_bug fixed 2013-03-01 17:49:58 +08:00
Harry Bomrah 9b8ab2a2c1 url handling modified.. tinyscrollbar modified… star checkbox fixed.. 2013-03-01 14:45:20 +08:00
Harry Bomrah c82e9a646d tinyscrollbar fixed 2013-02-27 18:55:26 +08:00
Fu Matthew 071e8a349c link to more 2013-02-27 10:50:50 +08:00
Rueshyna 4bc3a57862 give back and cancel button a link for personal conference 2013-02-26 18:37:58 +08:00
Rueshyna f431ab9ab5 give back and cancel button a link for personal journal 2013-02-26 18:37:33 +08:00
Rueshyna fb931b0a4a Merge remote-tracking branch 'origin/desktop' into desktop 
* origin/desktop:
  Remove Gemfile.lock
  sort conference and type
  add conferene list order function
  css minor changes.
  gridster, url code fixed, views removed.
  Fix selection of sub_menu for widget (the value wasn't set)
  Fix bug in widget selection
  css minor changes.
  Fix public_r_tag selection
  gridster, url code fixed, views removed.
 2013-02-26 17:02:01 +08:00
Rueshyna 6c9e2a7249 fixed journal co author bug 2013-02-26 16:57:08 +08:00
Rueshyna d0b54a4d6c done conferece seeds 2013-02-26 15:52:42 +08:00
Rueshyna 81725ed942 split db/seeds.rb file to local plugin and done journal 2013-02-26 15:52:20 +08:00
Rueshyna c55f64f3c6 correct view permission of conference 2013-02-26 15:17:09 +08:00
Rueshyna 4ac0f19011 generate journal page by rails side and fixed model name bug 2013-02-26 15:15:09 +08:00
Rueshyna 6f599bb95d sort conference and type 2013-02-25 12:01:59 +08:00
Rueshyna 522e0481e1 add conferene list order function 2013-02-25 12:01:59 +08:00
Rueshyna 8b0ffe747c sort conference and type 2013-02-25 11:46:20 +08:00
Rueshyna 6929d30b5d add conferene list order function 2013-02-25 11:46:11 +08:00
Harry Bomrah 9f362d9ae6 gridster, url code fixed, views removed. 2013-02-25 11:08:56 +08:00
spen cd98f9c889 member plugin init add frontend 2013-02-22 18:21:11 +08:00
chris 8704fb30d5 Fix init name/key 2013-02-22 14:46:22 +08:00
chris 9a63adedde Remove seminar from conference init 2013-02-22 11:57:10 +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
Rueshyna 79f0fc1a3b add announcement header translation file 2013-02-21 14:10:42 +08:00
Rueshyna 4ee85a8c09 add coauthor and coauthor relation function 2013-02-21 13:58:47 +08:00
Rueshyna 13c757e8a9 clean add/edit page and add conference list page 2013-02-21 13:58:30 +08:00
Rueshyna 16fda25ace done personal conference add/edit page 2013-02-21 13:53:50 +08:00
Rueshyna 6d65af0312 done personal conference list page, but it need to js. 2013-02-21 13:53:50 +08:00
Rueshyna 2afbae7c08 make a fake data for personal conference plugin 2013-02-21 13:53:50 +08:00
Rueshyna 1c4b696052 add add/edit form page and controller 2013-02-21 13:53:50 +08:00
Rueshyna 54b12a193a add translation configuration 2013-02-21 13:53:47 +08:00
Rueshyna 158fd8ffff fixed conference icon and rename _p to _window of conference view 2013-02-21 13:51:42 +08:00
Rueshyna f1db7be14e remove test and change for personal journal 2013-02-21 13:51:37 +08:00
Rueshyna a61ec183c9 change add/edit url of personal_conference 2013-02-21 13:50:12 +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 bc21840262 Comment out delete link for archive category 
Modify the import:
	- hot_news to announcement
	- iso_zone of 20000 to 21100
 2013-02-19 17:49:20 +08:00
chris c7cf587581 Fix web links html and index query 2013-02-19 17:39:43 +08:00
chris 236f68ba84 Fix archive module back end pagination and front end html 2013-02-19 17:39:43 +08:00
chris 61648d23e1 Change delete_all to destroy_all 2013-02-19 17:39:42 +08:00
chris 3676de8a14 Change validation for url: can include IPs 2013-02-19 17:39:42 +08:00
Rueshyna f3bfe67e68 breadcrumb widget of back-end has done, front-end has bug... 
Conflicts:

	app/controllers/front_controller.rb
	app/views/front/show_breadcrumb.html.erb
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb
 2013-02-19 17:39:41 +08:00
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
Fu Matthew a6f6dc271c fix i18n,reload problems 2013-02-18 15:13:31 +08:00
Fu Matthew 29bb92f841 fix member sidebar 
add i18n for modules and default_widgets
 2013-02-06 17:44:38 +08:00
Fu Matthew 8e7e601845 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config 2013-02-04 18:19:47 +08:00
Fu Matthew eed7a22dbe fix sidebar icon for page. 
fix i18n on sidebar
make sidebar sortable by changing db value. Need interface
 2013-02-04 18:14:00 +08:00
chris 2b3cbc50b3 Fix location namespace 2013-02-04 18:06:45 +08:00
chris 3791046e5a Add missing link to writing conference index 2013-02-04 18:01:42 +08:00
unknown e244493b55 member plugin edit 2013-02-04 18:01:42 +08:00
Rueshyna 8e98aa10bc modularize factories 2013-02-04 18:01:42 +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
Rueshyna e0fedb4454 change textfiled to bilingual for co_author 2013-02-04 18:01:03 +08:00
Rueshyna 85ca196dec add bilingual for personal journal 2013-02-04 18:01:03 +08:00
unknown 0b18cf48e3 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
unknown 8bf7d0f6f3 member plugin edit 2013-01-28 16:19:36 +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
unknown 781a0ad96e member roles edit 2013-01-18 11:25:11 +08:00
Rueshyna dca4f5d0be mv gallery_uploader 2013-01-16 01:35:38 +08:00
Rueshyna c44b4163e4 gprs byebye, location have two language, must have picture, long, lang have limit 2013-01-16 01:35:38 +08:00
Fu Matthew 91afad23ba Merge branch 'new_widget_setting_interface' 2013-01-15 12:03:56 +08:00
Fu Matthew 8413e31048 add i18n 2013-01-15 10:25:55 +08:00
unknown 504f5027cc member role edit 2013-01-14 19:00:08 +08:00
Rueshyna da283e136b correct personal journal language, but now hava no language config 2013-01-14 17:54:53 +08:00
Rueshyna 1b6bfdb80f modularize personal journal and pull relational setting in desktop/index.rb 2013-01-14 17:54:52 +08:00
Rueshyna 68e14a7898 move js file to relational module but have js require problem 2013-01-14 17:54:52 +08:00
Rueshyna 919f951981 restore js,journal_pages.js, 2013-01-14 17:54:52 +08:00
Rueshyna a183ac6041 fixed journal type page 2013-01-14 17:54:52 +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
chris de39bce4ce Fix the tooltips 2013-01-11 12:13:16 +08:00
chris b90e8efb1f Fix filter not collapsing 
Fix icon size for button
 2013-01-11 11:37:11 +08:00
chris 41dff814fb Change icons 2013-01-09 21:17:50 +08:00
Fu Matthew 614b6fde71 fix wrong html structure for announcement frontend 2013-01-09 12:13:55 +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 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
chris be00cec4d7 Fix link for ad_banner 
Add missing helper for web_link_category
Show design's js in front-end
 2013-01-07 00:36:48 +08:00
chris 7e045959b6 Gallery i18n 2013-01-04 12:01:32 +08:00
Rueshyna 8815533075 correct pic file format 2013-01-03 18:32:32 +08:00
Fu Matthew 5d6279a9ea fix calendar broken 2013-01-03 10:58:52 +08:00
Rueshyna f67664df29 custom icon for msoffice 2013-01-02 17:35:21 +08:00
Rueshyna 5f7453c3fb generalization file type 2013-01-02 16:58:48 +08:00
Rueshyna f4692182c0 when mouse move to button of announcement file : image => preview pic, file => type 2013-01-02 16:34:38 +08:00