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

1742 commits

This branch
This branch
All branches
Author SHA1 Message Date
Armin Ronacher
36e86be06d Merge branch 'master' of github.com:mitsuhiko/flask 2014-03-19 23:07:58 +00:00
Armin Ronacher
95fa9f21ec Added a missing import 2014-03-19 23:07:42 +00:00
Daniel Neuhäuser
69db1e9b1f Merge pull request #872 from dmackinnon/patch-1 
Fix typo
 2014-03-13 20:38:41 +01:00
Daniel Neuhäuser
718c3a3ce7 Merge pull request #874 from defuz/patch-1 
fix typo (jsonfiy -> jsonify)
 2014-03-13 20:38:19 +01:00
Daniel Neuhäuser
a71b65cb15 Merge pull request #877 from yoloseem/patch-1 
Fix a typo on blueprints module name.
 2014-03-13 20:35:29 +01:00
Daniel Neuhäuser
caa0c00420 Merge pull request #878 from shamrin/patch-1 
quickstart: import `request` in HTTP methods example
 2014-03-13 20:33:46 +01:00
Daniel Neuhäuser
06857c9ba5 Add Config.get_namespace to CHANGES 2014-03-13 20:23:43 +01:00
Daniel Neuhäuser
ba80e1e33b Fix Python 3 compat issue in Config.get_namespace 2014-03-13 20:22:18 +01:00
Daniel Neuhäuser
0674ee875d Merge branch 'config-namespaces' of https://github.com/mattupstate/flask into config-namespaces 
Conflicts:
	flask/config.py
 2014-03-13 20:20:22 +01:00
Daniel Neuhäuser
2c2c240d6d Merge pull request #994 from roskoff/master 
Added 'import os' statement
 2014-03-13 19:25:34 +01:00
Daniel Neuhäuser
ff3ef8511e Merge pull request #997 from charlax/ca/fix/response_class_documentation 
Clarify the after_request argument
 2014-03-13 19:24:53 +01:00
Charles-Axel Dein
dfae2679a6 Clarify the after_request argument 
Make it a bit clearer that it's an instance of response_class that is
expected, not the actual response_class class.
 2014-03-05 15:22:59 -08:00
Eliseo Ocampos
ffff509cf0 Added 'import os' statement 
Added 'import os' statement so you can use os.path.join() when defining DATABASE location
 2014-03-04 14:57:12 -08:00
Kenneth Reitz
7a353a7d1b Merge pull request #980 from grampajoe/patch-1 
Update docs copyright date
 2014-03-03 13:17:29 -05:00
Daniel Neuhäuser
d43bfb261a Add assertIsInstance to FlaskTestCase on 2.6 
This fixes an error in ConfigTestCase.test_custom_config_class
 2014-02-20 19:17:59 +01:00
Daniel Neuhäuser
3f8e29b12c Add Flask.config_class to changelog 2014-02-20 19:15:42 +01:00
Daniel Neuhäuser
66e51d5be7 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
Joe Friedl
19baae3d34 Update docs copyright date 
Happy belated New Year!
 2014-02-13 10:28:21 -05:00
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
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