Kenneth Reitz
5ce0d84e4f
Merge pull request #838 from enkore/master
...
get_cookie_path: fix docstring
2014-03-21 16:46:43 -04:00
Kenneth Reitz
f14329636e
Merge pull request #869 from christophersu/doc-fix-1
...
Add missing import on SQLAlchemy documentation page
2014-03-21 16:46:05 -04:00
Kenneth Reitz
421ee4341e
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
7e54d5bcc8
Merge pull request #862 from bikerm16/master
...
Minor test fixes
2014-03-21 16:39:13 -04:00
Kenneth Reitz
5873bb6c59
Merge pull request #889 from mattskone/master
...
Escaped 'text' keyword in column name.
2014-03-21 16:38:00 -04:00
Kenneth Reitz
672b5becd7
Merge pull request #977 from Ivoz/patch-1
...
Update windows installation and other notes
2014-03-21 16:36:12 -04:00
Kenneth Reitz
ca9a885df1
Merge pull request #1000 from mikar/master
...
harmless comment fixes/typos
2014-03-21 16:21:18 -04:00
Kenneth Reitz
4f35aeaeb4
Merge pull request #1004 from kylestev/patch-1
...
Small punctuation change in unicode doc
2014-03-21 16:21:01 -04:00
Armin Ronacher
ced22a090a
Merge branch 'master' of github.com:mitsuhiko/flask
2014-03-19 23:07:58 +00:00
Armin Ronacher
083cc995af
Added a missing import
2014-03-19 23:07:42 +00:00
Kyle Stevenson
4a39d27f7c
Small punctuation change in unicode doc
...
Just makes it easier on the eyes/brain.
2014-03-19 10:23:17 -07:00
max demian
809cfbbc4a
Update wrappers.py
2014-03-15 14:45:37 +01:00
max demian
9dd8fba6d9
Update views.py
2014-03-15 14:44:27 +01:00
max demian
d0598ea584
Update signals.py
2014-03-15 14:42:21 +01:00
max demian
935ddaaf96
Update sessions.py
...
missing backticks in docstring
2014-03-15 14:38:19 +01:00
max demian
63ca6d5238
Update json.py
2014-03-15 14:35:21 +01:00
Daniel Neuhäuser
4a9a1cf3ba
Merge pull request #872 from dmackinnon/patch-1
...
Fix typo
2014-03-13 20:38:41 +01:00
Daniel Neuhäuser
8f865e1623
Merge pull request #874 from defuz/patch-1
...
fix typo (jsonfiy -> jsonify)
2014-03-13 20:38:19 +01:00
Daniel Neuhäuser
2a0d49cb02
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
086bc88c61
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
f5e0c2fbbb
Add Config.get_namespace to CHANGES
2014-03-13 20:23:43 +01:00
Daniel Neuhäuser
6bc2a49121
Fix Python 3 compat issue in Config.get_namespace
2014-03-13 20:22:18 +01:00
Daniel Neuhäuser
d7ece2e279
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
f2efaeb045
Merge pull request #994 from roskoff/master
...
Added 'import os' statement
2014-03-13 19:25:34 +01:00
Daniel Neuhäuser
bf86c7f2bb
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
264ed4515d
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
a03aa9689a
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
83ea47473c
Merge pull request #980 from grampajoe/patch-1
...
Update docs copyright date
2014-03-03 13:17:29 -05:00
Daniel Neuhäuser
a900655f53
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
a12d0d2fa5
Add Flask.config_class to changelog
2014-02-20 19:15:42 +01:00
Daniel Neuhäuser
06774ac056
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
974af4a562
Update docs copyright date
...
Happy belated New Year!
2014-02-13 10:28:21 -05:00
Daniel Neuhäuser
34c6e1127d
Add Config.from_json to changelog
2014-02-12 23:53:51 +01:00
Daniel Neuhäuser
aede44bfc6
Merge branch 'config-from-json' of https://github.com/mattupstate/flask into mattupstate-config-from-json
2014-02-12 23:42:39 +01:00
Matt Iversen
65b31b0d04
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.
2014-02-11 07:24:31 +11:00
Armin Ronacher
a571569daf
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
a23ffa8cdb
Disarmed a sentence a bit
2014-02-09 13:35:38 +00:00
Armin Ronacher
3d4ec53d70
Merge branch 'master' of github.com:mitsuhiko/flask
2014-02-09 13:29:56 +00:00
Armin Ronacher
0a6019da78
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
6ad022ffa5
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
24ef69411c
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
8872c8dd5d
Merge branch 'master' of github.com:mitsuhiko/flask
2014-02-09 13:21:08 +00:00
Armin Ronacher
2713da26a0
Merge pull request #897 from d3spis3d/master
...
URL Reversing in Quickstart Doc #779
2014-02-09 13:20:46 +00:00
Armin Ronacher
542282dfe5
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
