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

1718 Commits

Author SHA1 Message Date
Harry Bomrah 57a64dc378 mini colors in new ui fixed 2013-07-23 12:12:46 +08:00
chris 0d0f85e7ad Fix tooltip in form 
Change form_file
 2013-07-22 20:54:40 +08:00
Spen 5d3bc07488 archive and web_resouce for new ui 
Conflicts:
	app/assets/stylesheets/lib/main-forms.css
 2013-07-22 18:14:33 +08:00
chris 1ba1703e90 Fix get_viewable 2013-07-22 17:41:52 +08:00
chris 6cf249ccfb Change ckeditor gem and kaminari in gemfile 2013-07-22 17:26:32 +08:00
chris 92faeccdb6 Revert change in main-form and change class name of form_file 2013-07-22 17:24:58 +08:00
chris 5284571300 Add tooltip to bulletin form and remove file 2013-07-22 16:55:02 +08:00
chris fe82427baa Ray's changes for css and js 2013-07-22 16:31:44 +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 7ea9945af0 Location - category fixes 
Conflicts:
	app/models/category.rb
	vendor/built_in_modules/location/init.rb
 2013-07-22 12:17:29 +08:00
saurabhbhatia 109b891b27 Merge branch 'development' of https://github.com/Rulingcom/orbit into development 2013-07-19 17:39:55 +08:00
chris 1db324d1a2 Fix get_sorted_and_filtered 2013-07-19 17:38:43 +08:00
chris 5190c1160a Fix get_sorted_and_filtered, accepts 3 arguments and works for category 2013-07-16 14:43:56 +08:00
chris 62288a71ca Fix category_id in forms 
Fix statuses list
 2013-07-16 11:41:22 +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 2c331bf1a5 Revert non rulingcom email constraint 2013-07-04 14:20:13 +08:00
chris bec0bd76e4 Replace get_categories by categories 2013-07-04 12:33:28 +08:00
chris 5457afdada Rename global.css to global.css.erb 2013-07-02 17:42:15 +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
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
Matthew K. Fu JuYuan d3f0a10187 fix default setting for partial category selection error,due to API changing. 2013-06-17 15:26:43 +08:00
chris c1bd135595 Fix sortable when there's no record 2013-06-14 15:26:12 +08:00
Matt K. Fu e20df41db5 add user log link at site page 2013-06-14 15:24:04 +08:00
chris e68793afc3 Fix tag delete 2013-06-14 15:23:45 +08:00
iCross f3e1f4057d ask module update css 2013-06-07 13:04:00 +08:00
iCross e353961b21 ask moudule: add ask.css 2013-06-07 13:04:00 +08:00
iCross dcc5fc39a7 ask module: dropdown, icon, big5 encoding, redirect, admin, send mail 2013-06-07 13:03:59 +08:00
chris 0904978292 Remove non resolved conflict 2013-06-07 13:02:47 +08:00
iCross ddd9a9668e Merge branch 'lukas/picked_archive' into development 2013-06-06 23:12:30 +08:00
iCross a468b69013 archive module: fix old data caused error 2013-06-06 23:11:24 +08:00
iCross b6c8a88b73 Merge branch 'lukas/picked_archive' into development 2013-06-06 22:27:08 +08:00
iCross 5b7ac1a22b archive module: add sort feature to achive files 2013-06-06 22:20:27 +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 d2f131d160 survey module: update css 
Conflicts:

	app/assets/stylesheets/questionnaire.css
 2013-06-06 18:43:28 +08:00
iCross 8d71c377f2 fix datepicker helper hidden field value 2013-06-06 18:42:26 +08:00
iCross 21bf3a0ccd standalone css and icon 2013-06-06 18:41:27 +08:00
iCross 443d1c4fbe csv stats & required start 2013-06-06 18:38:47 +08:00
iCross 531cee70d2 fix 2013-06-06 18:31:28 +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
Lukas 51640423a7 survey module initial 2013-06-06 18:26:41 +08:00
Matt K. Fu dd206437d8 apply tags and cates for fronted. from now app developer can use param category_id and tag_id freely. 2013-06-06 17:39:36 +08:00
Matt K. Fu 7729161123 fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up. 2013-06-06 17:38:17 +08:00
Matthew K. Fu JuYuan 5c94200b77 fix argument passing problem for more link and tag cloud, incomplete code. 2013-06-06 17:21:27 +08:00
Matt K. Fu 6b8b749b0f fix chris tag cloud 2013-06-06 17:18:42 +08:00