developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,619 Commits 9 Branches 0 Tags 55 MiB
Commit Graph

3619 Commits

Author SHA1 Message Date
Spen 07b3857465 archive app Category Authorization fix 2013-06-26 17:44:31 +08:00
Spen 8751b15385 archive app add Module Authorization & Category Authorization 2013-06-26 15:35:35 +08:00
Matt K. Fu 6a40a9555a fix query for un-permitted category use 2013-06-26 12:28:14 +08:00
Matt K. Fu 869f3b6815 fix object de-authorize failed. 2013-06-26 12:28:00 +08:00
Harry Bomrah 465d417c35 fixed updated method of events.. was having week error when updating events 2013-06-26 12:27:23 +08:00
Harry Bomrah eaf7577810 small syntax error missed out yesterday fixed. 2013-06-26 12:26:52 +08:00
Harry Bomrah 22358bd862 Small change for creating events when calendar is not selected 2013-06-26 12:26:24 +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 be6d185be7 Merge branch 'scandary_site_god_setting_feature' into development 2013-06-20 17:55:43 +08:00
Matt K. Fu 113ed17fb5 Merge branch 'solr_god_feature' into development 2013-06-20 17:54:47 +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
Matt K. Fu 1268ce0ae9 remove useless setting for solar 2013-06-20 17:42:00 +08:00
Harry Bomrah d089822ff3 fixed updated method of events.. was having week error when updating events 2013-06-20 12:47:44 +08:00
Harry Bomrah 777af19abb small syntax error missed out yesterday fixed. 2013-06-20 11:55:06 +08:00
Matt K. Fu cd55f2aac2 fix solr setting 2013-06-19 19:23:45 +08:00
Harry Bomrah 07e895fc42 Small change for creating events when calendar is not selected 2013-06-19 17:27:13 +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
Matt K. Fu c4ec6c1ac9 fix solr name 2013-06-19 16:24:56 +08:00
Matt K. Fu 6f46a3f949 add god to monit sold 2013-06-19 16:11:16 +08:00
Matt K. Fu d78e816b4e from now on the rescue namespace will be decided by site object field: resque_namespace 2013-06-19 15:45:53 +08:00
Matt K. Fu e10eb833ed fix rescue scheduler space error 2013-06-19 15:43:02 +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
Matthew K. Fu JuYuan 256c51a970 add sold setting back 2013-06-17 13:45:30 +08:00
chris b674f47528 Remove Syslog 2013-06-14 15:30:22 +08:00
chris c1bd135595 Fix sortable when there's no record 2013-06-14 15:26:12 +08:00
iCross 96fc5ceea3 survey module: ensure the commit 2013-06-14 15:25:58 +08:00
iCross e48a1ffece archive module: add sort to frontend module 
Conflicts:

	vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb

Conflicts:
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb

Conflicts:
	vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
 2013-06-14 15:25:49 +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 2f7389ae24 ask module change mail view: <p>此為系統自動發信，請勿直接回覆</p> 2013-06-07 13:04:00 +08:00
iCross 110eab0496 ask module: add global smtp setting 2013-06-07 13:04:00 +08:00
iCross ccd760445d ask module: configure resque redis and namespace by config/initializers/resque.rb 2013-06-07 13:04:00 +08:00
iCross c7effcc96c ask module: create.js.erb 2013-06-07 13:04:00 +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 75e27ed849 ask module: default status 2013-06-07 13:04:00 +08:00
iCross 8541033ba9 ask module: send mail on development 2013-06-07 13:04:00 +08:00
iCross 467c2e8a3c ask module: fix 2013-06-07 13:04:00 +08:00
iCross b0640f925b ask module: fix some 2013-06-07 13:04:00 +08:00
iCross 841fa10c55 ask module: add rescue ackknowledgement 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
iCross 97df100c64 remove department 2013-06-07 13:03:59 +08:00
iCross ce180839f0 finish ask module 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