Commit graph

3365 commits

Author SHA1 Message Date
David Lord
8d77588ca1 Merge pull request #2970 from stepharr/patch-1
AJAX with jQuery: Adding conjunction where for clarification
2019-01-06 15:06:19 -08:00
Stephon Harris
ee861266dc Adding conjunction where for clarification 2019-01-06 15:05:54 -08:00
David Lord
6fd6d933ce Merge pull request #2875 from nathanbegbie/patch-1
Update docs on larger applications WRT tutorial
2019-01-06 15:00:00 -08:00
nathanbegbie
7b00a51acc Update docs on larger applications wrt tutorial
The wording of the docs makes it sound like the tutorials use the simple structure for a flask application, which they no longer do.
This commit re-words the docs to make it clearer.
2019-01-06 14:53:03 -08:00
David Lord
abc0215491 Merge pull request #2918 from garenchan/docs2
Docs: fix some typos in config.rst
2019-01-06 14:51:55 -08:00
garenchan
da19d8a914 Docs: fix some typos in config.rst 2019-01-06 14:45:10 -08:00
David Lord
52615f063b Merge pull request #2854 from dougthor42/update-docs-to-be-more-clear-about-from_config-instantiation-#2853
Update docs to be more clear about from config instantiation
2019-01-06 14:43:17 -08:00
Douglas Thor
fad04d2547 document that Config.from_object uses object as-is 2019-01-06 14:34:05 -08:00
David Lord
bf5b15bd94 Merge pull request #2913 from onovy/contributing-manifest
Install CONTRIBUTING.rst with MANIFEST.in
2019-01-06 10:51:51 -08:00
Ondřej Nový
9fb44bcd20 Install CONTRIBUTING.rst with MANIFEST.in
Without CONTRIBUTING.rst filoe, documentation is not buildable:
docs/contributing.rst:1: WARNING: Problems with "include" directive path:
InputError: [Errno 2] No such file or directory: 'CONTRIBUTING.rst'.
2019-01-06 10:50:08 -08:00
David Lord
513e6fb22c Merge pull request #3066 from pallets/no-osx
disable slow travis osx env
2019-01-06 10:45:14 -08:00
David Lord
c9847b842a disable slow travis osx env 2019-01-06 10:43:53 -08:00
David Lord
316afdc84b Merge pull request #3065 from pallets/fedora
use "-m virtualenv" in installation doc
2019-01-06 10:34:52 -08:00
David Lord
3477b7dd55 Merge pull request #3056 from tirkarthi/fix-syntax-warning
Fix syntax warning in docstring
2019-01-06 10:25:47 -08:00
David Lord
7f013c7a3c use "-m virtualenv" in installation doc 2019-01-06 10:25:16 -08:00
xtreak
09d8889995 remove syntax warning from docstring 2019-01-06 10:17:58 -08:00
David Lord
2394cdd95a Merge pull request #3054 from tirkarthi/fix-py37-warnings
Fix DeprecationWarning on collections import in flask.sessions
2019-01-06 10:09:18 -08:00
xtreak
890fa6e47d Fix DeprecationWarning on collections import 2019-01-06 10:04:00 -08:00
David Lord
42cbd754d6 Merge pull request #3051 from ExplodingCabbage/tojson-docs-fixes
[Docs] Improve tojson docs (additions, clarifications, & fixes)
2019-01-06 09:54:59 -08:00
Mark Amery
7e44691ee3 Clarify and add detail to tojson docs
Fix some confusing and obsolete prose.
2019-01-06 09:44:09 -08:00
David Lord
39850ce9bb Merge pull request #3049 from RohanTalip/scriptinfo-typo
Corrected a typo in a docstring: "Help object" --> "Helper object"
2019-01-06 09:16:29 -08:00
Rohan Talip
6d5e36074c Corrected a typo in a docstring: "Help object" --> "Helper object" 2019-01-06 09:10:28 -08:00
David Lord
f4076ad5ff Merge pull request #3031 from jseldess/fix-typos
Fix typos found while completing the Flask tutorial
2019-01-06 08:11:39 -08:00
Jesse Seldess
0c011a4c15 Fix typos found while completing the Flask tutorial 2019-01-06 08:01:45 -08:00
David Lord
a63fd1a52a Merge pull request #3044 from garenchan/ci-test
Add Python 3.7 to CI.
2019-01-06 08:00:23 -08:00
David Lord
550f93b7b8 use specific pypy versions for travis xenial
remove 3.6 from appveyor, reduce in tox
remove deprecated travis feature "sudo: false"
split docs and devel,lowest travis envs
remove osx py2 env in attempt to finish faster
move travis matrix to python key
2019-01-06 07:52:03 -08:00
garenchan
5008fd8032 Add Python 3.7 to CI. 2019-01-06 07:09:11 -08:00
David Lord
75a7e66df5 Merge pull request #3019 from colincadams/patch-2
Clarify prefixing of urls for blueprint endpoints
2019-01-06 07:07:59 -08:00
Colin Adams
e0916c7d0d Clarify prefixing of URLs for blueprint endpoints
Clarify that endpoint names are prefixed by the name of the blueprint,
but the URL is not automatically prefixed.
2019-01-06 06:58:38 -08:00
David Lord
e00b032e0e Merge pull request #3011 from greyli/improve-cli-help-text
Use imperative tense for CLI help text
2019-01-06 06:38:14 -08:00
Grey Li
20479fe107 Use imperative tense for CLI help text 2019-01-06 06:31:57 -08:00
David Lord
215bbf21b5 Merge pull request #3063 from pallets/key-error
clear KeyError in production for Werkzeug 0.15
2019-01-05 15:07:06 -08:00
David Lord
6b11d22427 Merge pull request #3064 from pallets/docs-fix
fix docs build
2019-01-05 15:06:41 -08:00
David Lord
a97c5c75c7 fix docs build 2019-01-05 14:59:25 -08:00
David Lord
77335fb105 clear KeyError in production for Werkzeug 0.15 2019-01-05 12:49:59 -08:00
David Lord
d5bfd939cb Merge pull request #2993 from data-get/update-cache-documentation
Update documentation for users to use flask-caching instead of Werkzeug cache
2018-11-13 14:09:31 -05:00
Andrew Crouse
b2bcf461c4 Update documentation for users to use flask-caching instead of the deprecated Werkzeug cache 2018-11-13 14:03:27 -05:00
David Lord
8dd7391dcb Merge pull request #2966 from jangjunha/fix-doc-deferredcallbacks
Docs: Fix deferredcallbacks.rst
2018-10-25 08:54:52 -07:00
jangjunha
f112dc0aed Fix deferred callback doc 2018-10-26 00:33:12 +09:00
David Lord
af0d15271b Merge pull request #2963 from garenchan/bugfix-#2961
Fix #2961:ignore colon followed by slash when split app_import_path
2018-10-24 09:06:39 -07:00
garenchan
9da281c04c ignore colon with slash when split app_import_path
Flask currently supports importing app through a combination of module
path and app variable name, such as '/usr/app.py:my_app'. When the
module path contains a colon, it will conflict with this import way and
a `flask.cli.NoAppException` will be raised.

A file path on a Windows system may contain a colon followed by a slash.
So we solved this problem on Windows by ignoring the colon followed by a
slash when we split app_import_path.

Fix issue #2961.
2018-10-24 23:47:41 +08:00
Jarek Lipski
1a31fc71f6 fix @click.command example by adding parens
Otherwise the example fails with the following error: 
"name = name or cmd.name AttributeError: 'function' object has no attribute 'name'". 

More details: https://stackoverflow.com/a/51923415/4619705
2018-09-19 10:02:51 -07:00
Adrian
e44c8e1b2c Merge pull request #2765 from ThiefMaster/custom-cli-ignore-debug
Add option to not overwrite debug flag in cli
2018-06-14 13:31:00 +02:00
ThiefMaster
fbaeb1fc99 Add option to not overwrite debug flag in cli
This is mainly intended for custom CLIs that may load a config file
which already sets the debug flag and does not make use of the `FLASK_*`
env vars at all.
2018-06-14 13:25:05 +02:00
David Lord
08f803fcea update test envs
use pypy3
fix travis osx env
cache pip on appveyor
codecov on appveyor
2018-05-29 11:46:04 -07:00
David Lord
0be8412fc2 Merge pull request #2804 from pallets/ascii-header
encode filenames as ascii instead of latin-1
2018-05-28 06:57:15 -07:00
David Lord
40a2cecdf7 encode filenames as ascii instead of latin-1
latin-1 is allowed by pep3333, but that breaks gunicorn
2018-05-28 06:36:47 -07:00
David Lord
61929922b1 Merge pull request #2789 from briehanlombaard/fix-sslcontext-attribute-error
AttributeError: 'module' object has no attribute 'SSLContext'
2018-05-17 09:24:21 -04:00
Briehan Lombaard
51f4340127 SSLContext was added in Python 2.7.9 2018-05-17 06:18:42 -07:00
David Lord
751a5fa4a4 Merge branch '0.12-maintenance' into 1.0-maintenance 2018-05-08 20:31:10 -07:00