Commit Graph

  • 30f9295010 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2012-12-28 16:06:22 +0800
  • 2d8400d1cc Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu chris 2012-12-28 15:34:24 +0800
  • 61b0f94c04 Remove I18n.locale for announcement front-end Fix counter in back-end edit chris 2012-12-28 15:34:04 +0800
  • 5587e83419 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2012-12-28 15:31:32 +0800
  • baf1240b76 gallery options Fu Matthew 2012-12-28 15:30:46 +0800
  • 4d965d754b Fix urls in tinymce source editor chris 2012-12-28 15:03:02 +0800
  • e8e7c38221 Changes for announcement widget style 1 and categories chris 2012-12-28 14:01:04 +0800
  • 455a27437d Changes for announcement widget style 2 chris 2012-12-28 13:47:30 +0800
  • 974a190eaf Fix orbit_front parser chris 2012-12-28 11:51:56 +0800
  • 0a0298aaad Fix counter front-end chris 2012-12-28 11:44:33 +0800
  • 37309a452d Fix site map and menu order chris 2012-12-28 11:37:37 +0800
  • 17d93409b3 Remove extra double quote in sub_menu Fix web link widget pagination chris 2012-12-28 11:10:33 +0800
  • bab8328029 Put back old tags (don't use the class ProtoTag) chris 2012-12-28 10:43:48 +0800
  • ec96a2e0e7 Add page counter chris 2012-12-28 10:36:18 +0800
  • 1c07224694 fixed page_parts submit button Rueshyna 2012-12-28 10:12:17 +0800
  • c219792a13 fixed delete function of archive file Rueshyna 2012-12-28 10:02:16 +0800
  • 37f8c1637a new desktop framework updates Harry Bomrah 2012-12-27 18:25:54 +0800
  • 2a122c7f5c Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2012-12-27 17:55:19 +0800
  • a7cf6dd694 reverse structure order Rueshyna 2012-12-27 17:54:52 +0800
  • 751d3b1220 Announcement widget: remove I18n.locale Add part_id in url chris 2012-12-27 16:52:58 +0800
  • 3346f83923 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2012-12-27 16:49:50 +0800
  • 269e5b033f Fix for page_part and widget back-end chris 2012-12-27 16:20:40 +0800
  • 2d6b70b97f regenerate pageparts Fu Matthew 2012-12-27 15:50:05 +0800
  • 4db057e971 Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2012-12-27 15:28:01 +0800
  • 2901b8e30c Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Fu Matthew 2012-12-27 15:06:19 +0800
  • 2dd0f9a9d2 fix disappear widget inter block Fu Matthew 2012-12-27 15:05:24 +0800
  • 0655baab19 make longer devise timeout Fu Matthew 2012-12-27 15:03:11 +0800
  • 9e07794cbc soft structure order Rueshyna 2012-12-27 14:36:51 +0800
  • 34ed8ae39c Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu Rueshyna 2012-12-27 12:22:19 +0800
  • 177a409508 fixed search_bar placeholder Rueshyna 2012-12-27 10:38:27 +0800
  • 81b0e3c38f change ActiveSupport::SecureRandom to SecureRandom in orbit core Rueshyna 2012-12-27 12:14:59 +0800
  • cfb65dd056 Preventing site default design being deleted. Fu Matthew 2012-12-27 10:20:37 +0800
  • 71fc85c24e fix widget. Matthew K. Fu JuYuan 2012-12-25 10:45:08 +0800
  • 2dd2368378 remove merge marks Matthew K. Fu JuYuan 2012-12-25 11:26:23 +0800
  • 49e6c33b57 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config Matthew K. Fu JuYuan 2012-12-25 11:01:36 +0800
  • ec791a6646 keep zh_Tw alive Matthew K. Fu JuYuan 2012-12-25 10:45:33 +0800
  • 47a63e3dab fix widget. Matthew K. Fu JuYuan 2012-12-25 10:45:08 +0800
  • 41bcbdd2f0 missing file? Matthew K. Fu JuYuan 2012-12-24 11:55:33 +0800
  • 062ebecae3 fix serval bugs on sidebar. Matthew K. Fu JuYuan 2012-12-07 12:40:47 +0800
  • 2c69590c36 rename of GPRS now it's named location Matthew K. Fu JuYuan 2012-12-07 12:40:21 +0800
  • 397729d3a1 Remove GPRS Matthew K. Fu JuYuan 2012-12-07 12:36:25 +0800
  • 53afb6ea0c sidebar rewrited Matthew K. Fu JuYuan 2012-12-05 18:35:58 +0800
  • 5f712622ad default widgets and sidebar. Matthew K. Fu JuYuan 2012-12-03 18:52:36 +0800
  • 6995bb1622 put module app json into init,making orbit app work with module app. Matthew K. Fu JuYuan 2012-11-29 14:21:46 +0800
  • 36f6a6fdd6 first version of confined sidebar render Matthew K. Fu JuYuan 2012-11-20 15:56:52 +0800
  • 194b42c1e4 fix widget from post method Matthew K. Fu JuYuan 2012-12-24 15:22:26 +0800
  • b89cd80800 fix widget bug Matthew K. Fu JuYuan 2012-12-24 14:04:32 +0800
  • 5002916352 Remove mysql chris 2012-12-22 17:35:59 +0800
  • 8381941d51 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu chris 2012-12-21 18:36:01 +0800
  • e1a3201830 Fix multiple pop-ups in structure delete chris 2012-12-21 18:34:13 +0800
  • 507191426e Fix submenu error chris 2012-12-21 14:56:12 +0800
  • 68266e17ed Update Gemfile for rails 3.2 nccu 2012-12-20 20:18:33 +0800
  • 3c79200c2f Fix wrong deletion in parser for gallery chris 2012-12-20 16:02:03 +0800
  • 8ec0b35245 Fix wrong deletion in parser for gallery chris 2012-12-20 16:01:27 +0800
  • e9815c3d9b Fix css bug when precompiling assets chris 2012-12-20 14:34:02 +0800
  • 7ac6958690 Fix css bug when precompiling assets chris 2012-12-20 14:32:06 +0800
  • fc076a28bd Remove useless css chris 2012-12-20 13:53:28 +0800
  • 30268ab3bc Remove useless css chris 2012-12-20 13:52:23 +0800
  • 3a9106c10d Add mobile but remove news in it chris 2012-12-20 03:21:50 +0800
  • d827fbc852 Comment out desktop links chris 2012-12-19 21:32:55 +0800
  • cf91139b84 Merge branch 'member_data' of github.com:Rulingcom/orbit into member_data chris 2012-12-19 20:22:25 +0800
  • b4633a2ccb .not_guest_user Rueshyna 2012-12-19 18:51:17 +0800
  • 3d39c2c3c3 hidden guest user Rueshyna 2012-12-19 16:46:01 +0800
  • ec1fad9729 fixed empty name of member list Rueshyna 2012-12-19 15:28:49 +0800
  • 1372f51e75 .not_guest_user Rueshyna 2012-12-19 18:51:17 +0800
  • 83fb5230a4 Changes for site map front end indentation chris 2012-12-19 17:26:38 +0800
  • fcbba6660b Only one parser for front end Separate site map for i18n chris 2012-12-19 17:15:31 +0800
  • 6035428422 hidden guest user Rueshyna 2012-12-19 16:46:01 +0800
  • 0fa1b43f06 fixed empty name of member list Rueshyna 2012-12-19 15:28:49 +0800
  • fdae7e4a2c Merge branch 'master' of https://github.com/Rulingcom/orbit Rueshyna 2012-12-19 15:06:57 +0800
  • 858e942da2 fix serval bugs on sidebar. Matthew K. Fu JuYuan 2012-12-07 12:40:47 +0800
  • bd743a0ca5 rename of GPRS now it's named location Matthew K. Fu JuYuan 2012-12-07 12:40:21 +0800
  • f1c628f2d6 Merge branch 'publication' chris 2012-12-07 12:39:37 +0800
  • dc84023372 Merge branch 'publication' of github.com:Rulingcom/orbit into publication chris 2012-12-07 12:38:48 +0800
  • 607a4f5acf fixed fileview in english mode Harry Bomrah 2012-12-07 11:19:40 +0800
  • 9dde79414d all sections and sections megerd Harry Bomrah 2012-12-07 10:10:38 +0800
  • e07fb7d434 Remove GPRS Matthew K. Fu JuYuan 2012-12-07 12:36:25 +0800
  • a1b1fc9d34 Remove test chris 2012-12-07 12:32:43 +0800
  • ff435a4af4 Change the design for the whole site form designs index chris 2012-12-07 12:14:31 +0800
  • acaf707900 Merge branch 'publication' of github.com:Rulingcom/orbit into publication chris 2012-12-07 11:22:06 +0800
  • ad8273d638 fixed fileview in english mode Harry Bomrah 2012-12-07 11:19:40 +0800
  • 4d07b0753c Merge branch 'publication' of github.com:Rulingcom/orbit into publication chris 2012-12-07 10:13:41 +0800
  • 08b99011d0 all sections and sections megerd Harry Bomrah 2012-12-07 10:10:38 +0800
  • c74ead8318 Redirect to designs after buying template Randomise buy counts chris 2012-12-07 09:07:49 +0800
  • a48690d4bf Merge branches 'publication' and 'publication' of github.com:Rulingcom/orbit into publication chris 2012-12-07 04:21:41 +0800
  • 1c7ddb4b29 fixed empty db bug Rueshyna 2012-12-06 22:29:43 +0800
  • a84cb560a0 make factory girl file clean Rueshyna 2012-12-06 22:05:22 +0800
  • 59c4080f0c stupid fix Harry Bomrah 2012-12-06 18:50:24 +0800
  • da3f0b58f5 section fixed and some other fixes Harry Bomrah 2012-12-06 17:43:19 +0800
  • e87526d7bb try to fix problem Rueshyna 2012-12-06 16:24:40 +0800
  • adb9621877 fixed bug Rueshyna 2012-12-06 15:53:46 +0800
  • 3d382fec6b scroll fixed... Harry Bomrah 2012-12-06 15:44:16 +0800
  • 24f6623787 fixed bug about co-author-relation Rueshyna 2012-12-06 15:20:56 +0800
  • 39b5959de7 fixed bug about co-author-relation Rueshyna 2012-12-06 15:20:06 +0800
  • 222ae37cd4 fixed edit and new page of co-author Rueshyna 2012-12-06 11:56:47 +0800
  • 89e25fe7a2 view update devin 2012-12-06 11:43:40 +0800
  • 1b4c76a472 current version Rueshyna 2012-12-06 09:49:15 +0800
  • af381e75de Add images to store chris 2012-12-07 02:37:05 +0800
  • 6f1748d2b3 - template list/show is loaded from central server - buy a template downloads and creates it in DB - changes in designs index chris 2012-12-06 23:20:27 +0800
  • eb53343bdb Merge branch 'store' of github.com:Rulingcom/orbit into store chris 2012-12-06 23:11:38 +0800