Commit graph

5190 commits

Author SHA1 Message Date
Armin Ronacher
6cd191db4f Ignore build folder 2015-10-01 13:59:05 +02:00
Armin Ronacher
ee7f4b2bab Added lineart logo 2015-10-01 13:58:48 +02:00
Jimmy McCarthy
a23ce46971 Update change log 2015-09-14 13:29:16 -05:00
Jimmy McCarthy
5505827a4b provide_automatic_options as explicit arg
In add_url_rule, break provide_automatic_options out to an explicit kwarg, and
add notes to the docstring.
2015-09-14 13:26:10 -05:00
Jimmy McCarthy
04a3eeee3b Merge branch 'master' of github.com:mitsuhiko/flask 2015-09-14 13:06:54 -05:00
msiyaj
808bf6d204 Missing apostophe. 2015-08-27 00:27:44 -04:00
Jonas Gröger
b644e2747f Mention virtual environments in uwsgi/nginx deployment docs 2015-08-22 01:05:45 +02:00
Jonas Gröger
8b9cb6caa7 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
7f38674915 Merge pull request #1539 from mjhennig/with_metaclass
Improve function with_metaclass()
2015-07-27 19:25:27 +02:00
Mathias J. Hennig
b3767ae59f Addressing feedback from pull request 2015-07-27 15:32:23 +02:00
Mathias J. Hennig
c8f19f0afc Reimplement function with_metaclass() 2015-07-22 23:35:13 +02:00
Markus Unterwaditzer
ac12e362c4 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
b528b2ffe3 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
128bc76af0 Revert "make external_url_handler example py3 compliant" 2015-07-16 13:53:59 +02:00
Markus Unterwaditzer
81ae94a5fd 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
97c0b26cc0 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
93fe1d54bd 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
671c1ee002 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
05c2e7c276 Fixed gevent introduction to use libev instead of libevent 2015-07-14 12:36:01 -07:00
Markus Unterwaditzer
92a293046b 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
8ba986e45e Added fix for issue 1529
Signed-off-by: Aayush Kasurde <aayush.kasurde@gmail.com>
2015-07-12 21:08:16 +05:30
Jimmy McCarthy
a136019644 Updated changelog 2015-07-07 13:21:51 -05:00
Jimmy McCarthy
011b129b6b Add kwarg to disable auto OPTIONS on add_url_rule
Adds support for a kwarg `provide_automatic_options` on `add_url_rule`, which
lets you turn off the automatic OPTIONS response on a per-URL basis even if
your view functions are functions, not classes (so you can't provide attrs
on them).
2015-07-07 13:20:53 -05:00
Markus Unterwaditzer
db09c6798e Merge branch 'alanhamlett-master'
Fix #1515
2015-07-04 23:42:12 +02:00
Alan Hamlett
99c99c4c16 Enable autoescape for render_template_string 2015-07-04 23:41:43 +02:00
Alan Hamlett
e4f635f8d7 remove whitespace at end of lines 2015-07-04 23:41:31 +02:00
Markus Unterwaditzer
37474871dc Merge pull request #1509 from ThiefMaster/appctxglobals-candy
Add pop and setdefault to AppCtxGlobals
2015-06-30 21:33:04 +02:00
Zev Averbach
5dfe918e4f fixed some punctuation, fixed a few errors, in service of readability 2015-06-26 08:41:56 -04:00
Markus Unterwaditzer
595fb7e1fa Merge pull request #1510 from ThiefMaster/remove-modules-property
Remove the deprecated Flask.modules property
2015-06-21 19:37:34 +02:00
ThiefMaster
6af9690ae9 Remove the deprecated Flask.modules property 2015-06-20 18:09:27 +02:00
ThiefMaster
bbaf20de7c Add pop and setdefault to AppCtxGlobals 2015-06-20 18:04:58 +02:00
Markus Unterwaditzer
87222087b3 Merge branch 'alexpantyukhin-master'
Fix #1390
2015-06-17 15:45:57 +02:00
Alexander Pantyukhin
a9066a3756 Changes and docs are modified. 2015-06-17 15:45:37 +02:00
Alexander Pantyukhin
5e12748d0e Ignore before_render_template return values 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
883f82f261 template overrides handling changed 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
eae37b575d fix test_signals 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
e57199e0c4 fix test_signals 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
967907ee81 before_render_template signal can override render template. 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
1fbeb337c4 fix endline in the signal.py 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
d53d5c732b before_render_template signal 2015-06-17 15:42:39 +02:00
Markus Unterwaditzer
cb9f645081 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
284081c452 Don't pass version to tox explicitly 2015-06-17 13:03:59 +02:00
Markus Unterwaditzer
9ddd3e9084 Merge pull request #1499 from menghan/doc
Fix project name in CONTRIBUTING.rst
2015-06-13 17:55:12 +02:00
Menghan
30973310ec Replace 'Werkzeug' to 'Flask' 2015-06-13 23:16:14 +08:00
Markus Unterwaditzer
554c5b965a Fix #1477 2015-06-13 17:07:51 +02:00
Markus Unterwaditzer
cc6bf7c18a 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
c65b32ba1d Update title of docstring in flask.cli 2015-06-12 13:40:53 +09:00