23 commits

Author	SHA1	Message	Date
raimu	fbda3f94ba	fix typo	2014-04-11 22:40:21 +02:00
max demian	cb25c42316	Update json.py	2014-03-15 14:35:21 +01:00
Daniel Neuhäuser	d517f35d60	Merge branch '0.10-maintenance'	2014-01-02 19:21:55 +01:00
Daniel Neuhäuser	52098e1e4f	Happy New Year 2014	2014-01-02 19:21:07 +01:00
Armin Ronacher	8f1dada542	Some cleanups	2013-09-02 04:57:01 +06:00
Armin Ronacher	c502dfbbfb	Changed |tojson filter to quote single attributes	2013-06-14 00:05:09 +01:00
Armin Ronacher	ef72b78042	Imply the |safe on tojson in templates and change escaping logic	2013-06-03 12:25:08 +01:00
Armin Ronacher	c629f69e69	Make the JSON module work better in the absence of an application context	2013-06-02 11:54:22 +01:00
Armin Ronacher	77d293cf49	Order JSON keys by default to avoid trashing HTTP caches	2013-06-01 19:24:03 +01:00
Armin Ronacher	3d9055b3b7	Added the JSONIFY_PRETTYPRINT_REGULAR config variable. This fixes #725	2013-06-01 00:20:00 +01:00
Armin Ronacher	abc1505196	Fixed various issues on the Python 3 port	2013-05-30 15:07:18 +01:00
Armin Ronacher	16df96c552	Merge branch 'master' into sprint-branch	2013-05-23 14:01:33 +01:00
Armin Ronacher	eb023bcfad	Support old and new name for json	2013-05-23 13:46:51 +01:00
Daniel Neuhäuser	a0801719f8	Remove six dependency	2013-05-22 21:40:30 +02:00
Daniel Neuhäuser	3f51a09db4	itsdangerous uses json instead of simplejson now	2013-05-22 16:33:50 +02:00
Daniel Neuhäuser	8494574fdf	Merge branch 'six' of github.com:ThomasWaldmann/flask into ThomasWaldmann-six ... Conflicts: flask/testsuite/__init__.py	2013-05-18 18:54:45 +02:00
Thomas Waldmann	522cd00093	python-modernize automated changes: fix_unicode (but without six.u())	2013-05-18 18:12:30 +02:00
Thomas Waldmann	40fad2ece8	document python 2.6 minimum requirement, remove all stuff that refers to 2.5	2013-05-18 17:06:25 +02:00
Armin Ronacher	c349c91aff	Added support for UUID objects to JSON serializer as well	2013-05-14 11:35:45 +01:00
Tomasz Kalkosiński	78ae0ec7f8	Add import to jsonify example.	2013-03-25 12:29:28 +01:00
Armin Ronacher	8339cb3508	Added support for unicode json dumping. This fixes #535	2012-10-18 00:48:15 +01:00
Armin Ronacher	05c6502cbd	Let json.* work even without app on the stack and added tests	2012-10-07 23:41:41 +02:00
Armin Ronacher	b146d8277a	Added wrapper module around simplejson/json for much simplified customization.	2012-10-07 23:31:48 +02:00