maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity
1713 commits 4 branches 69 tags 36 MiB
Commit graph

1713 commits

This branch
This branch
All branches
Author SHA1 Message Date
Armin Ronacher
82f99f42a8 Disarmed a sentence a bit 2014-02-09 13:35:38 +00:00
Armin Ronacher
135d090c0f Merge branch 'master' of github.com:mitsuhiko/flask 2014-02-09 13:29: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
47a41b645f 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
a9503580d2 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
c938771258 Merge branch 'master' of github.com:mitsuhiko/flask 2014-02-09 13:21:08 +00:00
Armin Ronacher
ba36d57729 Merge pull request #897 from d3spis3d/master 
URL Reversing in Quickstart Doc #779
 2014-02-09 13:20:46 +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
6f44ca705f Fixed sqlite3 pattern. This fixes #924 2014-02-08 22:14:23 +00:00
Armin Ronacher
a8a98bc6b6 Various documentation fixups 2014-02-08 22:10:08 +00:00
Armin Ronacher
9074bc46af Switch away from /tmp for windows users 2014-02-08 22:07:13 +00:00
Armin Ronacher
e95cef66a3 Merge pull request #931 from aphexcx/patch-1 
Update celery.rst
 2014-02-08 17:47:22 +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
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
1bddb30e4a Merge pull request #935 from markhildreth/doc-fix 
Fixed incorrect grammar in Config.rst
 2014-02-08 17:40:30 +00:00
Armin Ronacher
b0f8d0f01b Merge branch 'master' of github.com:mitsuhiko/flask 2014-02-08 17:40:02 +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
05caa5a50d 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
1f638d63ff Merge pull request #948 from Spittie/patch-1 
Update fileuploads.rst
 2014-02-08 17:34:30 +00:00
Armin Ronacher
6075797f13 Added changelog entry 2014-02-08 17:33:42 +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
4d9916e1a6 Merge pull request #946 from allevo/master 
Use json method of requests.Response
 2014-02-08 17:30:55 +00:00
Armin Ronacher
58b4fc209a 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
Armin Ronacher
f791ede346 Merge pull request #975 from martinp/update-license 
Update copyright year in license
 2014-02-08 16:24:27 +00:00
Martin Polden
3dab2f3d41 Update copyright year 2014-02-07 10:26:26 +01:00
Alex Pearce
3d6de4dd79 Explicitly pass the Celery instance name. 
When starting a Celery worker module, it is assumed that the Celery instance within the module is called `app`. This is not the case in the Celery pattern, where it is called `celery`, and so must be explicitly referenced.
 2014-02-05 20:11:06 +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