root
/
flask
mirror of https://github.com/pallets/flask.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3,869 Commits 4 Branches 68 Tags 38 MiB
Commit Graph

3869 Commits

Author SHA1 Message Date
David Lord 7673835b3d
remove Python 2 from docs 2020-04-04 12:05:44 -07:00
David Lord 96b4dcafc3
Merge branch '1.1.x' 2020-04-03 10:25:51 -07:00
David Lord 93dd1709d0
release version 1.1.2 2020-04-03 10:10:38 -07:00
David Lord 4024a4a89c
update deprecation versions 2020-04-03 10:02:40 -07:00
David Lord f991a89810
Merge pull request #3541 from jeenuv/clarify-static 
Clarify that static_folder must be a relative path
 2020-04-03 07:33:20 -07:00
Jeenu Viswambharan 4548e00dba
clarify static_folder is relative to root_path 2020-04-03 07:28:44 -07:00
David Lord 3d61fc4428
Merge pull request #3529 from pgkrit/master 
Move HTML escaping example back to Variable Rules.
 2020-04-02 12:55:49 -07:00
David Lord 57f9623b08
move html escaping to dedicated section 2020-04-02 12:49:00 -07:00
David Lord c6a619af83
update CLI docs IDE integration 2020-04-02 12:09:04 -07:00
David Lord 037ae3f024
Merge remote-tracking branch 'origin/1.1.x' 2020-04-02 11:56:30 -07:00
David Lord ac9589ca72
Merge pull request #3530 from valleygtc/docs-fix 
docs: testing.rst function def missing colon
 2020-04-02 11:55:01 -07:00
David Lord aad99260d9
Merge pull request #3537 from shanavas786/master 
Update deprecated for config.from_json
 2020-04-02 11:54:25 -07:00
Joshua Bronson bcf0a95216
Merge pull request #3544 from mattc41190/patch-2 
Grammar and clarity fix
 2020-03-25 10:39:45 -04:00
mattc41190 1736e01ea0
Grammar and clarity fix 2020-03-25 09:20:55 -05:00
Joshua Bronson 80a597b7f9
Merge pull request #3543 from mattc41190/patch-1 
itty bitty typo
 2020-03-24 11:17:25 -04:00
mattc41190 8fc723c7c2
itty bitty typo 2020-03-24 09:54:32 -05:00
Shanavas M e047dd6a32
Update deprecated for config.from_json 2020-03-18 12:37:51 +05:30
David Lord c47c8c4389
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 d115d843e6
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 29d33203d0
Merge pull request #3524 from jeffwidman/patch-2 
Remove deprecated `license_file` option
 2020-03-11 07:40:06 -07:00
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