Commit Graph

  • b3cdffb59e Fix typo chris 2013-07-27 15:57:14 +0800
  • fd432f30ba Fix cktext_area and removing of files and links chris 2013-07-27 15:50:34 +0800
  • 0be8a74fa8 Fix missing condition in index auth chris 2013-07-25 17:45:39 +0800
  • f60c190a11 Page module new UI chris 2013-07-25 17:37:11 +0800
  • da1d70efcb Change authorization to accept other than category chris 2013-07-25 17:36:55 +0800
  • 0c208d0020 Remove some css causing errors in precompile Remove the image in announcement index Set the db to test_site chris 2013-07-25 13:15:49 +0800
  • 1dc7884ec0 Changes for default index: - remove approvable and filterable - add display_option - change params Update web link and gallery index chris 2013-07-25 11:32:25 +0800
  • af0ab9f0d3 removed categories reference in event categories saurabhbhatia 2013-07-23 19:12:23 +0800
  • 9144622c41 Fixed index page for categories color saurabhbhatia 2013-07-23 18:57:29 +0800
  • 06ab24374b Gallery - categories, module_authorization and tags to new_ui saurabhbhatia 2013-07-11 18:48:51 +0800
  • c7cf7e1ce4 removed category_customizable saurabhbhatia 2013-07-23 12:25:39 +0800
  • 048f553be8 added timedifference gem to Gemfile required for calendar module saurabhbhatia 2013-07-23 12:18:36 +0800
  • 7e3993b67f removed old calendar and updated new calendar event category saurabhbhatia 2013-07-22 16:00:19 +0800
  • 8924d4f047 Fixed the sidebar order in calendar module saurabhbhatia 2013-07-22 10:20:29 +0800
  • 57a64dc378 mini colors in new ui fixed Harry Bomrah 2013-07-19 20:10:48 +0800
  • 3d3d5ed144 updated with fullcalendar.css, added front end page saurabhbhatia 2013-07-17 11:12:34 +0800
  • 4ff5724379 new ui for calendar fixed. Harry Bomrah 2013-07-15 17:54:15 +0800
  • 0d0f85e7ad Fix tooltip in form Change form_file chris 2013-07-22 20:54:40 +0800
  • de6ce0073f Fix category migration chris 2013-07-22 18:39:24 +0800
  • 5d3bc07488 archive and web_resouce for new ui Spen 2013-07-22 14:59:33 +0800
  • 1ba1703e90 Fix get_viewable chris 2013-07-22 17:41:52 +0800
  • 2265b0b404 Fix no file in bulletin form chris 2013-07-22 17:41:21 +0800
  • 6cf249ccfb Change ckeditor gem and kaminari in gemfile chris 2013-07-22 17:26:32 +0800
  • 92faeccdb6 Revert change in main-form and change class name of form_file chris 2013-07-22 17:24:58 +0800
  • 5284571300 Add tooltip to bulletin form and remove file chris 2013-07-22 16:55:02 +0800
  • fe82427baa Ray's changes for css and js chris 2013-07-22 16:31:44 +0800
  • 408bebaa4b Ray's changes in structure rulingcom 2013-07-22 13:45:13 +0800
  • c8292a7619 Updated zh_tw translation for sidebar labels saurabhbhatia 2013-07-05 11:33:46 +0800
  • 7ea9945af0 Location - category fixes saurabhbhatia 2013-07-08 17:34:32 +0800
  • 109b891b27 Merge branch 'development' of https://github.com/Rulingcom/orbit into development saurabhbhatia 2013-07-19 17:39:55 +0800
  • b642072cbe Removed the category reference for now saurabhbhatia 2013-07-19 17:31:10 +0800
  • 1db324d1a2 Fix get_sorted_and_filtered chris 2013-07-19 17:38:43 +0800
  • 0921d7731b my favorite update :) lazy loading for theater view plus a very smooth navigation of images. Harry Bomrah 2013-07-18 20:22:46 +0800
  • 3c0d2da9a7 description fixed for gallery Harry Bomrah 2013-07-18 17:20:46 +0800
  • e6c411b8e1 Updated tagging with galleries in new ui saurabhbhatia 2013-07-18 16:53:41 +0800
  • 1c558a1783 added tags to index page, added html safe for show saurabhbhatia 2013-07-17 19:49:04 +0800
  • 3287a2ef17 gallery migrated to new ui Harry Bomrah 2013-07-17 18:45:44 +0800
  • fc09ac3b68 Fix categorizable chris 2013-07-19 17:09:17 +0800
  • 5190c1160a Fix get_sorted_and_filtered, accepts 3 arguments and works for category chris 2013-07-16 14:43:56 +0800
  • 62288a71ca Fix category_id in forms Fix statuses list chris 2013-07-16 11:41:22 +0800
  • 91b1cf6edc Merge branch 'development' of https://github.com/Rulingcom/orbit into development saurabhbhatia 2013-07-11 17:18:58 +0800
  • 1c4b66f1cb Fix approval in index chris 2013-07-10 16:42:25 +0800
  • 72861f05a6 Merge branch 'development' of https://github.com/Rulingcom/orbit into development saurabhbhatia 2013-07-09 14:40:39 +0800
  • 2c331bf1a5 Revert non rulingcom email constraint chris 2013-07-04 14:20:13 +0800
  • bec0bd76e4 Replace get_categories by categories chris 2013-07-04 12:33:28 +0800
  • 6ce254a24c Fix no method error in tags chris 2013-07-04 12:07:09 +0800
  • 5530419395 Add missing method disable? for categorisable objects chris 2013-07-04 11:26:57 +0800
  • 5457afdada Rename global.css to global.css.erb chris 2013-07-02 17:42:15 +0800
  • 65527017ca Update new UI task to migrate the authorizations. PS: sold must be running for new_ui.rake chris 2013-07-02 17:26:02 +0800
  • 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) chris 2013-07-02 16:46:44 +0800
  • 07b3857465 archive app Category Authorization fix Spen 2013-06-26 17:44:31 +0800
  • 8751b15385 archive app add Module Authorization & Category Authorization Spen 2013-06-26 15:35:35 +0800
  • 6a40a9555a fix query for un-permitted category use Matt K. Fu 2013-06-26 10:46:50 +0800
  • 869f3b6815 fix object de-authorize failed. Matt K. Fu 2013-06-25 18:36:42 +0800
  • 465d417c35 fixed updated method of events.. was having week error when updating events Harry Bomrah 2013-06-20 12:47:44 +0800
  • eaf7577810 small syntax error missed out yesterday fixed. Harry Bomrah 2013-06-20 11:55:06 +0800
  • 22358bd862 Small change for creating events when calendar is not selected Harry Bomrah 2013-06-19 17:27:13 +0800
  • 300de76c3a Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed. Harry Bomrah 2013-06-19 17:16:52 +0800
  • be6d185be7 Merge branch 'scandary_site_god_setting_feature' into development Matt K. Fu 2013-06-20 17:55:43 +0800
  • 113ed17fb5 Merge branch 'solr_god_feature' into development Matt K. Fu 2013-06-20 17:54:47 +0800
  • c5ced8cf16 remove useless setting for solar Matt K. Fu 2013-06-20 17:42:00 +0800
  • e037507b0e fix solr setting Matt K. Fu 2013-06-19 19:23:45 +0800
  • 2f01b72ed0 fix solr name Matt K. Fu 2013-06-19 16:24:56 +0800
  • cd6dd40f45 add god to monit sold Matt K. Fu 2013-06-19 16:11:16 +0800
  • 345c471fc9 from now on the rescue namespace will be decided by site object field: resque_namespace Matt K. Fu 2013-06-19 15:45:53 +0800
  • ed06be93d6 fix rescue scheduler space error Matt K. Fu 2013-06-19 15:43:02 +0800
  • 1268ce0ae9 remove useless setting for solar Matt K. Fu 2013-06-20 17:42:00 +0800
  • d089822ff3 fixed updated method of events.. was having week error when updating events Harry Bomrah 2013-06-20 12:47:44 +0800
  • 777af19abb small syntax error missed out yesterday fixed. Harry Bomrah 2013-06-20 11:55:06 +0800
  • cd55f2aac2 fix solr setting Matt K. Fu 2013-06-19 19:23:45 +0800
  • 07e895fc42 Small change for creating events when calendar is not selected Harry Bomrah 2013-06-19 17:27:13 +0800
  • 80bf3499be Calendar fixed... all views fixed plus event loading fixed and also agenda view fixed. Harry Bomrah 2013-06-19 17:16:52 +0800
  • c4ec6c1ac9 fix solr name Matt K. Fu 2013-06-19 16:24:56 +0800
  • 6f46a3f949 add god to monit sold Matt K. Fu 2013-06-19 16:11:16 +0800
  • d78e816b4e from now on the rescue namespace will be decided by site object field: resque_namespace Matt K. Fu 2013-06-19 15:45:53 +0800
  • e10eb833ed fix rescue scheduler space error Matt K. Fu 2013-06-19 15:43:02 +0800
  • d3f0a10187 fix default setting for partial category selection error,due to API changing. Matthew K. Fu JuYuan 2013-06-17 15:26:43 +0800
  • 256c51a970 add sold setting back Matthew K. Fu JuYuan 2013-06-17 13:45:30 +0800
  • b674f47528 Remove Syslog chris 2013-06-14 15:30:22 +0800
  • c1bd135595 Fix sortable when there's no record chris 2013-06-13 14:33:15 +0800
  • 96fc5ceea3 survey module: ensure the commit iCross 2013-06-07 18:46:30 +0800
  • e48a1ffece archive module: add sort to frontend module iCross 2013-06-07 22:36:51 +0800
  • e20df41db5 add user log link at site page Matt K. Fu 2013-05-27 14:33:45 +0800
  • e68793afc3 Fix tag delete chris 2013-05-23 17:42:12 +0800
  • 2f7389ae24 ask module change mail view: <p>此為系統自動發信,請勿直接回覆</p> iCross 2013-06-04 16:07:56 +0800
  • 110eab0496 ask module: add global smtp setting iCross 2013-06-04 16:03:06 +0800
  • ccd760445d ask module: configure resque redis and namespace by config/initializers/resque.rb iCross 2013-05-31 09:24:27 +0800
  • c7effcc96c ask module: create.js.erb iCross 2013-05-30 17:58:52 +0800
  • f3e1f4057d ask module update css iCross 2013-05-30 16:58:33 +0800
  • e353961b21 ask moudule: add ask.css iCross 2013-05-30 15:26:39 +0800
  • 75e27ed849 ask module: default status iCross 2013-05-29 22:26:44 +0800
  • 8541033ba9 ask module: send mail on development iCross 2013-05-29 20:54:22 +0800
  • 467c2e8a3c ask module: fix iCross 2013-05-29 20:30:28 +0800
  • b0640f925b ask module: fix some iCross 2013-05-29 20:21:19 +0800
  • 841fa10c55 ask module: add rescue ackknowledgement iCross 2013-05-29 17:45:32 +0800
  • dcc5fc39a7 ask module: dropdown, icon, big5 encoding, redirect, admin, send mail iCross 2013-05-29 15:14:34 +0800
  • 97df100c64 remove department iCross 2013-05-27 17:39:39 +0800
  • ce180839f0 finish ask module iCross 2013-05-27 17:29:59 +0800
  • 0904978292 Remove non resolved conflict chris 2013-06-07 13:02:47 +0800
  • ddd9a9668e Merge branch 'lukas/picked_archive' into development iCross 2013-06-06 23:12:30 +0800