Commit Graph

  • 03c8d42138 Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin chris 2013-01-14 17:04:06 +0800
  • 54d098baf2 Change translation chris 2013-01-08 17:30:36 +0800
  • 84e4a558be member roles edit unknown 2013-01-08 16:58:01 +0800
  • 4e2cbac027 Remove bottom padding if no footer in mobile Add a method in routes Copy mobile routes under the scope 'app' for app usage chris 2013-01-11 19:14:48 +0800
  • 91d1487a04 Fix mobile banner, icons, announcement css chris 2013-01-11 18:34:20 +0800
  • d00192f018 Fix for mobile icon and iphone5 fullscreen chris 2013-01-11 17:00:09 +0800
  • c224d04a70 correct personal journal language, but now hava no language config Rueshyna 2013-01-11 16:11:46 +0800
  • 5a4f681cfc Fix the tooltips overflow chris 2013-01-11 12:24:50 +0800
  • de39bce4ce Fix the tooltips chris 2013-01-11 12:13:16 +0800
  • b90e8efb1f Fix filter not collapsing Fix icon size for button chris 2013-01-11 11:37:11 +0800
  • a7d1cdbb75 Fix for link in ad banner chris 2013-01-11 11:28:13 +0800
  • c888d9cae4 modularize personal journal and pull relational setting in desktop/index.rb Rueshyna 2013-01-11 10:55:19 +0800
  • 92f3be3200 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2013-01-10 18:18:02 +0800
  • b950ad64c0 fix for fronted editing not responding for announcement. Fu Matthew 2013-01-10 18:17:27 +0800
  • ca51ebc08c apply view Fu Matthew 2013-01-10 18:00:58 +0800
  • e24f7a7880 Put back some field so ad_image can work chris 2013-01-10 11:08:57 +0800
  • 08adb887c5 change *default* to *defulat* Rueshyna 2013-01-10 09:40:52 +0800
  • c36f3152f5 Changes in css for structure icon and sidebar padding chris 2013-01-09 21:35:54 +0800
  • 1c1839fc00 Remove useless code in de_image.rb chris 2013-01-09 21:16:57 +0800
  • 02e5e52159 Translation typo Remove test values in ad_image form Remove NeedReset chris 2013-01-09 19:08:25 +0800
  • 48ce2278d0 Update disable time when separated picker new or reset date chris 2013-01-09 18:00:38 +0800
  • b49251afee Date picker separated: reset time when reset date chris 2013-01-09 17:08:09 +0800
  • 1d405c3ffe Add "tag" icon to orbit bar chris 2013-01-09 21:16:29 +0800
  • d8f6ebb153 Fix icons chris 2013-01-09 21:15:37 +0800
  • 7434d36e9b Ray's changes for icon size chris 2013-01-09 19:20:04 +0800
  • 933ac7b8fe Ray's changes for icon css chris 2013-01-09 18:01:23 +0800
  • 41dff814fb Change icons chris 2013-01-09 15:57:31 +0800
  • d0f474c2ab fix wrong i18n Fu Matthew 2013-01-09 17:13:25 +0800
  • 5ab4bbd367 add ad_banner inner page,pic title. Fu Matthew 2013-01-09 16:54:33 +0800
  • bc031f34f6 move js file to relational module but have js require problem Rueshyna 2013-01-09 16:16:47 +0800
  • 97eb9e19f9 restore js,journal_pages.js, Rueshyna 2013-01-09 14:40:58 +0800
  • 614b6fde71 fix wrong html structure for announcement frontend Fu Matthew 2013-01-09 12:13:55 +0800
  • 1d80b39dcb Fix no responding when trying to access front end page chris 2013-01-09 11:23:18 +0800
  • bc3cba5ebc fixed journal type page Rueshyna 2013-01-09 10:57:52 +0800
  • fac4faad6c Change date picker chris 2013-01-09 05:18:16 +0800
  • 4938198357 modularized personal journal Rueshyna 2013-01-08 18:12:28 +0800
  • 96ef70aba4 move journal code to persional_journal modulaar Rueshyna 2013-01-08 15:53:02 +0800
  • ded445aae3 amend file value to correct format Rueshyna 2013-01-08 11:01:23 +0800
  • 9c8bf1ffab Change translation chris 2013-01-08 17:30:36 +0800
  • 9584d67b23 member roles edit unknown 2013-01-08 16:58:01 +0800
  • 81d4481797 Merge commit '5b13c53ed99858f69d19bd03fe1a6bb74071a007' into sidebar_config Fu Matthew 2013-01-08 14:18:04 +0800
  • 76296ab29b Merge branch 'sidebar_config' into ntu Fu Matthew 2013-01-08 14:17:21 +0800
  • 5b13c53ed9 Ika's changes in default_widget.css chris 2013-01-08 12:50:28 +0800
  • 66dafbb2a0 Put impressionist delayed job in a patch chris 2013-01-08 12:45:15 +0800
  • e3d34263e3 Schedule job for tag_cloud chris 2013-01-08 12:36:50 +0800
  • 423e2ac54e Update bootstrap version 2.2.2 chris 2013-01-07 17:25:32 +0800
  • 67136cf595 Merge branch 'ntu_default_widget' of github.com:Rulingcom/orbit into ntu_default_widget chris 2013-01-07 17:22:01 +0800
  • 7594e1b9a6 fix member has no module_app Fu Matthew 2013-01-07 14:04:14 +0800
  • b71ebb3982 clean default widget Fu Matthew 2013-01-07 12:09:36 +0800
  • 5793f0fe5d default widget link. make sure to run rake migrate:make_default_widget_work_config for changing announcement module app Fu Matthew 2013-01-04 18:42:25 +0800
  • a34da20e48 Merge branch 'master' into desktop Rueshyna 2013-01-07 16:44:05 +0800
  • ad5ee83c01 Merge branch 'master' of https://github.com/Rulingcom/orbit Rueshyna 2013-01-07 16:43:35 +0800
  • 4ee683aa9b fixed desktop route Rueshyna 2013-01-07 16:38:02 +0800
  • 137beabde9 fix member has no module_app Fu Matthew 2013-01-07 14:04:14 +0800
  • 35e0011111 Merge remote-tracking branch 'remotes/origin/publication' into desktop Rueshyna 2013-01-07 12:44:30 +0800
  • abbecfbe2f clean default widget Fu Matthew 2013-01-07 12:09:36 +0800
  • 83935aaa60 Add translations chris 2013-01-07 10:42:17 +0800
  • 6c6bda988d Add mobile version in site settings chris 2013-01-07 03:57:36 +0800
  • 37740adb24 Add mobile but remove news in it chris 2012-12-20 03:21:50 +0800
  • 9745bcf7f1 Remove mysql chris 2012-12-22 17:35:59 +0800
  • c6111460f5 Fix album widget options chris 2013-01-07 00:40:43 +0800
  • be00cec4d7 Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end chris 2013-01-07 00:36:48 +0800
  • 5efbe07fbe default widget link. make sure to run rake migrate:make_default_widget_work_config for changing announcement module app Fu Matthew 2013-01-04 18:42:25 +0800
  • 736bda0679 Add link to default widget (temporary) chris 2013-01-04 12:33:37 +0800
  • 529197eb8c Merge branch 'default_widget' of github.com:Rulingcom/orbit into default_widget chris 2013-01-04 12:31:32 +0800
  • ac6da1340a Ika's fix for width nccu 2013-01-04 12:19:24 +0800
  • de2e57f681 Ika's fix for width nccu 2013-01-04 12:19:24 +0800
  • 7e045959b6 Gallery i18n chris 2013-01-04 12:01:32 +0800
  • b6f723d42d Merge branch 'default_widget' of github.com:Rulingcom/orbit into default_widget chris 2013-01-04 11:56:09 +0800
  • ea2d38b23b Ika's changes for css default widgets nccu 2013-01-04 11:43:03 +0800
  • d4c470f76f Ika's changes for css default widgets nccu 2013-01-04 11:43:03 +0800
  • 3e8b029c5f change bulletin object to bulletin title Rueshyna 2013-01-04 10:50:08 +0800
  • a0868a05ac Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-04 09:43:38 +0800
  • 49e289e0fd fixing default widget error when needs image Fu Matthew 2013-01-03 20:07:05 +0800
  • 39f715319b Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2013-01-03 19:41:52 +0800
  • a70110f787 make default widget works without init Fu Matthew 2013-01-03 19:38:14 +0800
  • fa83dbf791 Fix order in structure chris 2013-01-03 19:12:52 +0800
  • 5b289bc1d2 Fix old tags chris 2013-01-03 12:16:02 +0800
  • fd2b176798 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-03 18:40:41 +0800
  • 8815533075 correct pic file format Rueshyna 2013-01-03 18:16:00 +0800
  • 1856d2395d complete page error handler logic Fu Matthew 2013-01-03 15:35:14 +0800
  • 8e33313b13 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-03 14:47:18 +0800
  • cb3a9ea98b change sub_menu to header in site setting Rueshyna 2013-01-03 14:46:02 +0800
  • 6da528ef98 show error message when trying to show a not existed page Fu Matthew 2013-01-03 13:50:27 +0800
  • 80f545966e Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-03 12:25:50 +0800
  • 5d6279a9ea fix calendar broken Fu Matthew 2013-01-03 10:58:52 +0800
  • d44ac6617a Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-03 09:41:54 +0800
  • 10473af154 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2013-01-02 17:53:00 +0800
  • 2c632551e5 fix preview filed after ad_banner created. Fu Matthew 2013-01-02 17:51:53 +0800
  • f67664df29 custom icon for msoffice Rueshyna 2013-01-02 17:35:21 +0800
  • 5f7453c3fb generalization file type Rueshyna 2013-01-02 16:58:48 +0800
  • f4692182c0 when mouse move to button of announcement file : image => preview pic, file => type Rueshyna 2013-01-02 16:32:47 +0800
  • 506770bf33 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-02 16:34:09 +0800
  • 641b5310b0 fix NTU album module_app data Fu Matthew 2013-01-02 16:04:11 +0800
  • b179668a9c Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2013-01-02 14:35:34 +0800
  • 32c6f17613 fix object auth. show error message if user try to do object auth in a wrong way. Fu Matthew 2013-01-02 14:34:34 +0800
  • 8a6f92b87b fixed announcement controller syntax error Rueshyna 2013-01-02 10:19:56 +0800
  • 3875e8e79e Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2013-01-02 10:10:53 +0800
  • 9937b4ac9b Fix deleting links and files in bulletin chris 2012-12-31 18:03:13 +0800
  • ded1d9f44c Add lost file for widget option Fu Matthew 2012-12-28 17:58:35 +0800