Commit Graph

  • 159e41639d Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit chris 2012-11-06 10:36:52 +0800
  • da5e7f670e Desktop Widgtes updates.. Harry Bomrah 2012-11-05 23:04:54 +0800
  • 3c85f3ef00 Make the archive module work (it needs more details) chris 2012-11-01 11:45:26 +0800
  • f68fe22cba Desktop Widgtes updates.. Harry Bomrah 2012-11-05 23:04:54 +0800
  • 73fd9d1f97 Merge branch 'modified_show_plugin_profile' of github.com:Rulingcom/orbit into modified_show_plugin_profile chris 2012-11-05 11:43:00 +0800
  • c314745545 add link of title Rueshyna 2012-11-05 10:37:04 +0800
  • e4de1e34a2 add announcement plugin Rueshyna 2012-11-04 22:05:03 +0800
  • 9433d59c04 relpace tab with sapce Rueshyna 2012-11-04 22:04:13 +0800
  • ed3644fb89 done journal Rueshyna 2012-11-02 16:31:41 +0800
  • a5e2c3e0ce Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit chris 2012-11-05 11:41:48 +0800
  • ca3e06c58b update for desktop widgets Harry Bomrah 2012-11-01 20:42:40 +0800
  • 2e809c5c19 Calander view updated... Harry Bomrah 2012-11-01 10:45:22 +0800
  • 228d43d0e2 calendar update devin 2012-10-30 17:26:52 +0800
  • 6dd9f441ef Agenda View Harry Bomrah 2012-10-29 19:52:34 +0800
  • d070c70512 calendar agenda view update devin 2012-10-27 00:11:26 +0800
  • 513671e498 lot of updates Harry Bomrah 2012-10-26 19:04:51 +0800
  • 58d4554b0b Fixing bugs chris 2012-11-05 11:30:15 +0800
  • 9f3c3f0d7e add link of title Rueshyna 2012-11-05 10:37:04 +0800
  • 3d5274a6f9 add announcement plugin Rueshyna 2012-11-04 22:05:03 +0800
  • 0e1f3d81d1 relpace tab with sapce Rueshyna 2012-11-04 22:04:13 +0800
  • 6783844937 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-11-04 20:43:23 +0800
  • beb843f75b add new member with role interface. add more not usable. role management new attribute is ok. delete is ok. Matthew K. Fu JuYuan 2012-11-04 05:56:29 +0800
  • fe0e49c3e9 Remove a folder in wich Chinese characters chris 2012-11-04 20:32:54 +0800
  • be08682c6b Merge branch 'new' of github.com:Rulingcom/orbit into new chris 2012-11-04 20:25:05 +0800
  • bd17641d18 member plugin list add new unknown 2012-11-02 18:28:23 +0800
  • e47465d4b7 add new member with role interface. add more not usable. role management new attribute is ok. delete is ok. Matthew K. Fu JuYuan 2012-11-04 05:56:29 +0800
  • 2f61b3e0c9 member plugin list add new unknown 2012-11-02 18:28:23 +0800
  • f61a81ab56 done journal Rueshyna 2012-11-02 16:31:41 +0800
  • 28337c6b5b update for desktop widgets Harry Bomrah 2012-11-01 20:42:40 +0800
  • 9bf812b8d9 calendar "edit calendar" update devin 2012-11-01 15:21:42 +0800
  • d904163090 Merge branch 'gallery_orbit' into desktop_devin Harry Bomrah 2012-11-01 10:47:23 +0800
  • a25199d33b Calander view updated... Harry Bomrah 2012-11-01 10:45:22 +0800
  • 451d73897b Fix bugs: Page content: after edit and redirect to index, there's a gap between the headers and the first row TinyMCE: the size of the textarea change depending on the language chris 2012-11-01 09:30:12 +0800
  • 167c993108 calendar update devin 2012-10-30 17:26:52 +0800
  • bc9082a858 Fix bug: Fix the bug due to not finding the ModuleApp chris 2012-10-30 17:10:59 +0800
  • 63a57682e6 Fix bugs: TinyMCE: the size of the textarea change depending on the language Page content edit: no tab selected on first load chris 2012-10-30 17:09:00 +0800
  • cc5e238576 Fix after merge from NCCU, the translations still need to be cleaned chris 2012-10-30 11:08:26 +0800
  • 664c6d2f61 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member Matthew K. Fu JuYuan 2012-10-30 10:11:51 +0800
  • ff9b9af7df Remove useless files,add test files and Guardfile Matthew K. Fu JuYuan 2012-10-30 10:00:27 +0800
  • 5da35ee65b Agenda View Harry Bomrah 2012-10-29 19:52:34 +0800
  • 65ac6980c4 Merge branch 'various_bugs' into nccu_master chris 2012-10-29 16:10:07 +0800
  • b73981b19a Devin commit Harry Bomrah 2012-10-29 10:17:49 +0800
  • 12b7618cc7 calendar agenda view update devin 2012-10-27 00:11:26 +0800
  • 5e25cf5849 lot of updates Harry Bomrah 2012-10-26 19:04:51 +0800
  • 9b5f4e4775 Fix bug: User cannot connect using the orbit button (Devise configuration) chris 2012-10-26 17:42:14 +0800
  • 2c5539eda9 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member chris 2012-10-26 11:28:00 +0800
  • bd0d975014 for user new interface, member role is working. Matthew K. Fu JuYuan 2012-10-24 14:46:25 +0800
  • b301f6522a Merge branch 'design_update' of github.com:Rulingcom/orbit into design_update chris 2012-10-26 11:20:26 +0800
  • d7fd61ce55 Edit uploaded package chris 2012-10-24 18:40:38 +0800
  • 0a1a9d2c2e member for THU Matthew K. Fu JuYuan 2012-10-18 18:36:21 +0800
  • 579c7b5e81 Add missing helper chris 2012-10-16 16:20:22 +0800
  • 68bc4c1874 Fix page_part creation when design is changed chris 2012-10-16 14:17:12 +0800
  • cbfa659928 Changes for side_bar chris 2012-10-15 15:30:48 +0800
  • c305a2f687 add i18n variables Matthew K. Fu JuYuan 2012-10-15 15:15:19 +0800
  • f4f07c7206 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
  • 9c16da4f46 fixed html for add link. form html Matthew K. Fu JuYuan 2012-10-15 14:07:53 +0800
  • 03b608593d can add member Matthew K. Fu JuYuan 2012-10-15 13:54:29 +0800
  • 0a56c555bb new code for attribute fields and values for new member interface Matthew K. Fu JuYuan 2012-10-12 18:09:02 +0800
  • 8b9cffd4f2 new code for attribute fields and values for new member interface Matthew K. Fu JuYuan 2012-10-12 18:09:02 +0800
  • 293dc80ceb Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin chris 2012-10-26 11:15:51 +0800
  • a5722af315 Calendar updates for day view Harry Bomrah 2012-10-24 18:55:06 +0800
  • 8c6e5deb64 gallery update devin 2012-10-24 09:47:09 +0800
  • 79e0b8e383 week view updates Harry Bomrah 2012-10-18 22:21:13 +0800
  • 98ef582e17 shit calendar update devin 2012-10-17 17:35:30 +0800
  • c29955d9e3 external commit Harry Bomrah 2012-10-16 21:52:10 +0800
  • d7e8663c1d calendar updated for week Harry Bomrah 2012-10-16 21:50:46 +0800
  • 6b8255f8f8 Remove a folder in wich Chinese characters chris 2012-10-26 11:14:13 +0800
  • 974849b85a Merge branch 'gallery_orbit' into desktop_devin Harry Bomrah 2012-10-24 19:11:12 +0800
  • f4eb95881f Calendar updates for day view Harry Bomrah 2012-10-24 18:55:06 +0800
  • 2b2dd53218 Edit uploaded package chris 2012-10-24 18:40:38 +0800
  • 1b876d4305 for user new interface, member role is working. Matthew K. Fu JuYuan 2012-10-24 14:46:25 +0800
  • 8c63be5c33 gallery update devin 2012-10-24 09:47:09 +0800
  • a810312da4 week view updates Harry Bomrah 2012-10-18 22:21:13 +0800
  • 9110c3e716 Merge branch 'demo_site' of github.com:Rulingcom/orbit into demo_site Christophe Vilayphiou 2012-10-18 18:51:14 +0800
  • 976114cfa9 Add missing helper chris 2012-10-16 16:20:22 +0800
  • d1797ac8e3 Fix page_part creation when design is changed chris 2012-10-16 14:17:12 +0800
  • 13ae2602cd member for THU Matthew K. Fu JuYuan 2012-10-18 18:36:21 +0800
  • 47df69f8cf shit calendar update devin 2012-10-17 17:35:30 +0800
  • 6113b9c46c external commit Harry Bomrah 2012-10-16 21:52:10 +0800
  • 0971e00511 calendar updated for week Harry Bomrah 2012-10-16 21:50:46 +0800
  • 0d19cd6f10 Add missing helper chris 2012-10-16 16:20:22 +0800
  • 38e6d6c2c8 add rake task Matthew K. Fu JuYuan 2012-10-16 15:43:31 +0800
  • a50ccdafb2 consolidate_object_auth for 171 production Matthew K. Fu JuYuan 2012-10-16 15:08:02 +0800
  • b3a9a7ab07 Merge branch 'master' of github.com:Rulingcom/NCCU Matthew K. Fu JuYuan 2012-10-16 14:24:01 +0800
  • 6dfe10040b fix object auth without app_auth Matthew K. Fu JuYuan 2012-10-16 14:23:44 +0800
  • cc6c8dab2a Fix page_part creation when design is changed chris 2012-10-16 14:17:12 +0800
  • afff128e9c Fix page_part creation when design is changed chris 2012-10-16 14:15:33 +0800
  • f7f0b48707 Merge branch 'master' of github.com:Rulingcom/NCCU chris 2012-10-16 14:14:56 +0800
  • 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