Daniel Neuhäuser
0674ee875d
Merge branch 'config-namespaces' of https://github.com/mattupstate/flask into config-namespaces
...
Conflicts:
flask/config.py
11 years ago
Daniel Neuhäuser
2c2c240d6d
Merge pull request #994 from roskoff/master
...
Added 'import os' statement
11 years ago
Daniel Neuhäuser
ff3ef8511e
Merge pull request #997 from charlax/ca/fix/response_class_documentation
...
Clarify the after_request argument
11 years ago
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.
11 years ago
Eliseo Ocampos
ffff509cf0
Added 'import os' statement
...
Added 'import os' statement so you can use os.path.join() when defining DATABASE location
11 years ago
Kenneth Reitz
7a353a7d1b
Merge pull request #980 from grampajoe/patch-1
...
Update docs copyright date
11 years ago
Daniel Neuhäuser
d43bfb261a
Add assertIsInstance to FlaskTestCase on 2.6
...
This fixes an error in ConfigTestCase.test_custom_config_class
11 years ago
Daniel Neuhäuser
3f8e29b12c
Add Flask.config_class to changelog
11 years ago
Daniel Neuhäuser
66e51d5be7
Merge branch 'master' of https://github.com/Xion/flask into Xion-master
...
Conflicts:
flask/testsuite/config.py
11 years ago
Joe Friedl
19baae3d34
Update docs copyright date
...
Happy belated New Year!
11 years ago
Daniel Neuhäuser
97411295e3
Add Config.from_json to changelog
11 years ago
Daniel Neuhäuser
95a1ce4d6e
Merge branch 'config-from-json' of https://github.com/mattupstate/flask into mattupstate-config-from-json
11 years ago
Matt Iversen
a8e88bebd1
Update windows installation and other notes
...
Making allowance for new convenience of `get-pip.py` that automatically installs setuptools and pip together.
Stop recommending distribute, which has now been merged into setuptools.
11 years ago
Armin Ronacher
98754b0e4f
Merge branch '0.10-maintenance'
11 years ago
Armin Ronacher
ddb5f9dc49
Fixed a broken test
11 years ago
Armin Ronacher
82f99f42a8
Disarmed a sentence a bit
11 years ago
Armin Ronacher
135d090c0f
Merge branch 'master' of github.com:mitsuhiko/flask
11 years ago
Armin Ronacher
5b0545bf80
Merge branch '0.10-maintenance'
11 years ago
Armin Ronacher
fb622380d0
Use older descriptor to support older werkzeug versions
11 years ago
Armin Ronacher
47a41b645f
Merge pull request #884 from rsyring/patch-2
...
Update appfactories.rst, make extension related section clearer
11 years ago
Armin Ronacher
a9503580d2
Merge branch '0.10-maintenance'
11 years ago
Armin Ronacher
141a5533c9
Documented fix for #879
11 years ago
Armin Ronacher
75f2af7a6a
Use a condition variable instead of sleeping
11 years ago
Alexis Svinartchouk
280d865960
fix issue #879 and add a test for it
...
Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
11 years ago
Armin Ronacher
c938771258
Merge branch 'master' of github.com:mitsuhiko/flask
11 years ago
Armin Ronacher
ba36d57729
Merge pull request #897 from d3spis3d/master
...
URL Reversing in Quickstart Doc #779
11 years ago
Armin Ronacher
9298d89aed
Merge branch '0.10-maintenance'
11 years ago
Armin Ronacher
964c4a37c0
Closed an unclosed file in the tests
11 years ago
Armin Ronacher
001100bc0b
Fixed PyStringIO in tests for 2.x
11 years ago
Armin Ronacher
8cb79fd026
Added a test for sending from directories
11 years ago
Armin Ronacher
76e2f9cd03
Fixed send_from_directory not rebasing to the root path. This fixes #921
11 years ago
Armin Ronacher
23d9b33e92
Merge branch '0.10-maintenance'
11 years ago
Armin Ronacher
d094d5b6fc
Fixed warning and broken tests on 3.3
11 years ago
Armin Ronacher
6f44ca705f
Fixed sqlite3 pattern. This fixes #924
11 years ago
Armin Ronacher
a8a98bc6b6
Various documentation fixups
11 years ago
Armin Ronacher
9074bc46af
Switch away from /tmp for windows users
11 years ago
Armin Ronacher
e95cef66a3
Merge pull request #931 from aphexcx/patch-1
...
Update celery.rst
11 years ago
Armin Ronacher
e2264d0607
Merge pull request #936 from zheller/fix-typo
...
Fix typo in helpers.py
11 years ago
Armin Ronacher
e67d9a04b2
Fixed a changelog entry
11 years ago
Armin Ronacher
2506c0b9a9
Fixed sending etags for file streams with a name. This fixes #930 .
11 years ago
Armin Ronacher
1bddb30e4a
Merge pull request #935 from markhildreth/doc-fix
...
Fixed incorrect grammar in Config.rst
11 years ago
Armin Ronacher
b0f8d0f01b
Merge branch 'master' of github.com:mitsuhiko/flask
11 years ago
Armin Ronacher
a8f6f7413f
Merge branch '0.10-maintenance'
11 years ago
Armin Ronacher
46c24da016
Make before_first_request a decorator
11 years ago
Armin Ronacher
ae45aed8d6
Removed an unnecessary newline
11 years ago
Armin Ronacher
05caa5a50d
Merge pull request #942 from bool-dev/patch-1
...
Updated greenlet links, which were dead.
11 years ago
Armin Ronacher
1f638d63ff
Merge pull request #948 from Spittie/patch-1
...
Update fileuploads.rst
11 years ago
Armin Ronacher
6075797f13
Added changelog entry
11 years ago
Armin Ronacher
f07e4cb0c3
Merge branch '0.10-maintenance'
11 years ago
Armin Ronacher
6de9484c97
Fixed a typo
11 years ago