alisdair sullivan
d4b6d3dc5f
Merge branch 'develop'
2017-02-06 18:54:10 -08:00
alisdair sullivan
364e80bd20
add maintainers to mix.exs
2017-02-06 18:53:45 -08:00
alisdair sullivan
ce75fd4f0f
Merge branch 'develop'
2017-02-06 18:50:36 -08:00
alisdair sullivan
d5913af1b7
v2.8.2
2017-02-06 18:48:03 -08:00
alisdair sullivan
da5d7b31a6
Merge pull request #107 from talentdeficit/develop
...
merge in latest changes
2017-02-06 18:46:03 -08:00
alisdair sullivan
aebb218f31
Merge pull request #106 from talentdeficit/master
...
catch up to master
2017-02-06 18:44:51 -08:00
alisdair sullivan
a64eb43cd1
update versions to test against on travis
2017-02-06 18:43:21 -08:00
alisdair sullivan
7e34b182d0
Merge pull request #103 from jeremyjh/develop
...
Add debug_info to rebar.config.
2017-02-06 18:41:20 -08:00
Jeremy Huffman
c578fff21f
fix syntax error
2017-02-06 21:03:42 -05:00
Jeremy Huffman
1a6e55425c
Add debug_info to rebar.config.
2016-12-13 08:44:37 -05:00
alisdair sullivan
aaf915e173
Merge branch 'develop'
2016-12-08 10:11:02 -08:00
alisdair sullivan
bd8c9c7ad9
v2.8.1
2016-12-08 10:10:51 -08:00
alisdair sullivan
f96d9e0b9d
Merge branch 'develop'
2016-12-08 10:08:19 -08:00
alisdair sullivan
c61be973b9
Merge pull request #101 from everydayhero/develop
...
Enable debug_info in erl_opts
2016-09-10 13:44:25 -05:00
Mike Buhot
d6ddbfcaec
Enable debug_info in erl_opts
2016-09-08 14:40:45 +10:00
alisdair sullivan
dbf2359eea
Merge pull request #98 from sergey-ivlev/develop
...
fix mix.exs warning
2016-07-28 09:37:28 -07:00
Sergey Ivlev
7258ab9851
fix mix.exs warning
...
elixir 1.4.0
warning: variable "package" does not exist and is being expanded to "package()", please use parentheses to remove the ambiguity or change the variable name
/home/ ... /deps/jsx/mix.exs:10
2016-07-28 11:48:35 +03:00
alisdair sullivan
ef9818bfd2
Merge pull request #95 from tjweir/develop
...
Added a section that shows an example of adding jsx to a rebar3 project.
2016-06-15 19:56:45 -07:00
Tyler Weir
5f81cf5538
Update README.md
2016-06-15 15:49:46 -04:00
Tyler Weir
5c4a1c71d3
Update README.md
2016-06-15 15:49:15 -04:00
alisdair sullivan
b8ba469754
Merge pull request #93 from hachreak/fix_timestamp_export
...
accept erlang:timestamp()
2016-01-16 09:43:45 -08:00
Leonardo Rossi
5342ed1368
global: accept erlang:timestamp()
...
* Adds support for erlang:timestamp(). (closes #92 )
Signed-off-by: Leonardo Rossi <leonardo.rossi@studenti.unipr.it>
2016-01-15 19:22:44 +01:00
alisdair sullivan
991d668578
Merge pull request #90 from g-andrade/develop
...
Match jsx:json_term() / jsx_to_term:json_value() specs for empty object.
2015-10-18 20:08:45 -07:00
Guilherme Andrade
5e0df7b77d
Match jsx:json_term() / jsx_to_term:json_value() specs for empty object.
2015-10-13 14:30:34 +01:00
alisdair sullivan
3074d4865b
v2.8.0
2015-10-08 23:03:54 -07:00
alisdair sullivan
50eff667a1
v2.8.0
2015-10-08 23:03:26 -07:00
alisdair sullivan
cdd01c6eac
add JSX_FORCE_MAPS flag for forcing decoding to maps
2015-10-08 22:58:03 -07:00
alisdair sullivan
8e75e0f312
add files section to jsx.app.src for hex
2015-10-08 22:21:39 -07:00
alisdair sullivan
b5b60b4a5b
remove rebar3 hex plugin from config
2015-10-08 22:21:02 -07:00
alisdair sullivan
7090494686
v2.7.2
2015-09-17 15:27:21 -05:00
alisdair sullivan
522f72b2ce
mask a function_clause' error in encoder with a badarg' error for api unity
2015-09-17 15:25:03 -05:00
alisdair sullivan
95b1821a42
Merge branch 'rogue_tuple_fix'
2015-09-16 15:41:52 -07:00
alisdair sullivan
d6f687831e
fix overly permissive parser that allowed some encodings that should
...
have been failure states
2015-09-16 15:40:34 -07:00
alisdair sullivan
2d8a7d07da
Merge branch 'develop'
2015-08-20 09:22:33 -07:00
alisdair sullivan
99c81f88b9
v2.7.1
2015-08-20 09:22:23 -07:00
alisdair sullivan
91b3c47e1b
add tvv's contributions to CHANGES and README
2015-08-08 17:46:51 -07:00
alisdair sullivan
77fe4be65c
Merge pull request #85 from tvv/develop
...
accept datetime with msec
2015-08-08 17:43:00 -07:00
vt
25a592de84
accept datetime with msec
2015-08-08 18:15:02 +03:00
alisdair sullivan
9d4534edc5
Revert "Revert "Master""
...
This reverts commit 400d046746
2015-08-04 11:26:00 -07:00
alisdair sullivan
f3894b827b
Merge branch 'master' of github.com:talentdeficit/jsx
2015-08-04 11:22:17 -07:00
alisdair sullivan
96945026fd
use hex version of mixunit instead of github version
2015-08-04 11:06:57 -07:00
alisdair sullivan
f6d6bc25a0
update to v2.7.0
2015-08-04 11:00:24 -07:00
alisdair sullivan
e382aca486
document return_tail
2015-08-04 10:58:44 -07:00
alisdair sullivan
1bacdd44bd
update contributors list:
2015-08-04 10:46:45 -07:00
alisdair sullivan
dba7bfb417
Merge branch 'ledest' into develop
2015-08-04 10:30:07 -07:00
alisdair sullivan
f46442c480
Merge branch 'master' of https://github.com/ledest/jsx into ledest
2015-08-04 10:27:57 -07:00
alisdair sullivan
2ab3247719
Merge pull request #84 from talentdeficit/revert-82-master
...
Reverts talentdeficit/jsx#82
merged to wrong branch
2015-08-04 10:20:44 -07:00
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
alisdair sullivan
903ac4b1cd
Merge pull request #83 from arcusfelis/arc-return-tail
...
Add return_tail option
2015-08-04 10:15:49 -07:00
