Commit Graph

  • 17635a2cf2 Merge branch 'anc_approval_list' of https://github.com/Rulingcom/orbit into anc_approval_list Matthew K. Fu JuYuan 2012-04-30 03:14:53 +0800
  • 4466e7ae1c Fix for NCCU 0430 all functions ok with two submanagers but different behavors Matthew K. Fu JuYuan 2012-04-30 03:14:15 +0800
  • fb6c2a24df Merge branches 'anc_approval_list' and 'anc_approval_list' of github.com:Rulingcom/orbit into anc_approval_list Christophe Vilayphiou 2012-04-30 00:25:27 +0800
  • a46a8898d7 Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen Matthew K. Fu JuYuan 2012-04-27 18:38:21 +0800
  • 382932036d Hide Approval button when bulletin is checked. Matthew K. Fu JuYuan 2012-04-27 11:44:41 +0800
  • 6b151b1fb6 403 for unauth apps Matthew K. Fu JuYuan 2012-04-26 16:45:46 +0800
  • c4db7e2157 Fix approval setting ajax problem Matthew K. Fu JuYuan 2012-04-26 16:13:21 +0800
  • 94d61abf83 A modal view for approval user Matthew K. Fu JuYuan 2012-04-25 17:08:51 +0800
  • 9d97b7c008 Change for the notice msg at login page Matthew K. Fu JuYuan 2012-04-25 16:51:47 +0800
  • 851dc72f42 Ray's changes in css and html Christophe Vilayphiou 2012-04-30 00:17:18 +0800
  • a99d685bce conflict solved devin 2012-04-28 01:56:00 +0800
  • 03f19b80b4 small change devin 2012-04-28 01:49:02 +0800
  • a23f290831 changes for login … Harry Bomrah 2012-04-27 22:14:44 +0800
  • 4a51355b1a Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen Matthew K. Fu JuYuan 2012-04-27 18:38:21 +0800
  • 2362e1cfdd Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-27 15:28:32 +0800
  • 799fd1e3ac Fix css bugs (opacity=) and changes in sign_in page Christophe Vilayphiou 2012-04-27 15:27:59 +0800
  • bf2c89da54 Add sorting to web_links Christophe Vilayphiou 2012-04-27 14:20:09 +0800
  • feb2156fd3 Fix error in side_bar for web_links Christophe Vilayphiou 2012-04-27 14:15:36 +0800
  • 2ebba577eb journal start devin 2012-04-27 14:04:11 +0800
  • 3fcb902663 Hide Approval button when bulletin is checked. Matthew K. Fu JuYuan 2012-04-27 11:44:41 +0800
  • 3beb035101 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-27 11:11:56 +0800
  • 5aca3db95f Ray's changes for structure and web_links Christophe Vilayphiou 2012-04-27 11:02:56 +0800
  • 682880c5bf skip it devin 2012-04-26 23:18:35 +0800
  • c158375d02 with connection and some save settings… Harry Bomrah 2012-04-26 21:30:13 +0800
  • c2ac682787 updates for connections Harry Bomrah 2012-04-26 17:23:47 +0800
  • 7d6b82d9dd Merge branch 'ad_banner' into ldap Christophe Vilayphiou 2012-04-26 17:15:44 +0800
  • 9717dd8fe7 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner Christophe Vilayphiou 2012-04-26 17:15:11 +0800
  • 4af2068c1f Fix ad_banner sec and msec Matthew K. Fu JuYuan 2012-04-25 18:03:30 +0800
  • faace9893a dehumanize ad banner Matthew K. Fu JuYuan 2012-04-25 17:17:42 +0800
  • 9a5ce5f512 Remove unless sidebar links. Matthew K. Fu JuYuan 2012-04-25 17:17:04 +0800
  • 1c7c283083 403 for unauth apps Matthew K. Fu JuYuan 2012-04-26 16:45:46 +0800
  • 3d293f6419 Fix for quick edit file and link in announcement Change submit_button into ajax_for_submit Christophe Vilayphiou 2012-04-26 16:42:28 +0800
  • bd9451f923 Fix approval setting ajax problem Matthew K. Fu JuYuan 2012-04-26 16:13:21 +0800
  • 64be61d61b with gmail widget.. Harry Bomrah 2012-04-26 14:47:49 +0800
  • 6bf4c60d45 Changes for js and ccs load for site's pages Christophe Vilayphiou 2012-04-26 01:49:02 +0800
  • 6f1eb97ace Fix for structure js and css Christophe Vilayphiou 2012-04-25 18:41:38 +0800
  • 58d52c60d3 Fix for structure: restore js and change manifests Christophe Vilayphiou 2012-04-25 18:17:58 +0800
  • 0fcafc2418 Fix ad_banner sec and msec Matthew K. Fu JuYuan 2012-04-25 18:03:30 +0800
  • 7a42ef9193 dehumanize ad banner Matthew K. Fu JuYuan 2012-04-25 17:17:42 +0800
  • 55c0c95e14 Remove unless sidebar links. Matthew K. Fu JuYuan 2012-04-25 17:17:04 +0800
  • 8785418ec1 A modal view for approval user Matthew K. Fu JuYuan 2012-04-25 17:08:51 +0800
  • b8e54bf0c1 Change for the notice msg at login page Matthew K. Fu JuYuan 2012-04-25 16:51:47 +0800
  • 1f4fe65430 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-25 16:45:04 +0800
  • 876036dd20 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-25 16:39:26 +0800
  • 44ded537b3 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-25 16:28:34 +0800
  • 65a6f9c416 Ray's css fix for quick edit Christophe Vilayphiou 2012-04-25 16:26:27 +0800
  • 0804f10893 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner Christophe Vilayphiou 2012-04-25 16:11:12 +0800
  • a3a109fb8b Remove JS debug msg. Matthew K. Fu JuYuan 2012-04-25 13:58:03 +0800
  • a704a054cc Remove useless files Matthew K. Fu JuYuan 2012-04-25 11:43:24 +0800
  • 7f285f4719 Change ad_banner preview from using title to id Matthew K. Fu JuYuan 2012-04-25 11:38:45 +0800
  • 72921d6dfd fix useless notice at login Matthew K. Fu JuYuan 2012-04-25 10:55:49 +0800
  • abf75ffedd Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-25 15:45:16 +0800
  • 573c19ff4b Remove .erb when including css Christophe Vilayphiou 2012-04-25 15:44:44 +0800
  • 556b279418 Remove publi/assets from github Matt 2012-04-25 15:20:15 +0800
  • 8adb9c6878 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-25 15:10:50 +0800
  • 3ec8bb7be6 Fix assets bug: when having a '.' in the name, the extension must be specified Christophe Vilayphiou 2012-04-25 15:10:28 +0800
  • cb3c3a14a8 Remove JS debug msg. Matthew K. Fu JuYuan 2012-04-25 13:58:03 +0800
  • 0cdf27450b Remove useless files Matthew K. Fu JuYuan 2012-04-25 11:43:24 +0800
  • ddf7931123 Change ad_banner preview from using title to id Matthew K. Fu JuYuan 2012-04-25 11:38:45 +0800
  • 8e444a88d0 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner Matthew K. Fu JuYuan 2012-04-25 10:56:42 +0800
  • 3f2643bb66 fix useless notice at login Matthew K. Fu JuYuan 2012-04-25 10:55:49 +0800
  • c65213c4f1 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-24 17:10:34 +0800
  • dc07964bc3 Fix js bug after Matt's changes in 'approval' Christophe Vilayphiou 2012-04-24 17:10:23 +0800
  • 8f242e2d39 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-24 17:00:51 +0800
  • 3308744396 Fix side_bar after Matt's changes in translation Christophe Vilayphiou 2012-04-24 17:00:33 +0800
  • 0c4f1d91f7 Merge branch 'ad_banner' into ldap Christophe Vilayphiou 2012-04-24 16:46:04 +0800
  • a298cbd5f6 Publication started Harry Bomrah 2012-04-24 16:45:26 +0800
  • a47ef5cfe8 Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner Christophe Vilayphiou 2012-04-24 16:45:13 +0800
  • db46803cda R4-Billingual Matthew K. Fu JuYuan 2012-04-24 16:06:42 +0800
  • d1f687e43e Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-24 16:32:30 +0800
  • c7d8e0b27b Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-24 16:32:00 +0800
  • 17e55b9805 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-24 16:25:58 +0800
  • 9f6c9156c6 Spen patch for nccu Christophe Vilayphiou 2012-04-24 16:25:30 +0800
  • 291d5e3a03 Ray's changes in css Christophe Vilayphiou 2012-04-24 16:24:50 +0800
  • d0ced39c74 R4-Billingual Matthew K. Fu JuYuan 2012-04-24 16:06:42 +0800
  • 70f6c7b540 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-24 15:28:52 +0800
  • d247f05d2e Add missing translations in announcement and change announcement behavior for passed and rejected Christophe Vilayphiou 2012-04-24 15:27:46 +0800
  • c0abaa643c Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-24 15:21:12 +0800
  • b76918d9d0 announcement edit to view file unknown 2012-04-24 15:18:29 +0800
  • 45c194e870 Ray's changes in css Christophe Vilayphiou 2012-04-24 15:15:36 +0800
  • 51ee9a4bfa Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner Christophe Vilayphiou 2012-04-24 14:43:30 +0800
  • 33640de184 Changes for Billingual Matthew K. Fu JuYuan 2012-04-24 14:30:30 +0800
  • bbcdaf00e7 Disable ad_banner_preview. Just show window Matthew K. Fu JuYuan 2012-04-23 18:29:23 +0800
  • e7bb9ea86b Fix ad image date selector Matthew K. Fu JuYuan 2012-04-23 18:20:12 +0800
  • c57ba305e9 Fix ad_banner Matthew K. Fu JuYuan 2012-04-23 17:03:55 +0800
  • 04688608f7 Changes for Billingual Matthew K. Fu JuYuan 2012-04-24 14:30:30 +0800
  • c856b4cdce Fix for upload image component in announcement Christophe Vilayphiou 2012-04-24 12:41:28 +0800
  • 8bf55a184e Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-24 12:20:14 +0800
  • 42aeaead93 Ray's changes, put the js for upload image component in a separate file Christophe Vilayphiou 2012-04-24 12:15:32 +0800
  • 27bd26ff52 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-24 11:40:42 +0800
  • b80339d704 Ray's changes for image upload component and sign-in page Christophe Vilayphiou 2012-04-24 11:35:50 +0800
  • f05b7db73a Fix for parser sub_menu Add style to the sub_menu Christophe Vilayphiou 2012-04-24 11:26:36 +0800
  • 6e431b6137 Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner Matthew K. Fu JuYuan 2012-04-24 11:26:13 +0800
  • 8041452be5 Fix for translation in sort headers for announcement Christophe Vilayphiou 2012-04-24 11:05:01 +0800
  • 308cfc7cf2 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-24 02:46:06 +0800
  • 6831a3dbbb Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-24 02:44:39 +0800
  • 0c4328987a Ray's changes for css files, sort headers in announcement and pagination Christophe Vilayphiou 2012-04-24 02:37:51 +0800
  • d4aea664e2 Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-04-24 02:37:03 +0800
  • a748ccaac7 Patch from ldap for announcement translation Christophe Vilayphiou 2012-04-24 02:33:35 +0800
  • a5b13e680f Add sub_menu in r_tags Christophe Vilayphiou 2012-04-24 02:30:40 +0800