Commit Graph

  • e5e8d8137f fixed compiler warnnings 高铁 2016-01-31 14:52:35 +08:00
  • bf84b37a10 fixed compiler warnnings 高铁 2016-01-31 14:52:35 +08:00
  • 8ee2398244 合并冲突 东杰 2016-01-21 23:30:52 +08:00
  • 77d3b521e5 合并冲突 东杰 2016-01-21 23:30:52 +08:00
  • 75974a9630 Merge branch 'master' of https://github.com/kfhanjie/fastjson 东杰 2016-01-21 23:29:15 +08:00
  • cc4c0d50d9 Merge branch 'master' of https://github.com/kfhanjie/fastjson 东杰 2016-01-21 23:29:15 +08:00
  • a3e83d9148 支持json里带c风格注释 东杰 2016-01-21 23:26:41 +08:00
  • c969fe6097 支持json里带c风格注释 东杰 2016-01-21 23:26:41 +08:00
  • 441164d7da 支持json里带c风格注释 东杰 2016-01-21 23:04:49 +08:00
  • 4ad7f726ba 支持json里带c风格注释 东杰 2016-01-21 23:04:49 +08:00
  • 815f2b5c0a Merge pull request #480 from mrkcsc/feature/peek wenshao 2016-01-19 10:52:02 +08:00
  • 8d8e454667 Merge pull request #480 from mrkcsc/feature/peek wenshao 2016-01-19 10:52:02 +08:00
  • 6278f1ff38 Merge pull request #484 from pra85/patch-1 wenshao 2016-01-19 10:51:13 +08:00
  • 53484cf6cc Merge pull request #484 from pra85/patch-1 wenshao 2016-01-19 10:51:13 +08:00
  • 2f821a199e Update license year range to 2016 Prayag Verma 2016-01-18 10:57:57 +05:30
  • 3187bfed30 Update license year range to 2016 Prayag Verma 2016-01-18 10:57:57 +05:30
  • 7f48b73568 Expose peek method to handle reading object fields that may be null, similar to GSON. mrkcsc 2016-01-12 05:45:29 -08:00
  • 2dc38249e9 Expose peek method to handle reading object fields that may be null, similar to GSON. mrkcsc 2016-01-12 05:45:29 -08:00
  • ca2cb13c0e improve Immutable Object support using asm 高铁 2016-01-08 13:31:44 +08:00
  • 8a01882bda improve Immutable Object support using asm 高铁 2016-01-08 13:31:44 +08:00
  • 44c700391f immutable value object support, https://github.com/alibaba/fastjson/issues/473 高铁 2016-01-08 11:59:41 +08:00
  • a4f9f629d8 immutable value object support, https://github.com/alibaba/fastjson/issues/473 高铁 2016-01-08 11:59:41 +08:00
  • 0bf508224c Fix typos: featrue -> feature Felix Yan 2015-11-16 13:45:44 +08:00
  • 9784ab4756 Fix typos: featrue -> feature Felix Yan 2015-11-16 13:45:44 +08:00
  • bc579a973b Merge pull request #450 from yongqing/master wenshao 2015-11-09 21:43:48 +08:00
  • 2daf4e72e6 Merge pull request #450 from yongqing/master wenshao 2015-11-09 21:43:48 +08:00
  • 59f5baa1f7 升级gson版本和fieldinfo.getQualifiedName重命名 yongqing.zhangyq 2015-11-09 21:38:01 +08:00
  • faee096488 升级gson版本和fieldinfo.getQualifiedName重命名 yongqing.zhangyq 2015-11-09 21:38:01 +08:00
  • 109372029c Merge pull request #433 from ronnin/patch-1 高铁 2015-11-07 04:12:40 +08:00
  • 22816995d9 Merge pull request #433 from ronnin/patch-1 高铁 2015-11-07 04:12:40 +08:00
  • df0e02b549 Merge pull request #441 from yakolee/master Yako 2015-10-29 16:20:35 +08:00
  • 47096615f8 Merge pull request #441 from yakolee/master Yako 2015-10-29 16:20:35 +08:00
  • d48925fd27 change version to 1.2.8 Yako 2015-10-29 16:19:57 +08:00
  • 06c6e0c2ae change version to 1.2.8 Yako 2015-10-29 16:19:57 +08:00
  • 28e3592e5e Merge pull request #440 from yakolee/master Yako 2015-10-29 16:13:56 +08:00
  • aef2eea7e5 Merge pull request #440 from yakolee/master Yako 2015-10-29 16:13:56 +08:00
  • 117ef36b8f bugfix for CircularReference_deserialize Yako 2015-10-29 16:11:20 +08:00
  • 9ed1d71ff0 bugfix for CircularReference_deserialize Yako 2015-10-29 16:11:20 +08:00
  • 3446cf4311 spell fix Ronnin Lee 2015-10-21 14:26:35 +08:00
  • 8c61a91684 spell fix Ronnin Lee 2015-10-21 14:26:35 +08:00
  • 7b1c901b35 1.2.7 Yako 2015-09-01 15:11:24 +08:00
  • d7867e6d61 1.2.7 1.2.7 Yako 2015-09-01 15:11:24 +08:00
  • 7ea2c3189b Merge pull request #411 from zhaolong/master 高铁 2015-08-31 23:50:15 +08:00
  • 54d8af3b42 Merge pull request #411 from zhaolong/master 高铁 2015-08-31 23:50:15 +08:00
  • 61c32c9b30 bugfix issue408 lZl 2015-08-30 20:03:49 +08:00
  • 226b46dc1c bugfix issue408 lZl 2015-08-30 20:03:49 +08:00
  • 0209c71532 Merge branch 'master' of https://github.com/alibaba/fastjson 高铁 2015-08-26 13:17:24 +08:00
  • bcc2b09153 Merge branch 'master' of https://github.com/alibaba/fastjson 高铁 2015-08-26 13:17:24 +08:00
  • 74e8fd2fa8 bug fixed for jsonpath 高铁 2015-08-26 13:17:01 +08:00
  • 1a871d411c bug fixed for jsonpath 高铁 2015-08-26 13:17:01 +08:00
  • e5290adb5e bugfix issue376 & resove conflicts Yako 2015-08-25 10:59:09 +08:00
  • 784ac2536e bugfix issue376 & resove conflicts Yako 2015-08-25 10:59:09 +08:00
  • 2e6632accc imporoved jsonpointer support 高铁 2015-08-24 02:55:31 +08:00
  • 5925fafc93 imporoved jsonpointer support 高铁 2015-08-24 02:55:31 +08:00
  • 2f1893cf23 bug fixed for JSONArray.set 高铁 2015-08-24 01:27:58 +08:00
  • bb9f88d11e bug fixed for JSONArray.set 高铁 2015-08-24 01:27:58 +08:00
  • 6f067e07da JSONPath support JSONPointer syntax 高铁 2015-08-23 15:57:11 +08:00
  • aa30f0e756 JSONPath support JSONPointer syntax 高铁 2015-08-23 15:57:11 +08:00
  • e531cfe31e bug fixed for IgnoreNonFieldGetter 高铁 2015-08-23 01:20:42 +08:00
  • 8d14aecfde bug fixed for IgnoreNonFieldGetter 高铁 2015-08-23 01:20:42 +08:00
  • 27e72ec6b4 remove odps support, create new project fastjson-odps 高铁 2015-08-22 01:58:01 +08:00
  • 59c036765d remove odps support, create new project fastjson-odps 高铁 2015-08-22 01:58:01 +08:00
  • 32309023bf Merge branch 'master' of https://github.com/alibaba/fastjson 高铁 2015-08-22 01:28:39 +08:00
  • d5c2e76d74 Merge branch 'master' of https://github.com/alibaba/fastjson 高铁 2015-08-22 01:28:39 +08:00
  • 2e4a7a70c8 bug fixed for big class serialization 高铁 2015-08-22 01:28:31 +08:00
  • e75bf651d1 bug fixed for big class serialization 高铁 2015-08-22 01:28:31 +08:00
  • bd0e6c54d0 Merge pull request #402 from vbauer/cleanup-modifiers 高铁 2015-08-22 01:23:27 +08:00
  • ab0ec651bc Merge pull request #402 from vbauer/cleanup-modifiers 高铁 2015-08-22 01:23:27 +08:00
  • 19e0ede618 bug fixed for big class serialzation 高铁 2015-08-19 08:10:36 +08:00
  • c74c341f2c bug fixed for big class serialzation 高铁 2015-08-19 08:10:36 +08:00
  • 0b413d289a Code cleanup: remove unnecessary modifiers Vladislav Bauer 2015-08-17 21:50:43 +06:00
  • 58046d1cf9 Code cleanup: remove unnecessary modifiers Vladislav Bauer 2015-08-17 21:50:43 +06:00
  • ec345c8658 Merge pull request #396 from alibaba/revert-387-master Yako 2015-08-10 15:36:31 +08:00
  • 6911ca803d Merge pull request #396 from alibaba/revert-387-master Yako 2015-08-10 15:36:31 +08:00
  • 0a9babbafe Revert "bugfix issue376" Yako 2015-08-10 15:36:13 +08:00
  • 187d5df0f5 Revert "bugfix issue376" Yako 2015-08-10 15:36:13 +08:00
  • f175946c77 Merge pull request #387 from qifanyang/master Yako 2015-08-10 15:34:12 +08:00
  • a504fb71d4 Merge pull request #387 from qifanyang/master Yako 2015-08-10 15:34:12 +08:00
  • a0c903e71f 添加bug_376测试 qifanyang 2015-08-09 17:30:01 +08:00
  • 6fa45d63da 添加bug_376测试 qifanyang 2015-08-09 17:30:01 +08:00
  • 2c7038ed26 Delete Bug_376_for_iso8601 qifanyang 2015-08-09 17:28:45 +08:00
  • 2d16802bae Delete Bug_376_for_iso8601 qifanyang 2015-08-09 17:28:45 +08:00
  • 403cf40931 添加测试 bug_376 qifanyang 2015-08-09 17:27:57 +08:00
  • f54005ef0a 添加测试 bug_376 qifanyang 2015-08-09 17:27:57 +08:00
  • 9670a1cb3c improve performance for issue #382 shaojin.wensj 2015-08-08 15:09:28 +08:00
  • 41fd6c9e2d improve performance for issue #382 shaojin.wensj 2015-08-08 15:09:28 +08:00
  • 2c67669d27 Merge pull request #395 from yuankui/fastjson-fix 高铁 2015-08-08 14:20:20 +08:00
  • ec6b01ffd8 Merge pull request #395 from yuankui/fastjson-fix 高铁 2015-08-08 14:20:20 +08:00
  • 822ac406ac support SerializerFeature.IgnoreNonFieldGetter & LabelFilter shaojin.wensj 2015-08-08 12:47:28 +08:00
  • 7aad7d9ea7 support SerializerFeature.IgnoreNonFieldGetter & LabelFilter shaojin.wensj 2015-08-08 12:47:28 +08:00
  • 01ccf3df17 fix multi thread permformance issue yuankui 2015-08-07 23:34:04 +08:00
  • f27315b928 fix multi thread permformance issue yuankui 2015-08-07 23:34:04 +08:00
  • 1277217240 bugfix issue376 qifanyang 2015-08-06 09:51:48 +08:00
  • 5ae4ff35b1 bugfix issue376 qifanyang 2015-08-06 09:51:48 +08:00
  • 0f03968731 change version to 1.2.7 shaojin.wensj 2015-07-23 10:53:10 +08:00
  • 0113dd5ce8 change version to 1.2.7 shaojin.wensj 2015-07-23 10:53:10 +08:00
  • 338e9e6d8d improved odps udf support shaojin.wensj 2015-07-23 10:52:03 +08:00
  • a4eb8d6ba0 improved odps udf support shaojin.wensj 2015-07-23 10:52:03 +08:00
  • c506a1fbe6 Merge pull request #362 from shibenli/master 高铁 2015-07-07 01:22:57 +08:00
  • c42e3425f7 Merge pull request #362 from shibenli/master 高铁 2015-07-07 01:22:57 +08:00