Commit graph

1114 commits

Author SHA1 Message Date
alisdair sullivan
400d046746 Revert "Master" 2015-08-04 10:18:06 -07:00
alisdair sullivan
0bba0df858 Merge pull request #82 from Ledest/master
switch back to feature detection for maps and binary_to_integer/float
fix docs building problems
2015-08-04 10:16:48 -07:00
Led
7be3d9dc62 add .rebar and doc dirs to .gitignore 2015-08-03 00:52:22 +03:00
Led
446f674f27 add rebar.config.script for checking support maps and binary_to_{integer,float}/1 2015-08-03 00:50:22 +03:00
Led
fef001479f fix build docs 2015-08-03 00:49:52 +03:00
alisdair sullivan
3a051c60dd Merge branch 'develop' 2015-07-07 14:01:41 -07:00
alisdair sullivan
e6f1313c60 update .travis.yml for erlang 17.5 and 18.0 2015-07-07 13:53:58 -07:00
alisdair sullivan
a67186ddd2 v2.6.2 2015-06-11 19:57:12 -07:00
alisdair sullivan
46f246dc3a Merge branch 'develop' 2015-06-11 19:56:40 -07:00
alisdair sullivan
c86b56795b v2.6.2 2015-06-11 19:54:29 -07:00
alisdair sullivan
e7696cc647 Merge pull request #78 from liveforeverx/mix_compile
Always add maps_support to mix compiled build
2015-05-19 07:25:18 -07:00
Dima Aleksandrov
ba77cccd49 always add maps_support to mix compiled build 2015-05-19 13:22:24 +02:00
alisdair sullivan
dfcba6e471 update mix deps 2015-05-12 18:47:57 -07:00
alisdair sullivan
58b9887780 v2.6.1 2015-05-12 15:17:05 -07:00
alisdair sullivan
cd2e69e167 change mixunit from an optional dependency to a :dev only dependency 2015-05-12 15:13:37 -07:00
alisdair sullivan
d98df17dd7 v2.6.0 2015-04-20 20:04:21 -07:00
alisdair sullivan
56880ce519 v2.6.0 2015-04-20 20:00:23 -07:00
alisdair sullivan
2008e989c8 v2.6.0 2015-04-20 19:56:13 -07:00
alisdair sullivan
47ce39f040 v2.5.3 2015-04-20 16:24:43 -07:00
alisdair sullivan
cb3b25e1e5 v2.5.3 2015-04-20 16:24:30 -07:00
alisdair sullivan
a86cbec611 Merge pull request #77 from kpy3/unused-spec-from-preencode
Update README.md
2015-04-20 16:13:35 -07:00
Sergey Yelin
76df65b19d Update README.md
Remove unused spec from encode/1,2 doc
2015-04-15 18:05:35 +03:00
alisdair sullivan
f5dc574a86 Merge remote-tracking branch 'github/develop' into develop 2015-03-15 12:29:46 -07:00
alisdair sullivan
eb8dab979b Merge branch 'master' into develop 2015-03-15 12:29:27 -07:00
alisdair sullivan
327f0d2875 v2.5.2 2015-03-15 12:06:10 -07:00
Bikram Chatterjee
bb422c988f fixed -0e0 decoding crash with test 2015-03-15 12:06:10 -07:00
alisdair sullivan
fbe0e009e9 Merge pull request #76 from c-bik/develop
fixed -0e0 decoding crash with test
2015-03-12 19:35:27 -07:00
Bikram Chatterjee
db01aa6ba7 fixed -0e0 decoding crash with test 2015-03-13 00:48:33 +01:00
alisdair sullivan
9706401c0e v2.5.1 2015-03-03 10:45:23 -08:00
alisdair sullivan
018c724b53 v2.5.1 2015-03-03 10:44:36 -08:00
alisdair sullivan
84f4b7fb40 assume all datetimes are UTC time and add timezone designator to
generated iso8601 strings
2015-03-03 10:43:04 -08:00
alisdair sullivan
2824e56d44 v2.5.0 2015-02-25 20:42:36 -08:00
alisdair sullivan
9a87c010e5 v2.5.0 2015-02-25 20:41:01 -08:00
alisdair sullivan
0babda82d3 v2.5.0 2015-02-25 20:40:17 -08:00
alisdair sullivan
dfd75d5ef0 fix config test that failed due to reordered config flags 2015-01-25 21:51:26 -08:00
alisdair sullivan
65a9539851 Merge remote-tracking branch 'github/develop' into develop 2015-01-25 21:45:57 -08:00
alisdair sullivan
72c92bae0d add experimental consult/1,2 function that consults a file
containing zero or more json terms and returns them in a list
2015-01-25 21:44:15 -08:00
alisdair sullivan
f0774bf6a6 Merge pull request #71 from srijan/patch-1
Json value can be proplist even if maps are supported
2015-01-04 15:08:07 -08:00
Srijan Choudhary
3165dd9c54 Json value can be proplist even if maps are supported 2015-01-03 18:59:08 +05:30
alisdair sullivan
d4d838d4f4 always return maps if the macro maps_always is defined 2014-12-18 15:58:19 -08:00
alisdair sullivan
8592742ded rework decoder and encoder slightly to be a little more sane 2014-12-11 06:57:49 +00:00
alisdair sullivan
3625aaeb66 remove vestigial flatify function 2014-12-09 18:37:29 -08:00
alisdair sullivan
f6641a445f switch travis indicator back to develop 2014-12-09 16:42:08 -08:00
alisdair sullivan
e751e3324f v2.4.0 2014-12-09 16:27:15 -08:00
alisdair sullivan
8f62b3adf1 v2.4.0 2014-12-09 16:24:09 -08:00
alisdair sullivan
8797ff6d9b disable maps on R14, R15 and R16 2014-12-09 16:09:38 -08:00
alisdair sullivan
a9a2c2ebe6 revert a jsx_to_term optimizatin that micro benchmarked well but didn't macro
benchmark well
2014-12-09 22:16:55 +00:00
alisdair sullivan
e2ba87f1cb switch to a counting implementation of number parsing a la strings 2014-12-09 02:20:01 -08:00
alisdair sullivan
e5e04db58e produce binaries in escaped strings in decoder/parser instead of lists 2014-12-09 02:19:13 -08:00
alisdair sullivan
5843dbc56a actually i can use flatten in jsx_to_term! sweet 2014-12-09 08:06:12 +00:00