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

546 Commits

Author SHA1 Message Date
chris da1d70efcb Change authorization to accept other than category 2013-07-25 17:36:55 +08:00
chris 0c208d0020 Remove some css causing errors in precompile 
Remove the image in announcement index
Set the db to test_site
 2013-07-25 13:15:49 +08:00
chris 0d0f85e7ad Fix tooltip in form 
Change form_file
 2013-07-22 20:54:40 +08:00
chris 2265b0b404 Fix no file in bulletin form 2013-07-22 17:41:21 +08:00
chris 6cf249ccfb Change ckeditor gem and kaminari in gemfile 2013-07-22 17:26:32 +08:00
rulingcom 408bebaa4b Ray's changes in structure 2013-07-22 14:06:58 +08:00
saurabhbhatia c8292a7619 Updated zh_tw translation for sidebar labels 
Conflicts:
	vendor/built_in_modules/location/config/locales/zh_tw.yml
 2013-07-22 12:17:31 +08:00
saurabhbhatia 91b1cf6edc Merge branch 'development' of https://github.com/Rulingcom/orbit into development 2013-07-11 17:18:58 +08:00
chris 1c4b66f1cb Fix approval in index 2013-07-10 16:42:25 +08:00
saurabhbhatia 72861f05a6 Merge branch 'development' of https://github.com/Rulingcom/orbit into development 
Conflicts:
	config/mongoid.yml
 2013-07-09 14:40:39 +08:00
chris 856898016b New UI changes(tags, categories, authorisations, module index…) 
To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
 2013-07-02 16:46:44 +08:00
Matt K. Fu 869f3b6815 fix object de-authorize failed. 2013-06-26 12:28:00 +08:00
Harry Bomrah 300de76c3a Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed. 2013-06-26 12:25:58 +08:00
Matt K. Fu c5ced8cf16 remove useless setting for solar 2013-06-20 17:50:18 +08:00
Matt K. Fu e037507b0e fix solr setting 2013-06-20 17:50:18 +08:00
Matt K. Fu 2f01b72ed0 fix solr name 2013-06-20 17:50:18 +08:00
Matt K. Fu cd6dd40f45 add god to monit sold 2013-06-20 17:50:18 +08:00
Matt K. Fu 345c471fc9 from now on the rescue namespace will be decided by site object field: resque_namespace 2013-06-20 17:50:17 +08:00
Matt K. Fu ed06be93d6 fix rescue scheduler space error 2013-06-20 17:50:17 +08:00
Harry Bomrah 80bf3499be Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed. 2013-06-19 17:16:52 +08:00
chris b674f47528 Remove Syslog 2013-06-14 15:30:22 +08:00
Matt K. Fu e20df41db5 add user log link at site page 2013-06-14 15:24:04 +08:00
iCross 110eab0496 ask module: add global smtp setting 2013-06-07 13:04:00 +08:00
iCross 8541033ba9 ask module: send mail on development 2013-06-07 13:04:00 +08:00
Matt K. Fu d5109c837c Merge branch 'lukas/picked_ques' into development 2013-06-06 19:59:30 +08:00
iCross c63ac751ea archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb 2013-06-06 19:20:21 +08:00
iCross 8c1e65994a Merge branch 'clean_development' into lukas/picked_ques 2013-06-06 19:08:59 +08:00
iCross 5ea0c5bd5c survey module: result chart display only other 
Conflicts:

	config/environments/production.rb
 2013-06-06 18:45:29 +08:00
Lukas adc15951bb questionnaire stuff 
Conflicts:

	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
 2013-06-06 18:29:58 +08:00
chris 253cca06cc New widget for tag cloud 2013-06-06 17:17:45 +08:00
Matt K. Fu 54a35b30be fix design index bug when start start from blank DB. 
add delay impressionist.
add several i18n vars
 2013-05-23 12:07:43 +08:00
Matt K. Fu 37aa950028 user action 2013-05-23 11:55:57 +08:00
Matt K. Fu ef2c732d2e make blank site working better 2013-05-14 11:26:35 +08:00
Matt K. Fu 88d55989de change logger 2013-05-14 10:29:11 +08:00
Matt K. Fu 7d077a92a5 system preference 2013-04-29 15:23:15 +08:00
Matt K. Fu 3e567223e3 fix for Spen's translation and Chris's tag error 2013-04-26 15:37:27 +08:00
Spen 79ef86f2c9 member translation fix 2013-04-26 11:26:11 +08:00
Matt K. Fu 2945e14385 use rack gridfs 2013-04-25 20:37:13 +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 12e39b4d77 fix rescue job won't start 2013-04-25 15:46:16 +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 fcfdd562a6 reverse harrys db setting 2013-04-17 14:29:56 +08:00
Harry Bomrah e2802d94d0 rake task added 2013-04-17 14:28:13 +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
Harry Bomrah dae3f069ff app manager changed plus some changes 2013-04-17 11:09:56 +08:00
Harry Bomrah b8ee2fd559 compatibility page added and tinyscrollbar drag event fixed.. 2013-04-17 11:07:20 +08:00
chris 4ebc8cbb77 Delete NTU's i18n 2013-03-27 16:30:35 +08:00
chris 535b373af0 Remove nccu's backup db schedule 2013-03-19 23:44:02 +08:00
chris aacfcf1997 Fix typo in translations 2013-03-18 21:52:52 +08:00
chris b864cc0268 Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
Fu Matthew 0dabd5b95f fix widget field reload 2013-02-27 10:51:41 +08:00
chris 680d7908b9 member plugin init edit 2013-02-21 17:53:08 +08:00
chris 4709c08ad1 Temporary fix zh_tw.yml 
New Gemfile.lock
 2013-02-21 14:43:49 +08:00
unknown d46abd7caf member list edit 2013-02-21 14:13:46 +08:00
Rueshyna 13c757e8a9 clean add/edit page and add conference list page 2013-02-21 13:58:30 +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 a9fecec985 Add pagination to default widget for front end page 2013-02-19 17:41:01 +08:00
Rueshyna 2a61470f8b back_end widget breadcrumb finish 2013-02-19 17:24:19 +08:00
Fu Matthew 0b88f7d1f8 deliver app config. fix wrong value cause error for default widget 2013-02-19 14:21:54 +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 96455f31e1 deliver app config. fix wrong value cause error for default widget 2013-02-18 19:04:04 +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
chris 981854870a Changes for mobile copyright 2013-02-04 18:02:11 +08:00
chris 6eb5061237 Changes for mobile map 2013-02-04 18:02:11 +08:00
Rueshyna d4df7c82d3 relpace seminar to conference 2013-02-04 18:01:38 +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
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
Fu Matthew 16cfd27fe9 apply view 2013-01-14 19:18:25 +08:00
Rueshyna bf31d0c3dd modularized personal journal 2013-01-14 17:54:52 +08:00
chris 141eb7e723 Add mobile but remove news in it 2013-01-14 17:38:44 +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
chris 02e5e52159 Translation typo 
Remove test values in ad_image form
Remove NeedReset
 2013-01-09 21:17:50 +08:00
chris 1d405c3ffe Add "tag" icon to orbit bar 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 fac4faad6c Change date picker 2013-01-09 05:18:16 +08:00
Fu Matthew 81d4481797 Merge commit '5b13c53ed99858f69d19bd03fe1a6bb74071a007' into sidebar_config 2013-01-08 14:18:04 +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
chris e3d34263e3 Schedule job for tag_cloud 2013-01-08 12:36:50 +08:00
Rueshyna a34da20e48 Merge branch 'master' into desktop 
* master: (57 commits)
  Add translations
  Add mobile version in site settings
  Add mobile but remove news in it
  Remove mysql
  Fix album widget options
  Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
  Add link to default widget (temporary)
  Ika's fix for width
  Ika's fix for width
  Gallery i18n
  Ika's changes for css default widgets
  Ika's changes for css default widgets
  change bulletin object to bulletin title
  fixing default widget error when needs image
  make default widget works without init
  Fix order in structure
  Fix old tags
  correct pic file format
  complete page error handler logic
  change sub_menu to header in site setting
  ...
 2013-01-07 16:44:05 +08:00
Rueshyna 4ee683aa9b fixed desktop route 2013-01-07 16:38:02 +08:00
chris 83935aaa60 Add translations 2013-01-07 10:42:17 +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 9745bcf7f1 Remove mysql 2013-01-07 03:02:16 +08:00
Fu Matthew a70110f787 make default widget works without init 2013-01-03 19:38:14 +08:00
Rueshyna cb3a9ea98b change sub_menu to header in site setting 2013-01-03 14:46:02 +08:00
chris ec96a2e0e7 Add page counter 2012-12-28 10:36:18 +08:00