Commit graph

2555 commits

Author SHA1 Message Date
Aayush Kasurde
c6ead5942e Added fix for issue 1529
Signed-off-by: Aayush Kasurde <aayush.kasurde@gmail.com>
2015-07-12 21:08:16 +05:30
Markus Unterwaditzer
0ba63a6707 Merge branch 'alanhamlett-master'
Fix #1515
2015-07-04 23:42:12 +02:00
Alan Hamlett
a6f9582497 Enable autoescape for render_template_string 2015-07-04 23:41:43 +02:00
Alan Hamlett
01aebb311d remove whitespace at end of lines 2015-07-04 23:41:31 +02:00
Markus Unterwaditzer
f6d2e02ed7 Merge pull request #1509 from ThiefMaster/appctxglobals-candy
Add pop and setdefault to AppCtxGlobals
2015-06-30 21:33:04 +02:00
Zev Averbach
8775edc88f fixed some punctuation, fixed a few errors, in service of readability 2015-06-26 08:41:56 -04:00
Markus Unterwaditzer
e4875b1301 Merge pull request #1510 from ThiefMaster/remove-modules-property
Remove the deprecated Flask.modules property
2015-06-21 19:37:34 +02:00
ThiefMaster
c60eabe688 Remove the deprecated Flask.modules property 2015-06-20 18:09:27 +02:00
ThiefMaster
394acf2112 Add pop and setdefault to AppCtxGlobals 2015-06-20 18:04:58 +02:00
Markus Unterwaditzer
e37e159eca Merge branch 'alexpantyukhin-master'
Fix #1390
2015-06-17 15:45:57 +02:00
Alexander Pantyukhin
069f134d7e Changes and docs are modified. 2015-06-17 15:45:37 +02:00
Alexander Pantyukhin
a2c426a6cf Ignore before_render_template return values 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
0a474db0d1 template overrides handling changed 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
e22a104c56 fix test_signals 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
cf5e02818e fix test_signals 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
d1c1fa9ce3 before_render_template signal can override render template. 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
61775bf76b fix endline in the signal.py 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
cb8edfa806 before_render_template signal 2015-06-17 15:42:39 +02:00
Markus Unterwaditzer
792abbe887 Merge pull request #1502 from untitaker/travis-simplify
Don't pass version to tox explicitly
2015-06-17 13:17:12 +02:00
Markus Unterwaditzer
b506fbae65 Don't pass version to tox explicitly 2015-06-17 13:03:59 +02:00
Markus Unterwaditzer
8593308778 Merge pull request #1499 from menghan/doc
Fix project name in CONTRIBUTING.rst
2015-06-13 17:55:12 +02:00
Menghan
505d7db0ff Replace 'Werkzeug' to 'Flask' 2015-06-13 23:16:14 +08:00
Markus Unterwaditzer
f0e69b1b6d Fix #1477 2015-06-13 17:07:51 +02:00
Markus Unterwaditzer
a7ce0745e4 Merge pull request #1496 from Hardtack/patch-1
Update title of docstring in flask.cli
2015-06-13 13:50:50 +02:00
GunWoo Choi
b037e50c83 Update title of docstring in flask.cli 2015-06-12 13:40:53 +09:00
Markus Unterwaditzer
d93e9be563 Document static_folder 2015-06-11 19:55:51 +02:00
Markus Unterwaditzer
f097924cfe Deduplicate signals docs
Triggered by #1390
2015-06-10 18:42:55 +02:00
Markus Unterwaditzer
3ebbb6a918 Merge pull request #1491 from nvie/patch-1
Remove the word `trivially` here
2015-06-10 11:45:37 +02:00
Vincent Driessen
d80dd731d2 Remove the word trivially here
A lot of things are trivial, or debatably trivial, but this is not one of them :)
2015-06-10 10:58:49 +02:00
Markus Unterwaditzer
0f1970f55d Point to stable version of Celery 2015-06-08 15:18:34 +02:00
Keyan Pishdadian
b7225b5fa3 Update send_file() docs to clarify encoding requirement #1286 2015-06-06 07:38:09 +02:00
Markus Unterwaditzer
0c442fba62 Rename jinja_env_class
Inspired by #1056
2015-06-06 06:29:26 +02:00
Markus Unterwaditzer
89de9cb967 Fix #1195 2015-06-06 06:25:41 +02:00
Markus Unterwaditzer
a69b664de0 Merge pull request #1483 from untitaker/improve-autodoc
Show original autodoc signatures
2015-06-06 04:17:57 +02:00
Markus Unterwaditzer
e48fde8176 Show original autodoc signatures
Alternative to #1403
2015-06-06 04:17:33 +02:00
Markus Unterwaditzer
f5cff2fa3f Merge branch 'AndrewBMartin-patch-1' 2015-06-06 03:35:22 +02:00
Andrew
2a9385d8c3 Include backend argument when instantiating Celery
Not including the backend argument can lead to AttributeError:
DisabledBackend object has no attribute for '_get_task_meta_for'.

See e.g.
http://stackoverflow.com/questions/23215311/celery-with-rabbitmq-attributeerror-disabledbackend-object-has-no-attribute.

At the same time, including the backend argument doesn't seem to harm anything else.
2015-06-06 03:35:04 +02:00
Markus Unterwaditzer
be4b530de0 Changelog for #1422 2015-06-06 03:31:51 +02:00
Markus Unterwaditzer
1c7135cc9e Merge branch 'ThiefMaster-override-jinja-env' 2015-06-06 03:30:49 +02:00
Markus Unterwaditzer
a19c2397e7 0.11 => 1.0 2015-06-06 03:29:44 +02:00
Markus Unterwaditzer
87e2b98d18 Merge pull request #1480 from jmcarp/handle-empty-deque
Handle empty deque on errorhandler lookup.
2015-06-03 17:46:10 +02:00
Joshua Carp
d32437bf0f Handle empty deque on errorhandler lookup.
After registering a custom errorhandler by exception class, raising any
unhandled exception in a view function swallows the error and instead
throws an `IndexError` on trying to look up the appropriate handler.
This patch avoids the uninformative `IndexError` and preserves the
original exception by looping until the deque of classes is empty, not
forever.
2015-06-02 16:13:30 -04:00
Markus Unterwaditzer
0339a45c7b Clarify some docs
Fix #1476
2015-05-31 18:59:14 +02:00
Markus Unterwaditzer
6b9f5b314b Merge pull request #1463 from moonshadow/fix_docstring
fix docstring for _find_errorhandler
2015-05-20 14:52:08 +02:00
Wang Haowei
53817cc5f7 fix docstring for _find_errorhandler 2015-05-20 20:31:06 +08:00
Markus Unterwaditzer
19a1fe1c7a Merge pull request #1461 from justinwp/patch-1
fixed import of werkzeug secure_filename
2015-05-15 10:24:24 +02:00
Justin Poehnelt
7af629354e fixed import of werkzeug secure_filename 2015-05-14 23:44:49 -07:00
Jon Banafato
138b28e17d Add X-Forwarded-Proto to proxy setup example
The ProxyFix middleware provided by Werkzeug uses this header for
returning accurate values from request.is_secure and request.scheme.
Without adding this header, Flask won't properly detect when it is being
served over HTTPS and will fail to generate proper external links and
cause certain extensions (e.g. Flask-OAuthlib) to function improperly.
Adding this header to the example setup should reduce issues encountered
by developers when following this guide.
2015-05-09 12:29:53 -04:00
Markus Unterwaditzer
ed85df440f Merge pull request #1455 from nickjj/docs_contributing
Add pip install --editable . to contributing docs
2015-05-07 13:24:13 +02:00
Nick Janetakis
aa6dd1c71b Add pip install --editable . to contributing docs 2015-05-06 16:07:47 -07:00