894 Commits

Author SHA1 Message Date
高铁 11801e8ea6 1.2.8 1.2.8 2016-02-28 16:59:40 +08:00
高铁 a0dd899ee6 support oracle jdbc driver classes : oracle.sql.TIMESTAMP/oracle.sql.DATE 2016-02-28 16:41:44 +08:00
高铁 53cd987a5c optimized for isAndroid call 2016-02-28 16:40:45 +08:00
高铁 11865c6d37 bug fixed for issue 483, https://github.com/alibaba/fastjson/issues/483 2016-02-28 15:36:41 +08:00
高铁 994ef3c54a bug fixed for issue 504 2016-02-28 13:48:21 +08:00
高铁 d3af0d5a9c bug fixed for issue 502, support chinese getter/setter 2016-02-28 11:47:41 +08:00
wenshao 840c2d4c3d Merge pull request #452 from felixonmars/master
Fix typos: featrue -> feature
2016-02-27 23:05:33 +08:00
wenshao 51134f5d34 Merge pull request #487 from kfhanjie/master
支持json里带c风格注释
2016-02-27 22:49:57 +08:00
wenshao 031a786ff6 Merge pull request #501 from danieldingzju/master
添加cache,解决并发问题,提高性能。
2016-02-27 21:04:20 +08:00
wenshao f1e7074e0e Merge pull request #506 from yixblog/master
#340,#471 fixed
2016-02-27 21:03:26 +08:00
yixian 6c04c0bcb0 当反序列化带classname的json string到java bean时,无法正常反序列化java bean 中的JSONObject类型字段(无论有没有内容返回的JSONObject都是空的,但Map<String,Object>类型可以正常反序列化)的bug 2016-02-25 12:28:53 +08:00
danieldingzju d22f237355 添加cache,解决并发问题,提高性能。 2016-02-18 13:25:33 +08:00
wenshao a907924812 Merge pull request #499 from myshzzx/master
browserCompatible feature add: double quote long fields exceed [-2^53+1, 2^53-1]
2016-02-15 05:47:31 +08:00
mysh 83c3f2f739 browserCompatible feature add: double quote long fields exceed [-2^53+1, 2^53-1] 2016-02-04 09:37:17 +08:00
高铁 e0c7f044db TypeUtils support boolean cast to integer 2016-01-31 15:01:48 +08:00
高铁 bf84b37a10 fixed compiler warnnings 2016-01-31 14:52:35 +08:00
东杰 77d3b521e5 合并冲突 2016-01-21 23:30:52 +08:00
东杰 cc4c0d50d9 Merge branch 'master' of https://github.com/kfhanjie/fastjson
Conflicts:
	src/main/java/com/alibaba/fastjson/parser/JSONReaderScanner.java
	src/main/java/com/alibaba/fastjson/parser/JSONScanner.java
2016-01-21 23:29:15 +08:00
东杰 c969fe6097 支持json里带c风格注释 2016-01-21 23:26:41 +08:00
东杰 4ad7f726ba 支持json里带c风格注释 2016-01-21 23:04:49 +08:00
wenshao 8d8e454667 Merge pull request #480 from mrkcsc/feature/peek
Expose peek method to handle reading object fields that may be null, …
2016-01-19 10:52:02 +08:00
wenshao 53484cf6cc Merge pull request #484 from pra85/patch-1
Update license year range to 2016
2016-01-19 10:51:13 +08:00
Prayag Verma 3187bfed30 Update license year range to 2016 2016-01-18 10:57:57 +05:30
mrkcsc 2dc38249e9 Expose peek method to handle reading object fields that may be null, similar to GSON.
https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/stream/JsonReader.html
2016-01-13 23:40:23 -08:00
高铁 8a01882bda improve Immutable Object support using asm 2016-01-08 13:31:44 +08:00
高铁 a4f9f629d8 immutable value object support, https://github.com/alibaba/fastjson/issues/473 2016-01-08 11:59:41 +08:00
Felix Yan 9784ab4756 Fix typos: featrue -> feature 2015-11-16 13:45:44 +08:00
wenshao 2daf4e72e6 Merge pull request #450 from yongqing/master
升级gson版本和fieldinfo.getQualifiedName重命名
2015-11-09 21:43:48 +08:00
yongqing.zhangyq faee096488 升级gson版本和fieldinfo.getQualifiedName重命名 2015-11-09 21:38:01 +08:00
高铁 22816995d9 Merge pull request #433 from ronnin/patch-1 2015-11-07 04:12:40 +08:00
Yako 47096615f8 Merge pull request #441 from yakolee/master
change version to 1.2.8
2015-10-29 16:20:35 +08:00
Yako 06c6e0c2ae change version to 1.2.8 2015-10-29 16:19:57 +08:00
Yako aef2eea7e5 Merge pull request #440 from yakolee/master
bugfix for CircularReference_deserialize
2015-10-29 16:13:56 +08:00
Yako 9ed1d71ff0 bugfix for CircularReference_deserialize 2015-10-29 16:11:20 +08:00
Ronnin Lee 8c61a91684 spell fix
gerQualifiedName --> getQualifiedName
2015-10-21 14:26:35 +08:00
Yako d7867e6d61 1.2.7 1.2.7 2015-09-01 15:11:24 +08:00
高铁 54d8af3b42 Merge pull request #411 from zhaolong/master
bugfix issue408
2015-08-31 23:50:15 +08:00
lZl 226b46dc1c bugfix issue408 2015-08-30 20:03:49 +08:00
高铁 bcc2b09153 Merge branch 'master' of https://github.com/alibaba/fastjson 2015-08-26 13:17:24 +08:00
高铁 1a871d411c bug fixed for jsonpath 2015-08-26 13:17:01 +08:00
Yako 784ac2536e bugfix issue376 & resove conflicts 2015-08-25 10:59:09 +08:00
高铁 5925fafc93 imporoved jsonpointer support 2015-08-24 02:55:31 +08:00
高铁 bb9f88d11e bug fixed for JSONArray.set 2015-08-24 01:27:58 +08:00
高铁 aa30f0e756 JSONPath support JSONPointer syntax 2015-08-23 15:57:11 +08:00
高铁 8d14aecfde bug fixed for IgnoreNonFieldGetter 2015-08-23 01:20:42 +08:00
高铁 59c036765d remove odps support, create new project fastjson-odps 2015-08-22 01:58:01 +08:00
高铁 d5c2e76d74 Merge branch 'master' of https://github.com/alibaba/fastjson 2015-08-22 01:28:39 +08:00
高铁 e75bf651d1 bug fixed for big class serialization 2015-08-22 01:28:31 +08:00
高铁 ab0ec651bc Merge pull request #402 from vbauer/cleanup-modifiers
Very nice Thank you
2015-08-22 01:23:27 +08:00
高铁 c74c341f2c bug fixed for big class serialzation 2015-08-19 08:10:36 +08:00