Commit graph

2320 commits

Author SHA1 Message Date
Jonas Gröger
ad3232eefc Update uwsgi/nginx deployment documentation
Instead of using the uwsgi_modifier1 30 directive, the uwsgi docs
recommend to use the mount / manage-script-name approch which mounts
a module + callable to a certain path. This way, SCRIPT_NAME and
PATH_INFO are correctly rewritten.

See http://uwsgi-docs.readthedocs.org/en/latest/Nginx.html#hosting-multiple-apps-in-the-same-process-aka-managing-script-name-and-path-info

Fixes #1464
2015-08-22 00:56:54 +02:00
Markus Unterwaditzer
f20727cd70 Merge pull request #1539 from mjhennig/with_metaclass
Improve function with_metaclass()
2015-07-27 19:25:27 +02:00
Mathias J. Hennig
5aa9889cf4 Addressing feedback from pull request 2015-07-27 15:32:23 +02:00
Mathias J. Hennig
97d3856a9f Reimplement function with_metaclass() 2015-07-22 23:35:13 +02:00
Markus Unterwaditzer
84cce759c1 Merge pull request #1520 from zevav/patch-2
fixed some punctuation, fixed a few errors, in service of readability
2015-07-21 13:41:44 +02:00
Markus Unterwaditzer
c04c3a1393 Merge pull request #1535 from lobeck/revert-1534-update_external_url_handler_example
Revert "make external_url_handler example py3 compliant"
2015-07-16 12:20:33 +02:00
lobeck
9d01d60dea Revert "make external_url_handler example py3 compliant" 2015-07-16 13:53:59 +02:00
Markus Unterwaditzer
976db05a5b Merge branch '0.10-maintenance' 2015-07-16 12:05:07 +02:00
Markus Unterwaditzer
6a6a6d87c2 Merge branch 'lobeck-fix_unboundlocalerror_for_handle_build_error' into 0.10-maintenance
Fix #1533
2015-07-16 12:02:12 +02:00
Markus Unterwaditzer
765f851a7c Changelog for #1533 2015-07-16 12:01:25 +02:00
Christian Becker
5da31f8af3 fix UnboundLocalError in handle_url_build_error
- caused by changes in the execution model of python 3 where the alias of an except clause is cleared on exit of the except
2015-07-16 12:00:16 +02:00
Markus Unterwaditzer
6e63bde98c Merge pull request #1534 from lobeck/update_external_url_handler_example
make external_url_handler example py3 compliant
2015-07-16 11:49:09 +02:00
Christian Becker
29a3533a01 make external_url_handler example py3 compliant
- a raises statement with multiple values is no longer allowed in python 3
2015-07-16 02:45:56 +02:00
Markus Unterwaditzer
9d87f63d00 Merge pull request #1532 from WayneYe/master
Fixed gevent introduction to use libev instead of libevent
2015-07-14 22:44:51 +02:00
Wayne Ye
e291dc41b4 Fixed gevent introduction to use libev instead of libevent 2015-07-14 12:36:01 -07:00
Markus Unterwaditzer
ad18cfc72a Merge pull request #1530 from Aayush-Kasurde/master
Added missing app.run line in jqueryexample.py
2015-07-12 18:49:55 +02:00
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