Commit graph

626 commits

Author SHA1 Message Date
Armin Ronacher
1b06c8a411 Added __main__ module 2014-04-21 17:52:04 +02:00
Armin Ronacher
e46bca4051 Added thread flag to flask run 2014-04-21 16:39:22 +02:00
Armin Ronacher
6018b1276e Merge branch 'master' of github.com:mitsuhiko/flask 2014-04-21 16:34:37 +02:00
Armin Ronacher
7503bde223 Added the new flask run module to start the server. 2014-04-21 16:34:17 +02:00
Armin Ronacher
42c28c3758 Fixed intention in flask init 2014-04-21 15:58:27 +02:00
Kenneth Reitz
01e831f082 Merge pull request #1019 from raimu/master
fix typo
2014-04-14 19:02:52 -04:00
mjfroehlich
15d8af52db Fix minor typo 2014-04-13 22:25:10 +02:00
raimu
fbda3f94ba fix typo 2014-04-11 22:40:21 +02:00
Armin Ronacher
d4b3d16c14 Better support for namespace packages. 2014-04-11 19:59:54 +02:00
Armin Ronacher
a293b99b21 Fixed the last changeset. 2014-04-11 13:31:57 +02:00
Armin Ronacher
9554844e2a Added workaround for Python 3.3's frozen loader 2014-04-11 13:31:17 +02:00
Kenneth Reitz
d4fec14544 Revert "Revert "Merge pull request #859 from wvh/register_error_handler""
This reverts commit 2aa26fff04.
2014-03-21 17:15:31 -04:00
Kenneth Reitz
2aa26fff04 Revert "Merge pull request #859 from wvh/register_error_handler"
This reverts commit 6347e75dee, reversing
changes made to 3fd40e83e5.
2014-03-21 17:12:26 -04:00
Kenneth Reitz
6347e75dee Merge pull request #859 from wvh/register_error_handler
Add a non-decorator version of the error handler register function
2014-03-21 17:08:34 -04:00
Kenneth Reitz
3fd40e83e5 Merge pull request #864 from obeattie/master
Make the decorators attribute on View a tuple by default
2014-03-21 17:05:24 -04:00
Kenneth Reitz
9427e16567 Merge pull request #707 from xsleonard/patch-1
Mention register_error_handler in errorhandler doc
2014-03-21 17:03:02 -04:00
Kenneth Reitz
9c434ebc67 Merge pull request #885 from jmhobbs/master
Update url_for documentation for Flask.url_build_error_handlers
2014-03-21 17:01:55 -04:00
Kenneth Reitz
7f5b6c692d Merge pull request #876 from defuz/templates-auto-reload
Add TEMPLATES_AUTO_RELOAD config key
2014-03-21 16:43:20 -04:00
Kenneth Reitz
4c0253f9fd Merge pull request #862 from bikerm16/master
Minor test fixes
2014-03-21 16:39:13 -04:00
max demian
db12a8f5e4 Update wrappers.py 2014-03-15 14:45:37 +01:00
max demian
6974d52815 Update views.py 2014-03-15 14:44:27 +01:00
max demian
2eef63a320 Update signals.py 2014-03-15 14:42:21 +01:00
max demian
f3f7b640b9 Update sessions.py
missing backticks in docstring
2014-03-15 14:38:19 +01:00
max demian
cb25c42316 Update json.py 2014-03-15 14:35:21 +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
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
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
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
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