flask

maya-chen/flask

Fork 0

forked from orbit-oss/flask

Commit graph

0674ee875d Merge branch 'config-namespaces' of https://github.com/mattupstate/flask into config-namespaces Daniel Neuhäuser 2014-03-13 20:20:22 +01:00
2c2c240d6d Merge pull request #994 from roskoff/master Daniel Neuhäuser 2014-03-13 19:25:34 +01:00
ff3ef8511e Merge pull request #997 from charlax/ca/fix/response_class_documentation Daniel Neuhäuser 2014-03-13 19:24:53 +01:00
dfae2679a6 Clarify the after_request argument Charles-Axel Dein 2014-03-05 15:22:59 -08:00
ffff509cf0 Added 'import os' statement Eliseo Ocampos 2014-03-04 14:57:12 -08:00
7a353a7d1b Merge pull request #980 from grampajoe/patch-1 Kenneth Reitz 2014-03-03 13:17:29 -05:00
d43bfb261a Add assertIsInstance to FlaskTestCase on 2.6 Daniel Neuhäuser 2014-02-20 19:17:59 +01:00
3f8e29b12c Add Flask.config_class to changelog Daniel Neuhäuser 2014-02-20 19:15:42 +01:00
66e51d5be7 Merge branch 'master' of https://github.com/Xion/flask into Xion-master Daniel Neuhäuser 2014-02-20 19:12:56 +01:00
19baae3d34 Update docs copyright date Joe Friedl 2014-02-13 10:28:21 -05:00
97411295e3 Add Config.from_json to changelog Daniel Neuhäuser 2014-02-12 23:53:51 +01:00
95a1ce4d6e Merge branch 'config-from-json' of https://github.com/mattupstate/flask into mattupstate-config-from-json Daniel Neuhäuser 2014-02-12 23:42:39 +01:00
a8e88bebd1 Update windows installation and other notes Matt Iversen 2014-02-11 07:24:31 +11:00
98754b0e4f Merge branch '0.10-maintenance' Armin Ronacher 2014-02-09 16:08:03 +00:00
ddb5f9dc49 Fixed a broken test Armin Ronacher 2014-02-09 16:07:56 +00:00
82f99f42a8 Disarmed a sentence a bit Armin Ronacher 2014-02-09 13:35:38 +00:00
135d090c0f Merge branch 'master' of github.com:mitsuhiko/flask Armin Ronacher 2014-02-09 13:29:56 +00:00
5b0545bf80 Merge branch '0.10-maintenance' Armin Ronacher 2014-02-09 13:29:03 +00:00
fb622380d0 Use older descriptor to support older werkzeug versions Armin Ronacher 2014-02-09 13:28:57 +00:00
47a41b645f Merge pull request #884 from rsyring/patch-2 Armin Ronacher 2014-02-09 13:27:35 +00:00
a9503580d2 Merge branch '0.10-maintenance' Armin Ronacher 2014-02-09 13:27:05 +00:00
141a5533c9 Documented fix for #879 Armin Ronacher 2014-02-09 13:26:32 +00:00
75f2af7a6a Use a condition variable instead of sleeping Armin Ronacher 2014-02-09 13:25:36 +00:00
280d865960 fix issue #879 and add a test for it Alexis Svinartchouk 2013-10-04 11:09:23 +02:00
c938771258 Merge branch 'master' of github.com:mitsuhiko/flask Armin Ronacher 2014-02-09 13:21:08 +00:00
ba36d57729 Merge pull request #897 from d3spis3d/master Armin Ronacher 2014-02-09 13:20:46 +00:00
9298d89aed Merge branch '0.10-maintenance' Armin Ronacher 2014-02-09 13:14:26 +00:00
964c4a37c0 Closed an unclosed file in the tests Armin Ronacher 2014-02-09 13:14:15 +00:00
001100bc0b Fixed PyStringIO in tests for 2.x Armin Ronacher 2014-02-09 13:13:31 +00:00
8cb79fd026 Added a test for sending from directories Armin Ronacher 2014-02-09 13:06:54 +00:00
76e2f9cd03 Fixed send_from_directory not rebasing to the root path. This fixes #921 Armin Ronacher 2014-02-09 13:01:54 +00:00
23d9b33e92 Merge branch '0.10-maintenance' Armin Ronacher 2014-02-08 22:30:00 +00:00
d094d5b6fc Fixed warning and broken tests on 3.3 Armin Ronacher 2014-02-08 22:29:46 +00:00
6f44ca705f Fixed sqlite3 pattern. This fixes #924 Armin Ronacher 2014-02-08 22:14:23 +00:00
a8a98bc6b6 Various documentation fixups Armin Ronacher 2014-02-08 22:10:08 +00:00
9074bc46af Switch away from /tmp for windows users Armin Ronacher 2014-02-08 22:07:13 +00:00
e95cef66a3 Merge pull request #931 from aphexcx/patch-1 Armin Ronacher 2014-02-08 17:47:22 +00:00
e2264d0607 Merge pull request #936 from zheller/fix-typo Armin Ronacher 2014-02-08 17:46:32 +00:00
e67d9a04b2 Fixed a changelog entry Armin Ronacher 2014-02-08 17:46:02 +00:00
2506c0b9a9 Fixed sending etags for file streams with a name. This fixes #930. Armin Ronacher 2014-02-08 17:45:09 +00:00
1bddb30e4a Merge pull request #935 from markhildreth/doc-fix Armin Ronacher 2014-02-08 17:40:30 +00:00
b0f8d0f01b Merge branch 'master' of github.com:mitsuhiko/flask Armin Ronacher 2014-02-08 17:40:02 +00:00
a8f6f7413f Merge branch '0.10-maintenance' Armin Ronacher 2014-02-08 17:39:46 +00:00
46c24da016 Make before_first_request a decorator Armin Ronacher 2014-02-08 17:39:26 +00:00
ae45aed8d6 Removed an unnecessary newline Armin Ronacher 2014-02-08 17:36:12 +00:00
05caa5a50d Merge pull request #942 from bool-dev/patch-1 Armin Ronacher 2014-02-08 17:34:42 +00:00
1f638d63ff Merge pull request #948 from Spittie/patch-1 Armin Ronacher 2014-02-08 17:34:30 +00:00
6075797f13 Added changelog entry Armin Ronacher 2014-02-08 17:33:42 +00:00
f07e4cb0c3 Merge branch '0.10-maintenance' Armin Ronacher 2014-02-08 17:32:59 +00:00
6de9484c97 Fixed a typo Armin Ronacher 2014-02-08 17:32:54 +00:00
c9bf907037 Merge pull request #938 from ahlen/response-with-headers-without-status Armin Ronacher 2014-02-08 17:32:01 +00:00
4d9916e1a6 Merge pull request #946 from allevo/master Armin Ronacher 2014-02-08 17:30:55 +00:00
58b4fc209a Merge pull request #955 from ifiokjr/patch-1 Armin Ronacher 2014-02-08 17:24:33 +00:00
53528ad2c3 Merge branch '0.10-maintenance' Armin Ronacher 2014-02-08 17:19:11 +00:00
e7c587789a Fixe a bug in the test client causing url parameters to be removed. This fixes #968 Armin Ronacher 2014-02-08 17:19:00 +00:00
e5bba9deb5 Added support for custom JSON mimetypes Armin Ronacher 2014-02-08 17:01:13 +00:00
f5a02b9495 Added a warning about key sorting Armin Ronacher 2014-02-08 16:27:26 +00:00
ccc2de1997 Merge pull request #962 from nZac/JSON-Support-doc-update Armin Ronacher 2014-02-08 16:26:27 +00:00
11003d0c29 Merge pull request #972 from alexpearce/patch-1 Armin Ronacher 2014-02-08 16:24:50 +00:00
f791ede346 Merge pull request #975 from martinp/update-license Armin Ronacher 2014-02-08 16:24:27 +00:00
3dab2f3d41 Update copyright year Martin Polden 2014-02-07 10:26:26 +01:00
3d6de4dd79 Explicitly pass the Celery instance name. Alex Pearce 2014-02-05 20:11:06 +00:00
17a3056be4 Merge pull request #961 from GCorbel/patch-1 Kenneth Reitz 2014-01-27 09:39:04 -08:00
e78961c812 Fixed a missing import Armin Ronacher 2014-01-26 18:08:02 +00:00
52e1c383fa Make Python 3 happy Armin Ronacher 2014-01-26 17:47:16 +00:00
6ec83e18dc Added a workaround for a pypy bug in context managers Armin Ronacher 2014-01-26 17:34:37 +00:00
ea656a8909 added a note to the api documentation about JSON_SORT_KEYS. Fixes #922 Nicholas Zaccardi 2014-01-24 19:21:24 -06:00
21aa620b6b Remove the extra "1" Guriec Corbel 2014-01-24 12:43:23 -05:00
90a50f8b51 Add get_namespace method on Config object for convenient access of namespaced config options. Matt Wright 2014-01-23 15:05:37 -05:00
de7e2bcf7a Merge pull request #947 from Ivoz/master Kenneth Reitz 2014-01-23 11:07:41 -08:00
cb61696b47 Update appcontext.rst Ifiok Jr. 2014-01-20 04:28:40 +00:00
de3dbd3125 Update fileuploads.rst Spittie 2014-01-12 02:54:08 +01:00
b0bb6c7f3d Release as universal python wheel (2/3 compat) Matt Iversen 2014-01-11 11:31:22 +11:00
b81b040110 Remove unused import Tommaso Allevi 2014-01-11 01:13:32 +01:00
f0f6545374 Use json method Tommaso Allevi 2014-01-11 01:09:30 +01:00
b2971ec68c Merge pull request #943 from skeuomorf/favicon Daniel Neuhäuser 2014-01-06 08:28:03 -08:00
cf0953619e Added a favicon for the docs skeuomorf 2014-01-06 17:58:54 +02:00
85aa4ec8c1 Updated greenlet links, which were dead. bool-dev 2014-01-04 17:21:18 +05:30
d517f35d60 Merge branch '0.10-maintenance' Daniel Neuhäuser 2014-01-02 19:21:55 +01:00
52098e1e4f Happy New Year 2014 Daniel Neuhäuser 2014-01-02 19:21:07 +01:00
dbc4096191 added a new test case with a Response instance and cleaned up the code Mikael Åhlén 2013-12-31 22:59:00 +01:00
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. Mikael Åhlén 2013-12-31 22:16:13 +01:00
5addabfbdd Fix typo in helpers.py Zachary Wright Heller 2013-12-24 20:12:34 -08:00
6a37c1716d Fixed incorrect grammar in Config.rst Mark Hildreth 2013-12-24 14:36:28 -05:00
67c165bcbb Update celery.rst Afik 2013-12-16 22:04:51 -08:00
afd3c4532b Rewrapped lines Armin Ronacher 2013-11-09 13:41:09 +00:00
0d648fa468 Changed the wording of some sentences there were difficult to understand. Reetta Vaahtoranta 2013-11-09 13:13:14 +00:00
d4f8634289 Merge pull request #899 from pengfei-xue/master Daniel Neuhäuser 2013-11-01 02:18:14 -07:00
ecb31c6804 fix typo Pengfei Xue 2013-10-30 16:45:44 +08:00
05dbf52fa5 URL Reversing in Quickstart #779 d3spis3d 2013-10-30 11:29:18 +11:00
d14f57d9b8 Merge pull request #895 from daybarr/patch-1 Daniel Neuhäuser 2013-10-29 02:35:48 -07:00
c021e58775 Fix typo in docs for error_handler_spec Day Barr 2013-10-25 16:51:29 +01:00
9cecf0d81c moved Table import to next code block Christopher Su 2013-10-22 11:37:35 -07:00
5689ef3639 Fix typo s/at at/at a/ Daniel Neuhäuser 2013-10-22 14:01:33 +02:00
b63a9926dd Merge branch '0.10-maintenance' Daniel Neuhäuser 2013-10-16 20:13:19 +02:00
a3a2f521f1 Clear exceptions when pushing a context Daniel Neuhäuser 2013-10-16 20:12:20 +02:00
544118bef9 Merge pull request #891 from ThiefMaster/docs-flaskext Daniel Neuhäuser 2013-10-16 10:09:41 -07:00
4212e67d29 Merge pull request #890 from seancron/documentation-fix Daniel Neuhäuser 2013-10-16 10:08:49 -07:00
cab514e9f1 Merge pull request #886 from talam/patch-1 Daniel Neuhäuser 2013-10-16 10:06:01 -07:00
46b5754d97 Don't refer to flaskext in docs Adrian 2013-10-15 21:47:42 +02:00