Commit graph

3904 commits

Author SHA1 Message Date
mattc41190
88a07f1b75 itty bitty typo 2020-03-24 09:54:32 -05:00
Shanavas M
e647a4a07a Update deprecated for config.from_json 2020-03-18 12:37:51 +05:30
David Lord
d0c0d5bc3f Merge pull request #3536 from gnumoksha/patch-2
docs: update "Deploying on Google App Engine"
2020-03-16 15:26:49 -07:00
Tobias Sette
4a5f5fc0a2 docs: update "Deploying on Google App Engine"
Use the documentation for Python 3 instead of Python 2, which is deprecated.
2020-03-16 19:18:53 -03:00
David Lord
3cbf71ac8a Merge pull request #3524 from jeffwidman/patch-2
Remove deprecated `license_file` option
2020-03-11 07:40:06 -07:00
David Lord
449a32536c Merge pull request #3513 from kevinanew/master
Make code more easy to read
2020-03-11 07:31:20 -07:00
kevinanew
243c08238b refactor variable choices into if blocks 2020-03-11 07:24:38 -07:00
gutianci
1859a5fd2c docs: testing.rst function def missing colon 2020-03-05 18:31:21 +08:00
Peter G Kritikos
58c9794260 Move HTML escaping example back to Variable Rules.
Demonstration of markupsafe's escape function was in the Minimal
Application example, but the minimal example does not accept user
input.
2020-03-04 18:50:36 -05:00
Jeff Widman
c96d163421 Remove deprecated license_file option
Starting with wheel 0.32.0 (2018-09-29), the `license_file` option is
deprecated in favor of `license_files`.

https://wheel.readthedocs.io/en/stable/news.html

The wheel will continue to include `LICENSE`, it is now included
automatically:

https://wheel.readthedocs.io/en/stable/user_guide.html#including-license-files-in-the-generated-wheel-file

See https://github.com/FactoryBoy/factory_boy/pull/696 for inspiration and more discussion.
2020-03-02 10:21:15 -08:00
David Lord
74678dc1e5 Merge pull request #3521 from ongopongo/patch-1
Fix property name in description
2020-02-28 12:18:04 -08:00
ongopongo
1952236085 Fix property name in description
Previously, the description referred to a property named `original_error`.
However, both the code sample that followed it _and_ the Werkzeug
documentation refer to it as `original_exception` instead.

In this commit, I change the description to use the same property name
as is used in the code sample and the Werkzeug documentation.

Here's a link to the Werkzeug documentation of that property:
- https://werkzeug.palletsprojects.com/en/1.0.x/exceptions/#werkzeug.exceptions.InternalServerError.original_exception
2020-02-28 12:09:51 -08:00
kylepollina
e5477a099a Fix typo in docs (#3517) 2020-02-27 23:22:03 +01:00
David Lord
376a64137c Merge remote-tracking branch 'origin/1.1.x' 2020-02-15 10:40:32 -08:00
David Lord
ecb00c777f Merge pull request #3456 from frostming/bugfix/3452
Fix a bug that the static endpoint will unexpectedly catch all
2020-02-12 07:09:32 -08:00
Frost Ming
fe392e7884 Handle different sep across os 2020-02-12 13:17:03 +08:00
David Lord
9e0fe3efb0 Merge remote-tracking branch 'origin/1.1.x' 2020-02-10 18:41:07 -08:00
David Lord
202058e14a Merge pull request #3460 from yingshaoxo/patch-1
static_folder and static_url_path can be different
2020-02-10 18:40:25 -08:00
yingshaoxo
089a379b97 pass static_url_path along with static_folder 2020-02-10 18:33:32 -08:00
David Lord
9e827f6cad Merge remote-tracking branch 'origin/1.1.x' 2020-02-10 18:29:43 -08:00
frostming
c4de6a0bfc strip the ending slash for static_url_path 2020-02-10 18:19:25 -08:00
David Lord
c96be4c2f0 Merge pull request #3480 from candleindark/patch-2
Incorrect grammar
2020-02-10 18:13:24 -08:00
David Lord
cf063d100a Merge pull request #3473 from greyli/fix-doc-import
Add missing import for escape in doc
2020-02-10 18:12:50 -08:00
David Lord
e9fb99de94 Merge pull request #3492 from pallets/cryptography
CLI checks for cryptography library
2020-02-10 17:56:11 -08:00
Grey Li
8e62a33cff add import for escape in quickstart
import escape from markupsafe instead of flask
2020-02-10 17:53:11 -08:00
Isaac To
2a70812332 Incorrect grammar
The original sentence has incorrect grammar
2020-02-10 17:47:42 -08:00
David Lord
d1ffe44185 cli checks for cryptography library 2020-02-10 17:34:19 -08:00
David Lord
a356c215df Merge pull request #3462 from gpakosz/outdated-doc
Remove comment about extensions being reviewed by the core team
2020-02-10 17:29:09 -08:00
David Lord
e4da52f85d Merge pull request #3453 from noviluni/remove_redundant_parentheses
fix docstring and remove redundant parentheses
2020-02-10 17:28:14 -08:00
David Lord
daccc1944f Merge pull request #3437 from RDIL/patch-1
Updated Issue Template
2020-02-10 17:27:51 -08:00
Marc Hernandez Cabot
ed93b738ed fix docstring and remove redundant parentheses 2020-02-10 17:03:52 -08:00
Gregory Pakosz
67702a616b remove approved extensions in foreword 2020-02-10 17:00:53 -08:00
Reece Dunham
efe36fe82b mention discord in issue template 2020-02-10 16:53:51 -08:00
David Lord
d96c18e887 Merge branch '1.1.x' 2020-02-10 16:44:33 -08:00
David Lord
3cafd1f82e Merge branch '1.0.x' into 1.1.x 2020-02-10 16:43:49 -08:00
David Lord
830faf1a6e clean up merge 2020-02-10 16:36:40 -08:00
David Lord
e2d9770e23 Merge pull request #3498 from raymond-devries/3445-traceback-for-none
View returned none exception contains endpoint name
2020-02-10 13:15:24 -08:00
raymond-devries
5ffacfc010 Feature request #3445. 2020-02-10 13:09:53 -08:00
Armin Ronacher
a526f7268a Merge branch '1.1.x' 2020-02-10 20:37:28 +01:00
Armin Ronacher
b008697f3d Merge branch '1.0.x' into 1.1.x 2020-02-10 20:37:21 +01:00
Armin Ronacher
f6161f42a5 Merge remote-tracking branch 'origin/0.12.x' into 1.0.x 2020-02-10 20:36:55 +01:00
Armin Ronacher
0d053b1761 0.12.6.dev 2020-02-10 20:32:11 +01:00
Armin Ronacher
4fff9aabf5 Bump version number to 0.12.5 2020-02-10 20:30:59 +01:00
Armin Ronacher
cc2ff9f75c Changelog for 0.12.5 2020-02-10 20:30:54 +01:00
Armin Ronacher
10b330b4fd Pin Werkzeug < 1.0 for 0.12 (#3497) 2020-02-10 20:27:39 +01:00
David Lord
b48e6bcf12 Merge pull request #3496 from lathamfell/update-gitignore
Add .vscode to .gitignore
2020-02-10 11:17:58 -08:00
Latham Fell
cf2290d6ca Add vscode settings dir to .gitignore 2020-02-10 11:09:04 -08:00
David Lord
c5366e7e30 Merge branch '1.1.x' 2020-02-10 10:16:20 -08:00
David Lord
f2805605ca xfail __main__ instance test interacting with tox 2020-02-10 10:16:08 -08:00
David Lord
5201bcf419 Merge branch '1.1.x' 2020-02-09 15:21:13 -08:00