Marc Hernandez Cabot
ed93b738ed
fix docstring and remove redundant parentheses
2020-02-10 17:03:52 -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
David Lord
72fe9e541c
Merge pull request #3406 from erfanio/f-string-docs
...
Change docs to use f-strings
2019-11-18 19:09:30 -08:00
David Lord
c770899f89
Merge branch '1.1.x'
2019-11-18 19:07:23 -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
050efbf013
Merge pull request #3425 from homeworkprod/patch-1
...
Update `versionadded` for `Config.from_file`
2019-11-18 18:23:39 -08:00
David Lord
ba87813de1
Merge pull request #3434 from pallets/eager-load
...
lazy load app on reload only
2019-11-18 18:22:38 -08:00
David Lord
c71de17d1d
rewrite the development server docs
2019-11-18 18:02:12 -08:00
David Lord
578592c01e
lazy load app on reload only
2019-11-18 17:54:46 -08:00
David Lord
3996b7842e
Merge remote-tracking branch 'origin/1.1.x'
2019-11-18 17:54:20 -08:00
Jochen Kupperschmidt
bf13ec0142
Update versionadded for Config.from_file
...
According to the change log at https://github.com/pallets/flask/blob/master/CHANGES.rst , the release `Config.from_file` will be published with is now 2.0.0 rather than 1.2.0.
2019-11-13 23:13:56 +01:00
Joshua Bronson
9b0ba59a37
Merge pull request #3414 from thiagojobson/master
...
Fix typo in documentation
2019-11-02 18:40:20 -04:00
Thiago J. Barbalho
a327136305
Fix typo
2019-11-02 20:56:35 +00: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
e750348459
Merge pull request #3408 from lamby/943674-flask-please-make-the-build-reproducible
...
Make the documentation build reproducibly
2019-10-28 07:59:00 -07:00
Chris Lamb
d3a16a9895
Make the documentation build reproducibly
...
Whilst working on the Reproducible Builds effort [0] we noticed that
flask could not be built reproducibly.
This is because it includes an absolute build directory in the
documentation as the "json_module" attribute points to a Python class/
module which has a string representation including its path.
This commit skips this (inherited) member from the documentation.
(This was originally filed in Debian as #943674 [1].)
[0] https://reproducible-builds.org/
[1] https://bugs.debian.org/943674
2019-10-28 09:16:53 +00:00
erfanio
96524db988
Change docs to use f-strings
2019-10-26 17:19:00 +11:00
David Lord
10e920329f
Merge pull request #3398 from pgjones/toml
...
Support loading configuration from text files
2019-10-18 09:28:37 -07:00
David Lord
a620f1c9c8
clean up config.from_file docs
2019-10-18 09:24:58 -07:00