orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1719 commits 4 branches 69 tags 37 MiB
Commit graph

583 commits

Author SHA1 Message Date
Daniel Neuhäuser
97411295e3 Add Config.from_json to changelog 2014-02-12 23:53:51 +01:00
Daniel Neuhäuser
95a1ce4d6e Merge branch 'config-from-json' of https://github.com/mattupstate/flask into mattupstate-config-from-json 2014-02-12 23:42:39 +01:00
Armin Ronacher
98754b0e4f Merge branch '0.10-maintenance' 2014-02-09 16:08:03 +00:00
Armin Ronacher
ddb5f9dc49 Fixed a broken test 2014-02-09 16:07:56 +00:00
Armin Ronacher
5b0545bf80 Merge branch '0.10-maintenance' 2014-02-09 13:29:03 +00:00
Armin Ronacher
fb622380d0 Use older descriptor to support older werkzeug versions 2014-02-09 13:28:57 +00:00
Armin Ronacher
a9503580d2 Merge branch '0.10-maintenance' 2014-02-09 13:27:05 +00:00
Armin Ronacher
75f2af7a6a Use a condition variable instead of sleeping 2014-02-09 13:25:36 +00:00
Alexis Svinartchouk
280d865960 fix issue #879 and add a test for it 
Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
 2014-02-09 13:22:05 +00:00
Armin Ronacher
9298d89aed Merge branch '0.10-maintenance' 2014-02-09 13:14:26 +00:00
Armin Ronacher
964c4a37c0 Closed an unclosed file in the tests 2014-02-09 13:14:15 +00:00
Armin Ronacher
001100bc0b Fixed PyStringIO in tests for 2.x 2014-02-09 13:13:31 +00:00
Armin Ronacher
8cb79fd026 Added a test for sending from directories 2014-02-09 13:06:54 +00:00
Armin Ronacher
76e2f9cd03 Fixed send_from_directory not rebasing to the root path. This fixes #921 2014-02-09 13:01:54 +00:00
Armin Ronacher
23d9b33e92 Merge branch '0.10-maintenance' 2014-02-08 22:30:00 +00:00
Armin Ronacher
d094d5b6fc Fixed warning and broken tests on 3.3 2014-02-08 22:29:46 +00:00
Armin Ronacher
e2264d0607 Merge pull request #936 from zheller/fix-typo 
Fix typo in helpers.py
 2014-02-08 17:46:32 +00:00
Armin Ronacher
2506c0b9a9 Fixed sending etags for file streams with a name. This fixes #930. 2014-02-08 17:45:27 +00:00
Armin Ronacher
a8f6f7413f Merge branch '0.10-maintenance' 2014-02-08 17:39:46 +00:00
Armin Ronacher
46c24da016 Make before_first_request a decorator 2014-02-08 17:39:26 +00:00
Armin Ronacher
ae45aed8d6 Removed an unnecessary newline 2014-02-08 17:36:12 +00:00
Armin Ronacher
f07e4cb0c3 Merge branch '0.10-maintenance' 2014-02-08 17:32:59 +00:00
Armin Ronacher
6de9484c97 Fixed a typo 2014-02-08 17:32:54 +00:00
Armin Ronacher
c9bf907037 Merge pull request #938 from ahlen/response-with-headers-without-status 
Enable tuple responses with headers without status
 2014-02-08 17:32:01 +00:00
Armin Ronacher
53528ad2c3 Merge branch '0.10-maintenance' 2014-02-08 17:19:11 +00:00
Armin Ronacher
e7c587789a Fixe a bug in the test client causing url parameters to be removed. This fixes #968 2014-02-08 17:19:00 +00:00
Armin Ronacher
e5bba9deb5 Added support for custom JSON mimetypes 2014-02-08 17:01:13 +00:00
Kenneth Reitz
17a3056be4 Merge pull request #961 from GCorbel/patch-1 
Remove the extra "1"
 2014-01-27 09:39:04 -08:00
Armin Ronacher
e78961c812 Fixed a missing import 2014-01-26 18:08:02 +00:00
Armin Ronacher
52e1c383fa Make Python 3 happy 2014-01-26 17:47:16 +00:00
Armin Ronacher
6ec83e18dc Added a workaround for a pypy bug in context managers 2014-01-26 17:34:37 +00:00
Guriec Corbel
21aa620b6b Remove the extra "1" 2014-01-24 12:43:23 -05: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
Mikael Åhlén
dbc4096191 added a new test case with a Response instance and cleaned up the code 2013-12-31 22:59:00 +01:00
Mikael Åhlén
70f8b39c52 added a new behaviour for responses that enable the tuple to be in the form of (response, headers) and continiue to support the (response, status, headers) format. 2013-12-31 22:16:13 +01:00
Zachary Wright Heller
5addabfbdd Fix typo in helpers.py 2013-12-24 20:12:34 -08:00
Day Barr
c021e58775 Fix typo in docs for error_handler_spec 2013-10-25 16:51:29 +01:00
Daniel Neuhäuser
b63a9926dd Merge branch '0.10-maintenance' 2013-10-16 20:13:19 +02:00
Daniel Neuhäuser
a3a2f521f1 Clear exceptions when pushing a context 
Fixes #882
 2013-10-16 20:12:20 +02:00
Adrian
46b5754d97 Don't refer to flaskext in docs 2013-10-15 21:47:42 +02:00
Daniel Neuhäuser
36d70d8789 Merge pull request #843 from wbowlin/master 
corrected documentation for Request get_json()
 2013-09-03 10:58:04 -07:00
Armin Ronacher
8f1dada542 Some cleanups 2013-09-02 04:57:01 +06:00
Will Bowlin
3e90de2e10 corrected documentation for Request get_json() 2013-08-23 00:22:57 -05:00
Maximilian Hils
17e5fb365d Fix typo in docstring 2013-08-19 10:56:08 +02:00
Daniel Neuhäuser
2d8a21c732 Merge branch '0.10-maintenance' 2013-08-13 15:58:46 +02:00
Daniel Neuhäuser
94f4360137 Explain is_package AttributeError in find_package 
When a PEP 302 import hook is used that doesn't implement .is_package()
an AttributeError is raised. This looks like a bug in Flask. This change
fixes that problem in the sense that it explains, that the
AttributeError is intentional.
 2013-08-13 15:53:58 +02:00
Matt Wright
b290bf4079 Add ability to config from a JSON file 2013-08-07 18:03:37 -04:00
Armin Ronacher
1b08d527c7 Merge branch 'master' of github.com:mitsuhiko/flask 2013-08-05 09:08:29 +01:00
Kevin Burke
9e5ab21c8e app.py: Link to correct EnvironBuilder docs 2013-08-04 22:33:17 -07:00