Daniel Neuhäuser
|
a12d0d2fa5
|
Add Flask.config_class to changelog
|
2014-02-20 19:15:42 +01:00 |
|
Daniel Neuhäuser
|
06774ac056
|
Merge branch 'master' of https://github.com/Xion/flask into Xion-master
Conflicts:
flask/testsuite/config.py
|
2014-02-20 19:12:56 +01:00 |
|
Daniel Neuhäuser
|
34c6e1127d
|
Add Config.from_json to changelog
|
2014-02-12 23:53:51 +01:00 |
|
Daniel Neuhäuser
|
aede44bfc6
|
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
|
a571569daf
|
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
|
a23ffa8cdb
|
Disarmed a sentence a bit
|
2014-02-09 13:35:38 +00:00 |
|
Armin Ronacher
|
3d4ec53d70
|
Merge branch 'master' of github.com:mitsuhiko/flask
|
2014-02-09 13:29:56 +00:00 |
|
Armin Ronacher
|
0a6019da78
|
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
|
6ad022ffa5
|
Merge pull request #884 from rsyring/patch-2
Update appfactories.rst, make extension related section clearer
|
2014-02-09 13:27:35 +00:00 |
|
Armin Ronacher
|
24ef69411c
|
Merge branch '0.10-maintenance'
|
2014-02-09 13:27:05 +00:00 |
|
Armin Ronacher
|
141a5533c9
|
Documented fix for #879
|
2014-02-09 13:26:32 +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
|
8872c8dd5d
|
Merge branch 'master' of github.com:mitsuhiko/flask
|
2014-02-09 13:21:08 +00:00 |
|
Armin Ronacher
|
2713da26a0
|
Merge pull request #897 from d3spis3d/master
URL Reversing in Quickstart Doc #779
|
2014-02-09 13:20:46 +00:00 |
|
Armin Ronacher
|
542282dfe5
|
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
|
31bf18e82a
|
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
|
199066e370
|
Fixed sqlite3 pattern. This fixes #924
|
2014-02-08 22:14:23 +00:00 |
|
Armin Ronacher
|
4e168a414f
|
Various documentation fixups
|
2014-02-08 22:10:08 +00:00 |
|
Armin Ronacher
|
0dd3aa5f13
|
Switch away from /tmp for windows users
|
2014-02-08 22:07:13 +00:00 |
|
Armin Ronacher
|
f61bfb9f1c
|
Merge pull request #931 from aphexcx/patch-1
Update celery.rst
|
2014-02-08 17:47:22 +00:00 |
|
Armin Ronacher
|
25434352c9
|
Merge pull request #936 from zheller/fix-typo
Fix typo in helpers.py
|
2014-02-08 17:46:32 +00:00 |
|
Armin Ronacher
|
e67d9a04b2
|
Fixed a changelog entry
|
2014-02-08 17:46:02 +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
|
87b8f650b9
|
Merge pull request #935 from markhildreth/doc-fix
Fixed incorrect grammar in Config.rst
|
2014-02-08 17:40:30 +00:00 |
|
Armin Ronacher
|
b55ccf6532
|
Merge branch 'master' of github.com:mitsuhiko/flask
|
2014-02-08 17:40:02 +00:00 |
|
Armin Ronacher
|
19205a0c02
|
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
|
c1f363a00c
|
Merge pull request #942 from bool-dev/patch-1
Updated greenlet links, which were dead.
|
2014-02-08 17:34:42 +00:00 |
|
Armin Ronacher
|
71657255c2
|
Merge pull request #948 from Spittie/patch-1
Update fileuploads.rst
|
2014-02-08 17:34:30 +00:00 |
|
Armin Ronacher
|
68056622dc
|
Added changelog entry
|
2014-02-08 17:33:42 +00:00 |
|
Armin Ronacher
|
5c6014a51f
|
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
|
4b31985ab8
|
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
|
d311bf2165
|
Merge pull request #946 from allevo/master
Use json method of requests.Response
|
2014-02-08 17:30:55 +00:00 |
|
Armin Ronacher
|
92fef5e2cc
|
Merge pull request #955 from ifiokjr/patch-1
Update appcontext.rst
|
2014-02-08 17:24:33 +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 |
|
Armin Ronacher
|
f5a02b9495
|
Added a warning about key sorting
|
2014-02-08 16:27:26 +00:00 |
|
Armin Ronacher
|
ccc2de1997
|
Merge pull request #962 from nZac/JSON-Support-doc-update
added a note to the api documentation about JSON_SORT_KEYS. Fixes #922
|
2014-02-08 16:26:27 +00:00 |
|
Armin Ronacher
|
11003d0c29
|
Merge pull request #972 from alexpearce/patch-1
Explicitly pass the Celery instance name.
|
2014-02-08 16:24:50 +00:00 |
|