b7a12eddaf
Merge branch 'master' of https://github.com/eiffelhub/json
2015-04-07 18:36:38 +02:00
Olivier Ligot
0404627153
Merge remote-tracking branch 'upstream/master'
2014-07-11 15:00:20 +02:00
985a5e5ce7
Merge branch 'master' of github.com:EiffelWebFramework/EWF into widget_integration
2014-07-07 10:30:42 +02:00
Olivier Ligot
a826051979
Merge remote-tracking branch 'upstream/master'
2014-05-22 22:09:00 +02:00
31fcd61401
Make sure to be able to compile in complete void-safe for 14.05 and still compile with 13.11
2014-05-14 10:14:51 +02:00
99d0340e1b
Merge branch 'master' of https://github.com/eiffelhub/json
2014-04-22 15:50:30 +02:00
Olivier Ligot
655c95158f
json: comment '* text=auto' in .gitattributes
2014-03-03 14:18:07 +01:00
cc6d2f3023
Merge branch 'master' of https://github.com/eiffelhub/json
2014-02-27 09:16:48 +01:00
Jocelyn Fiat
a0665313ed
Merge branch 'master' of https://github.com/eiffelhub/json
2013-11-18 17:30:37 +00:00
Severin
26e6a62e6b
Test
2013-09-29 02:24:33 +02:00
Jocelyn Fiat
d264899e8b
Merge branch 'master' of https://github.com/eiffelhub/json
2012-12-13 12:02:27 +01:00
Jocelyn Fiat
e65c2da528
Merge branch 'master' of https://github.com/eiffelhub/json
2012-11-15 16:29:02 +01:00
Jocelyn Fiat
40e524337e
Merge branch 'master' of https://github.com/eiffelhub/json
...
Conflicts:
draft/library/gobo/shared_gobo_ejson.e
draft/library/kernel/converters/json_converter.e
draft/library/kernel/converters/json_hash_table_converter.e
draft/library/kernel/converters/json_linked_list_converter.e
draft/library/kernel/ejson.e
draft/library/kernel/shared_ejson.e
draft/test/autotest/test_suite/json_author_converter.e
draft/test/autotest/test_suite/json_book_collection_converter.e
draft/test/autotest/test_suite/json_book_converter.e
draft/test/autotest/test_suite/test_json_core.e
2012-08-24 02:40:54 -07:00
Jocelyn Fiat
0a058882f5
Merge branch 'master' of https://github.com/eiffelhub/json
2012-06-29 10:36:53 +02:00
Jocelyn Fiat
e8fa284c79
Replaced git submodule by subtree merged in contrib/library/text/parser/json
2012-06-20 09:52:07 +02:00
Jocelyn Fiat
7a619fa7a5
Sync with json
2012-05-30 09:52:41 +02:00
Jocelyn Fiat
00a88e98e5
Updated indexing notes
...
started tutorial
Sync
2012-05-25 17:47:43 +02:00
Jocelyn Fiat
0b6b7f793c
sync with json lib.
2012-04-06 11:31:57 +02:00
Jocelyn Fiat
7314e92fe6
Synchronized with nino and json library
2012-02-28 09:20:08 +01:00
Jocelyn Fiat
434f031680
Synchronized with ejson library
...
Cleaned JSON_ENCODER
2012-01-13 19:04:26 +01:00
jvelilla
39b5a70979
Sync Jocelyn repo
2011-12-07 07:22:51 -03:00
Jocelyn Fiat
49c3e8e789
Renamed "ext" folder as "contrib" folder and reorganized a little bit
...
Renamed any *_APPLICATION as *_SERVICE
mainly because those components
such as WSF_APPLICATION, renamed as WSF_SERVICE
are not always the main application entry, and "service" describe them better
Minor implementation change in WSF_REQUEST
Cosmetics
2011-11-17 15:50:30 +01:00
