Commit graph

3761 commits

Author SHA1 Message Date
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
Grey Li
8e62a33cff add import for escape in quickstart
import escape from markupsafe instead of flask
2020-02-10 17:53:11 -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
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
f2805605ca xfail __main__ instance test interacting with tox 2020-02-10 10:16:08 -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
David Lord
e3b4500290 fix test pipeline display name 2019-11-18 19:06:57 -08:00
David Lord
8152747bd1 Merge pull request #3401 from Jamim/feature/python-3.8
Declare support for Python 3.8
2019-11-18 19:05:01 -08:00
David Lord
304a1e06d5 add 3.8 to pipelines 2019-11-18 18:57:43 -08:00
Aliaksei Urbanski
36ce489ee3 declare support for Python 3.8 2019-11-18 18:26:46 -08:00
David Lord
ea7235ca35 Merge pull request #3410 from haneybarg/bad_request
[BUG FIX] Test test_send_from_directory_bad_request fails in Python 3.8.
2019-10-28 18:26:16 -07:00
Fernanda Guimarães
7806be9784 Test test_send_from_directory_bad_request no longer fails in Python 3.8. 2019-10-28 21:37:25 -03:00
David Lord
cdc0db7b34 Merge pull request #3381 from seeksort/request-context-typo
fix typo in request context docs
2019-10-08 09:11:18 -07:00
Kristin Faner
f07c5084ec fix typo in request context docs 2019-10-08 09:06:01 -07:00
David Lord
ea659d77e5 Merge branch '1.0.x' into 1.1.x 2019-09-24 06:44:18 -07:00
David Lord
6ee61a8b57 Merge branch '0.12.x' into 1.0.x 2019-09-24 06:43:25 -07:00
David Lord
ab803a2c3f Merge pull request #3376 from pallets/migrate-docs
update docs for new theme
2019-09-24 06:41:48 -07:00
David Lord
aef114e372 update docs for new theme 2019-09-24 06:35:10 -07:00
David Lord
c5fa5f87ca Merge pull request #3344 from hharutyunyan/fix-the-contibution-docs
Fix the contibution docs
2019-09-23 12:24:08 -07:00
David Lord
286b84c370 Merge branch '1.0.x' into 1.1.x 2019-09-23 12:10:55 -07:00
David Lord
b57eaa0c6a Merge pull request #3375 from pallets/ext-py-version
reword extension python version item
2019-09-23 12:10:30 -07:00
David Lord
7c206114fa reword extension python version item 2019-09-23 11:59:59 -07:00
David Lord
d5a739fae5 Merge branch '1.0.x' into 1.1.x 2019-09-23 08:38:11 -07:00
David Lord
70aee183af Merge pull request #3374 from pallets/ext-docs
Remove old things from docs
2019-09-23 08:33:50 -07:00
David Lord
4504c6d7b8 update patterns, snippets, extensions docs 2019-09-23 08:19:40 -07:00
hharutyunyan
6ed048887b Updating contribution docs. Added the link with a guide to install pre-commit and made the pre-commit installation command a code block. 2019-08-29 02:44:00 +04:00
Joshua Bronson
f60e9129cd Merge pull request #3343 from gruentee/patch-1
fix typo: base on -> based on
2019-08-25 15:36:19 -04:00
Constantin
1c383fc13f fix typo: base on -> based on 2019-08-25 20:33:41 +02:00
David Lord
4f3db0862a fix stylecheck 2019-08-01 13:35:38 -07:00
David Lord
50a3d54a5b Merge branch '1.0.x' into 1.1.x 2019-08-01 13:08:12 -07:00
David Lord
b14df2fb1e Merge pull request #3317 from csirmazbendeguz/patch-1
Fix typo in urlprocessors.rst
2019-08-01 13:07:52 -07:00
Csirmaz Bendegúz
59ef0883f7 Fix typo in urlprocessors.rst 2019-08-01 12:58:07 -07:00
David Lord
9ed8ac2c19 Merge pull request #3321 from greyli/fix-gh-link-generator
Fix github link generator for docs
2019-08-01 12:56:30 -07:00
Grey Li
a1c23b2fe7 Fix github link generator for docs 2019-08-01 22:49:31 +08:00
David Lord
a30c2d8ae3 Merge branch '1.0.x' into 1.1.x 2019-07-22 13:31:05 -07:00
David Lord
ee41abdab6 Merge pull request #3305 from greyli/update-extension-doc
Update outdated extension doc
2019-07-22 13:30:43 -07:00
Grey Li
411055c52b Update outdated extension doc
Remove links and descriptions relate to abandoned "Flask Extension
Registry" in documentation
2019-07-22 13:23:57 -07:00
David Lord
0202d4fdaa pass sys.argv to flask cli 2019-07-10 12:44:04 -07:00
David Lord
0ea36c138e Merge pull request #3298 from matrixise/patch-1
Documentation: Use Python 3.5+
2019-07-10 10:28:19 -07:00