developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 0babd5f302 Changes for side_bar chris 2012-10-15 15:30:48 +0800
  • a50553219e Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-15 15:28:24 +0800
  • e6e547e456 add i18n variables Matthew K. Fu JuYuan 2012-10-15 15:15:19 +0800
  • fe183c316f Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-15 14:46:13 +0800
  • 84929f9b4c fix sub role attribute fields run: Role.any_in(:key=>['department_admin','administrator']).destroy_all for deleting old role data to complete this code. Matthew K. Fu JuYuan 2012-10-15 14:44:48 +0800
  • 5913f73850 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-15 14:09:58 +0800
  • 31b583228d fixed html for add link. form html Matthew K. Fu JuYuan 2012-10-15 14:07:53 +0800
  • 334e5b464c Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-15 13:56:16 +0800
  • 7901de7b31 can add member Matthew K. Fu JuYuan 2012-10-15 13:54:29 +0800
  • c511600cad Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-15 12:35:27 +0800
  • 9027562450 new code for attribute fields and values for new member interface Matthew K. Fu JuYuan 2012-10-12 18:09:02 +0800
  • b5571dbc43 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member Matthew K. Fu JuYuan 2012-10-12 18:17:05 +0800
  • 1ce7f00084 new code for attribute fields and values for new member interface Matthew K. Fu JuYuan 2012-10-12 18:09:02 +0800
  • 189fa553c5 Changes for helpers, not including all by default chris 2012-10-09 14:47:16 +0800
  • d027cf8e6a add new data from NCCU Matthew K. Fu JuYuan 2012-10-09 14:40:28 +0800
  • a0103d55c4 Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site chris 2012-10-09 07:48:17 +0800
  • 9e2bc7e1c1 Ray's changes in css and js OrbitServer 2012-10-09 07:44:26 +0800
  • 05f4555c66 Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site OrbitServer 2012-10-09 07:47:00 +0800
  • 483bd7de4a Ray's changes in css and js OrbitServer 2012-10-09 07:44:26 +0800
  • 79e4cef425 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit chris 2012-10-09 06:42:12 +0800
  • f76253f512 Week View changes Harry Bomrah 2012-10-08 16:47:56 +0800
  • bb626470e7 week view updates Harry Bomrah 2012-09-27 13:44:22 +0800
  • 022d28e5e7 change in algo of event generation plus now multi week events enabled Harry Bomrah 2012-09-24 21:26:15 +0800
  • d2fea92969 GPRS and CALENDAR Harry Bomrah 2012-09-17 21:36:40 +0800
  • c2c3774cf9 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-09 06:40:59 +0800
  • 9f825de288 user new interface 70% Matthew K. Fu JuYuan 2012-10-08 16:58:33 +0800
  • 1aacf5e2ce user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object. Sub_role can be removed normally and the method check_status_record will make sure data is being saved as it should be. Also unnecessary role will be removed if no sub role exists. Matthew K. Fu JuYuan 2012-09-18 16:22:56 +0800
  • e16a27601d user new interface 70% Matthew K. Fu JuYuan 2012-10-08 16:58:33 +0800
  • 59f97f3fef Week View changes Harry Bomrah 2012-10-08 16:47:56 +0800
  • 89b1aace8a fix for rescue job failed on 171 Matthew K. Fu JuYuan 2012-10-08 16:42:49 +0800
  • a4c94c4404 demo site plugin unknown 2012-10-08 16:20:21 +0800
  • 0663e43be7 fix for web_resource tool bar Matthew K. Fu JuYuan 2012-10-08 16:02:33 +0800
  • cf68022d4f fix resque server stop Matthew K. Fu JuYuan 2012-10-08 11:26:24 +0800
  • 4a5fc47c0a NCCU maintenance rake task Matthew K. Fu JuYuan 2012-10-08 10:35:11 +0800
  • 67bd68d492 harry's js fix Matthew K. Fu JuYuan 2012-10-08 10:11:45 +0800
  • e67ca84282 object_auth change to reload Matthew K. Fu JuYuan 2012-10-04 18:20:21 +0800
  • ae48ab5cbd clean commit Matthew K. Fu JuYuan 2012-10-04 15:53:42 +0800
  • 962bae9a82 merge Matt 2012-10-01 21:09:09 +0800
  • b0cdcbecca fix preview bug only happen when production Matthew K. Fu JuYuan 2012-10-01 21:05:16 +0800
  • 7919750d4f 171 doesn't have bug with javascript remove log script Matthew K. Fu JuYuan 2012-10-01 19:05:23 +0800
  • 3dc4dc2316 debug commit Matthew K. Fu JuYuan 2012-10-01 17:56:55 +0800
  • 506fa179a1 fix announcement Matthew K. Fu JuYuan 2012-10-01 17:48:51 +0800
  • b65d785834 harry's fix, announcement still broken Matt 2012-10-01 17:21:23 +0800
  • edcef5a8f7 make manager's news and announcement can be shown at once it be submitted. Matthew K. Fu JuYuan 2012-10-01 16:11:58 +0800
  • 5ac04ea07d devin's css for tinymce Matthew K. Fu JuYuan 2012-09-28 09:58:28 +0800
  • aa5d0bb1ad Merge branch 'master' of github.com:Rulingcom/NCCU Matthew K. Fu JuYuan 2012-09-28 09:49:22 +0800
  • 4397adec5c fix i18n Matthew K. Fu JuYuan 2012-09-28 09:46:06 +0800
  • cfc80340b8 add setting for tinymce config Matthew K. Fu JuYuan 2012-09-28 09:45:50 +0800
  • 9a4c8137fe Fix for images Harry Bomrah 2012-09-27 15:33:37 +0800
  • e44495ac9b week view updates Harry Bomrah 2012-09-27 13:44:22 +0800
  • dc8ca7e575 fix i18n.file upload failed Fu Matthew 2012-09-27 13:34:40 +0800
  • 87904f8b8d fix i18n Fu Matthew 2012-09-27 11:03:08 +0800
  • 170bfbab52 fix i18n Matthew K. Fu JuYuan 2012-09-26 10:21:50 +0800
  • 54b874b2c9 fix nccu login Matthew K. Fu JuYuan 2012-09-25 15:07:07 +0800
  • 7a523281c3 fix announcement Matthew K. Fu JuYuan 2012-09-25 09:52:13 +0800
  • 16c51a77a7 change in algo of event generation plus now multi week events enabled Harry Bomrah 2012-09-24 21:26:15 +0800
  • 87e2510d02 add rake task for rebuild index Matthew K. Fu JuYuan 2012-09-24 18:46:38 +0800
  • 5634e87144 fix announcement block Matthew K. Fu JuYuan 2012-09-24 18:43:43 +0800
  • 78a01f5d29 fix for 0924 Matthew K. Fu JuYuan 2012-09-24 18:30:19 +0800
  • 5f63af4e77 fix for search news,needs to applied to announcement,also need to fix some translation Matt 2012-09-24 18:10:48 +0800
  • 029c84328d code that can not run on matt's air Matthew K. Fu JuYuan 2012-09-24 15:37:28 +0800
  • fb3364b28e Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config Matthew K. Fu JuYuan 2012-09-24 14:14:13 +0800
  • 975523c8b2 demo site plugin unknown 2012-09-24 14:10:44 +0800
  • e5fa86c24a fix i18n for search field Matthew K. Fu JuYuan 2012-09-24 12:25:43 +0800
  • 7ca0d2a62b Merge branch 'master' of github.com:Rulingcom/NCCU Matthew K. Fu JuYuan 2012-09-24 12:20:59 +0800
  • 136fc68cdc nccu data task Matthew K. Fu JuYuan 2012-09-24 12:18:40 +0800
  • 3a65f599e6 first version app config for Spen durning Chris's leave. Matthew K. Fu JuYuan 2012-09-24 11:43:48 +0800
  • 1646b13f43 Change status translation in Chinese Christophe Vilayphiou 2012-09-24 10:10:06 +0800
  • b4ff5cea05 Merge branch 'yml' of github.com:Rulingcom/NCCU into yml Christophe Vilayphiou 2012-09-24 09:19:19 +0800
  • c846a102ff Page by page changes for i18n yml Christophe Vilayphiou 2012-09-24 08:36:29 +0800
  • 4fb35b00f2 Add missing translations Christophe Vilayphiou 2012-09-21 12:58:44 +0800
  • 2ca7e1b548 Fix typos after i18n yml Christophe Vilayphiou 2012-09-12 20:36:24 +0800
  • e71e890bb6 Fix bugs in zh_tw main Christophe Vilayphiou 2012-09-12 19:42:37 +0800
  • bdd5a1a047 Changes for i18n yml Christophe Vilayphiou 2012-09-12 19:12:50 +0800
  • a04e1fd10b Hot or top for news home banner Christophe Vilayphiou 2012-09-24 08:43:10 +0800
  • 88d562450a Fix home banner for hot news Christophe Vilayphiou 2012-09-21 15:34:18 +0800
  • b6c06c6d4f tiny mce fix Harry Bomrah 2012-09-19 17:59:17 +0800
  • a32027b64b ray's fix Matthew K. Fu JuYuan 2012-09-19 16:34:43 +0800
  • 12db3118b4 Merge branch 'master' of github.com:Rulingcom/NCCU Matthew K. Fu JuYuan 2012-09-19 15:09:56 +0800
  • 8b68387199 fix share loading failed Matthew K. Fu JuYuan 2012-09-19 15:09:08 +0800
  • 79006201cd ad_image date picker fixed Matt 2012-09-19 12:23:05 +0800
  • 6fd2dac4d5 fix ad_banner data picker not working when on 180 Matthew K. Fu JuYuan 2012-09-19 12:15:03 +0800
  • d480a10661 fix for object_auth update Matthew K. Fu JuYuan 2012-09-19 11:12:22 +0800
  • 959b6aee12 fix for listing object error Matthew K. Fu JuYuan 2012-09-19 10:45:03 +0800
  • 1240064e23 add url generate Matthew K. Fu JuYuan 2012-09-18 17:37:52 +0800
  • c813a6143b fb share for iNCCU Matthew K. Fu JuYuan 2012-09-18 17:31:51 +0800
  • 2321116597 Merge commit '43ecebf93482cf94c73b78564509d1a352c2bcd2' into app_config Matthew K. Fu JuYuan 2012-09-18 16:30:34 +0800
  • 5de433d219 user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object. Sub_role can be removed normally and the method check_status_record will make sure data is being saved as it should be. Also unnecessary role will be removed if no sub role exists. Matthew K. Fu JuYuan 2012-09-18 16:22:56 +0800
  • 6da3928626 change for NCCU ask Matthew K. Fu JuYuan 2012-09-18 15:49:05 +0800
  • 42c62ebca0 Fix preview for announcement (was retuning js instead of html) Christophe Vilayphiou 2012-09-18 14:31:50 +0800
  • ce47109d33 change link for rss Matthew K. Fu JuYuan 2012-09-18 12:04:45 +0800
  • 0ecb4eca46 change for NCCU entry site Matthew K. Fu JuYuan 2012-09-18 10:54:11 +0800
  • 84205379c1 GPRS and CALENDAR Harry Bomrah 2012-09-17 21:36:40 +0800
  • 43ecebf934 Merge branch 'new' of github.com:Rulingcom/orbit into new Christophe Vilayphiou 2012-09-17 14:31:42 +0800
  • 2c55430c52 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member Christophe Vilayphiou 2012-09-17 14:20:07 +0800
  • 0907324a2f add member link to orbit menu Matthew K. Fu JuYuan 2012-09-17 14:12:01 +0800
  • 6a174d57a6 fix setting menu Matthew K. Fu JuYuan 2012-09-17 14:17:06 +0800
  • 4c7906898e add member link to orbit menu Matthew K. Fu JuYuan 2012-09-17 14:12:01 +0800
  • 228fa0fca3 Remove setting from side bar Christophe Vilayphiou 2012-09-17 13:40:14 +0800
  • 19db9d0037 basic function Matthew K. Fu JuYuan 2012-09-17 12:06:21 +0800