Commit Graph

  • 928c642840 change layout from old admin to new_admin. not complete code Matthew K. Fu JuYuan 2012-03-23 11:18:29 +0800
  • a549fb71a0 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-04-02 02:56:51 +0800
  • 9c1c70b598 Fix sorting in annoucement Christophe Vilayphiou 2012-04-02 02:46:48 +0800
  • 503f71e554 Ray's changes in tags, css and js Christophe Vilayphiou 2012-04-02 02:46:34 +0800
  • 6c50aa5243 Add pagination to bulletin index and remove ajax to make it simple Christophe Vilayphiou 2012-03-28 19:40:12 +0800
  • f7dafbc0cd Ray's changes in tags, css and js Christophe Vilayphiou 2012-04-02 02:46:34 +0800
  • ecc789c248 Add missing load ofr meta folder Christophe Vilayphiou 2012-04-02 02:45:23 +0800
  • 32519f308f Fix several bus when there is no design Christophe Vilayphiou 2012-04-02 02:41:42 +0800
  • 2747fc42f5 The new AdBanner. Matthew K. Fu JuYuan 2012-04-01 23:39:49 +0800
  • bbd2c23b3d Themes fixed… Harry Bomrah 2012-03-30 18:06:06 +0800
  • 32b7d95669 Fix parser_back_end & side_bar & meta Christophe Vilayphiou 2012-03-30 15:51:29 +0800
  • aa3997f7cf with notifications and other changes Harry Bomrah 2012-03-29 19:50:23 +0800
  • 176597f5af Stupid theme Harry Bomrah 2012-03-29 15:23:48 +0800
  • 25c24c03f9 Add pagination to bulletin index and remove ajax to make it simple Christophe Vilayphiou 2012-03-28 19:40:12 +0800
  • 2e283a039d Desktop Commit Harry Bomrah 2012-03-28 18:53:30 +0800
  • 4798cd43c1 Desktop commit Harry Bomrah 2012-03-28 18:53:06 +0800
  • e7fdcfffa0 Fix sidebar Christophe Vilayphiou 2012-03-28 12:12:23 +0800
  • fd26b7cd90 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-03-28 11:31:23 +0800
  • d6e4da6dad Ray's fix for margin-top Christophe Vilayphiou 2012-03-28 11:17:59 +0800
  • 649f343e6f Ray's fix for margin-top Christophe Vilayphiou 2012-03-28 11:17:59 +0800
  • c645c1b5df Remove extra code in bulletin form Christophe Vilayphiou 2012-03-28 10:51:14 +0800
  • 172d3d7847 Remove bad references to NewBlog Christophe Vilayphiou 2012-03-27 19:42:07 +0800
  • 212730fd8a Add missing end tag in bulletin _form Christophe Vilayphiou 2012-03-27 19:37:47 +0800
  • b587b7ca6b Remove limit(1) to bulletins index action Christophe Vilayphiou 2012-03-27 19:22:50 +0800
  • 5aad133b6c Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-03-27 19:15:13 +0800
  • 50be40f7b3 Ray's changes in announcenment back-end Christophe Vilayphiou 2012-03-27 15:03:00 +0800
  • 1e60acaa11 Fact check program completed,Lin checked Matt Fu 2012-03-22 14:33:59 +0800
  • 77f53cfd6b Merge branch 'nokogiri' of github.com:Rulingcom/orbit into nokogiri Christophe Vilayphiou 2012-03-27 19:00:26 +0800
  • 717e50a25e Add rake task for layout with nokogiri Christophe Vilayphiou 2012-03-27 18:28:09 +0800
  • c5f6dbc1c4 Nokogiri in parsers Christophe Vilayphiou 2012-03-27 17:57:50 +0800
  • 0f60ab9fc2 Add ad_banner to nokogiri Christophe Vilayphiou 2012-03-22 10:11:02 +0800
  • 7eff06a378 Trying nokogiri Christophe Vilayphiou 2012-03-22 01:51:16 +0800
  • cf297fc424 Changed inherited controller in module_apps to OrbitBackendController Christophe Vilayphiou 2012-03-27 18:04:09 +0800
  • d02bbdbaa5 Nokogiri in parsers Christophe Vilayphiou 2012-03-27 17:57:50 +0800
  • b134e690e9 Delete new_blog Christophe Vilayphiou 2012-03-27 15:57:17 +0800
  • 07ba457dd7 admin now can post without fact check Christophe Vilayphiou 2012-03-27 15:10:29 +0800
  • 55d12e50f2 Ray's changes in announcenment back-end Christophe Vilayphiou 2012-03-27 15:03:00 +0800
  • 97adf94e15 fix with what ray needs for the fact_check form Christophe Vilayphiou 2012-03-23 12:00:48 +0800
  • 3ba89ecbcf Fact check program completed,Lin checked Matt Fu 2012-03-22 14:33:59 +0800
  • 7efaddf57c Add ad_banner to nokogiri Christophe Vilayphiou 2012-03-22 10:11:02 +0800
  • f5fd3dec7a Trying nokogiri Christophe Vilayphiou 2012-03-22 01:51:16 +0800
  • f9c5ee5d18 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard Christophe Vilayphiou 2012-03-27 18:37:14 +0800
  • 48d1d45ced Nokogiri in parsers Christophe Vilayphiou 2012-03-27 17:57:50 +0800
  • 1451c3ac1d changing to new admin_layout Matthew K. Fu JuYuan 2012-03-27 15:34:21 +0800
  • 436c866a6f admin now can post without fact check Christophe Vilayphiou 2012-03-27 15:10:29 +0800
  • 422a49f56c Ray's changes in announcenment back-end Christophe Vilayphiou 2012-03-27 15:03:00 +0800
  • e8d1352890 fix announcement unknown 2012-03-27 14:29:11 +0800
  • 33955b4554 Delete files with Chinese characters in name Christophe Vilayphiou 2012-03-27 14:21:32 +0800
  • c4299245de Delete files with Chinese characters in name Christophe Vilayphiou 2012-03-27 14:17:48 +0800
  • a30bc499c7 fix announcement & links unknown 2012-03-23 18:04:11 +0800
  • 7765f0d2e1 Delete files with Chinese characters in name Christophe Vilayphiou 2012-03-27 14:17:48 +0800
  • 74636fb16d Delete file with Chinese character in the name Christophe Vilayphiou 2012-03-27 14:16:04 +0800
  • f37eb5bf43 Add missing file Christophe Vilayphiou 2012-03-23 18:27:41 +0800
  • 42519d9f78 fix announcement & links unknown 2012-03-23 18:04:11 +0800
  • 61698f3f2c Remove quick_edit on bulletin index load Christophe Vilayphiou 2012-03-23 17:32:59 +0800
  • 662c8c7a8a fix with what ray needs for the fact_check form Christophe Vilayphiou 2012-03-23 12:00:48 +0800
  • 2e2647af42 change layout from old admin to new_admin. not complete code Matthew K. Fu JuYuan 2012-03-23 11:18:29 +0800
  • bb14a7736f Merge branch 'announcement_fact_check' of github.com:Rulingcom/orbit into announcement_fact_check Christophe Vilayphiou 2012-03-22 20:04:42 +0800
  • 34a4e47057 Fact check program completed,Lin checked Matt Fu 2012-03-22 14:33:59 +0800
  • b109410a7a Add ad_banner to nokogiri Christophe Vilayphiou 2012-03-22 10:11:02 +0800
  • 4f741418a0 Trying nokogiri Christophe Vilayphiou 2012-03-22 01:51:16 +0800
  • a126935d2c Clean the parsers and introduce the metas Christophe Vilayphiou 2012-03-21 18:30:12 +0800
  • 472744fc87 Changes for IE9 with html5 Christophe Vilayphiou 2012-03-21 15:51:55 +0800
  • 9f9d0f5bff Merge branch 'design_team' into ldap Christophe Vilayphiou 2012-03-21 13:13:01 +0800
  • 0e8f8b3424 Add missing category when redirect to front-end for bulletin back-end index Christophe Vilayphiou 2012-03-21 12:58:13 +0800
  • 2c6208db3c Merge branch 'master' into ldap Christophe Vilayphiou 2012-03-21 12:44:22 +0800
  • 3aa7c5120d Put tinymce in its own js file. To use on a text area just add the class "tinymce_textarea". Christophe Vilayphiou 2012-03-21 12:41:32 +0800
  • 5d7202af8b Modify bulletin back-end index to show announcement in front-end Christophe Vilayphiou 2012-03-21 12:37:52 +0800
  • c4d541d3b9 Remove code from back_end/bulletins/show Christophe Vilayphiou 2012-03-21 12:36:52 +0800
  • a1034f90ba close alpha on nccu nccu 2012-03-20 14:38:01 +0800
  • 5fcd3cd783 Merge branch 'master' into ldap Christophe Vilayphiou 2012-03-20 14:27:04 +0800
  • e953344965 Fix before_filter order for object_auth Christophe Vilayphiou 2012-03-20 14:17:28 +0800
  • 49ece7be6a Merge branch 'master' into ldap Christophe Vilayphiou 2012-03-19 15:50:53 +0800
  • 7cc075e124 Change the monkey picture Christophe Vilayphiou 2012-03-19 15:49:40 +0800
  • 47215693c4 Merge branch 'master' into ldap Christophe Vilayphiou 2012-03-19 14:27:15 +0800
  • b58db48d26 Changes in Gemfile Christophe Vilayphiou 2012-03-19 14:04:28 +0800
  • fdb3707024 Merge branch 'announcement_fact_check' of github.com:Rulingcom/orbit into announcement_fact_check Christophe Vilayphiou 2012-03-19 10:57:44 +0800
  • 6700114955 after merge Matt Fu 2012-03-16 15:51:59 +0800
  • 9c8b0235b0 add new files Matt Fu 2012-03-16 15:48:13 +0800
  • a755eb184b fix announcement links & files unknown 2012-03-16 16:49:25 +0800
  • 7d553acaec fix announcement link & files unknown 2012-03-16 15:53:57 +0800
  • c7a333f990 after merge Matt Fu 2012-03-16 15:51:59 +0800
  • 50a9f66269 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into announcement_fact_check Matt Fu 2012-03-16 15:50:43 +0800
  • eb2b4b80b7 add new files Matt Fu 2012-03-16 15:48:13 +0800
  • 07edf44643 Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-03-16 15:13:06 +0800
  • 29ec36130e css and js changes Christophe Vilayphiou 2012-03-16 15:06:45 +0800
  • f4fda08e86 Replace PrototypeR4 by Orbit. Move session into mongoid_store. Reset session when sing_in. Christophe Vilayphiou 2012-03-05 16:19:08 +0800
  • 785ead5209 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard Christophe Vilayphiou 2012-03-16 14:55:21 +0800
  • 6f6e84b015 fix dashboard & announcement unknown 2012-03-14 20:05:03 +0800
  • b6d49df145 Change Obit to Orbit Christophe Vilayphiou 2012-03-16 11:20:16 +0800
  • 13b6892f87 code for new fact check Matt Fu 2012-03-16 11:09:44 +0800
  • 00ab773942 fix dashboard & announcement unknown 2012-03-14 20:05:03 +0800
  • db9608d918 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team Christophe Vilayphiou 2012-03-07 18:17:40 +0800
  • 3e22c6e61b Add bootstrap-orbit.css in front-end Christophe Vilayphiou 2012-03-07 11:37:00 +0800
  • 79c8b3861b Fix link in widget Christophe Vilayphiou 2012-03-01 14:12:47 +0800
  • 4dd9b7ffa4 Fix announcement pagination in front-end Christophe Vilayphiou 2012-03-01 10:58:31 +0800
  • 0b1f83c042 Fix extra loaded js: the widgets only need to render layout when they need js. Christophe Vilayphiou 2012-03-01 10:57:13 +0800
  • 900855724c Add bootstrap-orbit.css in front-end Christophe Vilayphiou 2012-03-07 11:37:00 +0800
  • d5a2de5476 LDAP with sync rake task Matt Fu 2012-03-06 16:41:06 +0800
  • 826a5a5f20 Fix link in widget Christophe Vilayphiou 2012-03-01 14:12:47 +0800