David Lord
bac908ef35
Merge pull request #3513 from kevinanew/master
...
Make code more easy to read
2020-03-11 07:31:20 -07:00
kevinanew
d5f88dafaf
refactor variable choices into if blocks
2020-03-11 07:24:38 -07:00
gutianci
ceed993d63
docs: testing.rst function def missing colon
2020-03-05 18:31:21 +08:00
Peter G Kritikos
56e75eace5
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
9311a823a7
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
fd3fca2aa0
Merge pull request #3521 from ongopongo/patch-1
...
Fix property name in description
2020-02-28 12:18:04 -08:00
ongopongo
1d45539000
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
37f582dbb1
Fix typo in docs ( #3517 )
2020-02-27 23:22:03 +01:00
David Lord
64ba43411f
Merge remote-tracking branch 'origin/1.1.x'
2020-02-15 10:40:32 -08:00
David Lord
a75315028c
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
e6178fe489
Handle different sep across os
2020-02-12 13:17:03 +08:00
David Lord
909b9751ee
Merge remote-tracking branch 'origin/1.1.x'
2020-02-10 18:41:07 -08:00
David Lord
71b7468634
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
7e068145df
pass static_url_path along with static_folder
2020-02-10 18:33:32 -08:00
David Lord
07556da918
Merge remote-tracking branch 'origin/1.1.x'
2020-02-10 18:29:43 -08:00
frostming
d4076cf07c
strip the ending slash for static_url_path
2020-02-10 18:19:25 -08:00
David Lord
c12d9f8b49
Merge pull request #3480 from candleindark/patch-2
...
Incorrect grammar
2020-02-10 18:13:24 -08:00
David Lord
8973b58955
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
b074a2eec9
Merge pull request #3492 from pallets/cryptography
...
CLI checks for cryptography library
2020-02-10 17:56:11 -08:00
Grey Li
571e92b317
add import for escape in quickstart
...
import escape from markupsafe instead of flask
2020-02-10 17:53:11 -08:00
Isaac To
b80eaf2c99
Incorrect grammar
...
The original sentence has incorrect grammar
2020-02-10 17:47:42 -08:00
David Lord
bcde664f9a
cli checks for cryptography library
2020-02-10 17:34:19 -08:00
David Lord
982663d063
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
986871bf4e
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
28d09ae0fc
Merge pull request #3437 from RDIL/patch-1
...
Updated Issue Template
2020-02-10 17:27:51 -08:00
Marc Hernandez Cabot
5da342e4dd
fix docstring and remove redundant parentheses
2020-02-10 17:03:52 -08:00
Gregory Pakosz
aa1d4cb840
remove approved extensions in foreword
2020-02-10 17:00:53 -08:00
Reece Dunham
e6ac789554
mention discord in issue template
2020-02-10 16:53:51 -08:00
David Lord
ab6e630194
Merge branch '1.1.x'
2020-02-10 16:44:33 -08:00
David Lord
ef27c1b749
Merge branch '1.0.x' into 1.1.x
2020-02-10 16:43:49 -08:00
David Lord
d92b64aa27
clean up merge
2020-02-10 16:36:40 -08:00
David Lord
a3e4395a42
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
900fa2f795
Feature request #3445 .
2020-02-10 13:09:53 -08:00
Armin Ronacher
5ceb0a59dd
Merge branch '1.1.x'
2020-02-10 20:37:28 +01:00
Armin Ronacher
9b424e9da9
Merge branch '1.0.x' into 1.1.x
2020-02-10 20:37:21 +01:00
Armin Ronacher
2f8086e8c8
Merge remote-tracking branch 'origin/0.12.x' into 1.0.x
2020-02-10 20:36:55 +01:00
Armin Ronacher
79c71f24e4
0.12.6.dev
2020-02-10 20:32:11 +01:00
Armin Ronacher
191710cbda
Bump version number to 0.12.5
2020-02-10 20:30:59 +01:00
Armin Ronacher
8086ce8b9f
Changelog for 0.12.5
2020-02-10 20:30:54 +01:00
Armin Ronacher
85db0135cb
Pin Werkzeug < 1.0 for 0.12 ( #3497 )
2020-02-10 20:27:39 +01:00
David Lord
e7dc413944
Merge pull request #3496 from lathamfell/update-gitignore
...
Add .vscode to .gitignore
2020-02-10 11:17:58 -08:00
Latham Fell
6627c5a3d2
Add vscode settings dir to .gitignore
2020-02-10 11:09:04 -08:00
David Lord
0834da832a
Merge branch '1.1.x'
2020-02-10 10:16:20 -08:00
David Lord
63b40254e9
xfail __main__ instance test interacting with tox
2020-02-10 10:16:08 -08:00
David Lord
2c66746a37
Merge branch '1.1.x'
2020-02-09 15:21:13 -08:00
David Lord
8d5234e4c7
next version 1.2.0
2020-02-09 15:20:23 -08:00
David Lord
de4be03b5d
Merge pull request #3479 from candleindark/patch-2
...
A better expression for the intended meaning
2020-02-06 12:07:33 -08:00
Isaac To
bb66b61d1d
A better expression for the intended meaning
2020-02-06 12:04:49 -08:00
David Lord
0a8be38058
Merge pull request #3478 from candleindark/patch-1
...
This is a typo.
2020-02-06 10:57:30 -08:00
Isaac To
ce08807a8b
This is a typo.
2020-02-06 10:52:59 -08:00
