Commit graph

3843 commits

Author SHA1 Message Date
David Lord
4e98cf6511 move html escaping to dedicated section 2020-04-02 12:49:00 -07: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
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
David Lord
17cbfb2df5 next version 1.2.0 2020-02-09 15:20:23 -08:00
David Lord
2048b545cd 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
bbba98ce40 A better expression for the intended meaning 2020-02-06 12:04:49 -08:00
David Lord
bc2cdc1b0f Merge pull request #3478 from candleindark/patch-1
This is a typo.
2020-02-06 10:57:30 -08:00
Isaac To
347613241f This is a typo. 2020-02-06 10:52:59 -08:00
Adrian
2f8157bc9e Remove comment about extension backwards compat
0.7 was a long time ago; there's no reason for extension to supports such old versions.
2019-11-25 00:38:50 +01:00
David Lord
b1c4ba4b5d Merge pull request #3427 from greyli/update-old-links
Update old pocoo links everywhere
2019-11-19 09:37:21 -08:00
Grey Li
459abe1cea Use https for pallets URL 2019-11-19 09:32:35 -08:00
Grey Li
66a28f0f28 Replace old pocoo links everywhere
pocco.org -> palletsprojects.com
2019-11-19 09:32:35 -08:00
David Lord
72504c2b38 Merge pull request #3435 from pallets/send-file-text
send_file doesn't allow StringIO
2019-11-19 09:08:07 -08:00
David Lord
46c3d4656d send_file doesn't allow StringIO 2019-11-19 08:52:12 -08:00