Commit graph

3558 commits

Author SHA1 Message Date
David Lord
316caad5db Merge branch '1.0.x' 2019-05-16 12:18:36 -07:00
David Lord
b204bdca5a Merge pull request #3203 from vtbassmatt/patch-1
add Azure Pipelines to test coverage
2019-05-16 12:12:06 -07:00
Matt Cooper
6afd25b874 add Azure Pipelines to readme 2019-05-16 12:07:43 -07:00
David Lord
a40eccbe0f Merge pull request #3199 from alecbrooks/master
Fix various small spelling errors.
2019-05-16 11:54:34 -07:00
A Brooks
651692c1a1 Fix various small spelling errors. 2019-05-16 11:50:10 -07:00
David Lord
04caad0257 Merge pull request #3162 from chivalry/gunicorn-discovery-docs-update
Update documentation on gunicorn deployment and app discovery
2019-05-16 10:45:50 -07:00
Charles Ross
4f3dd3183f update docs on gunicorn deploy and app discovery 2019-05-16 10:45:03 -07:00
David Lord
4e6467a51e Merge pull request #3159 from abhinavsagar/updatedoc
Improved CONTRIBUTING.rst
2019-05-16 10:23:17 -07:00
David Lord
b572779136 add instructions for bug and feature branches 2019-05-16 10:22:21 -07:00
Abhinav
daebc9ceda add more git commands to contributing doc 2019-05-16 10:22:01 -07:00
David Lord
b0d0e6206d Merge pull request #3142 from Tom-McDonald/3139-alter-deprecated-docs
Replaced deprecated sample code in proxy-setup docs
2019-05-16 09:55:30 -07:00
Tom-McDonald
406df032bc replaced deprecated sample code in proxy-setup docs 2019-05-16 09:54:49 -07:00
David Lord
6e37033282 Merge pull request #3129 from adamchainz/fix_html_injection
Fix some HTML injection paths in examples
2019-05-16 09:52:13 -07:00
Adam Johnson
00b94d76d5 Fix some HTML injection paths in examples
These are unlikely to be copy-pasted by users but it's best practice to avoid it and other examples do.
2019-05-16 09:50:58 -07:00
David Lord
ecb8f23406 Merge pull request #3137 from Abdur-rahmaanJ/patch-2
Update CONTRIBUTING.rst discord link + style info
2019-05-16 09:48:59 -07:00
David Lord
327f5249d5 fix discord link, clean up 2019-05-16 09:47:56 -07:00
Abdur-Rahmaan Janhangeer
ae3f21def4 Update CONTRIBUTING.rst 2019-05-16 09:43:51 -07:00
David Lord
3b6673c608 Merge pull request #3118 from JBonser/master
Fix code snippet in config.rst for env vars Fixes #3117
2019-05-16 08:52:23 -07:00
jordan bonser
342fbe6fe7 improve env vars config example 2019-05-16 08:48:34 -07:00
David Lord
be980c8409 Merge pull request #3196 from jakseb/fix-docs-paren
Fix misplaced paren in docs
2019-05-16 08:28:58 -07:00
David Lord
10d4d0958b Merge pull request #3172 from vtbassmatt/enhance-azure-pipelines
add test output and a run against Python RC
2019-05-16 07:36:02 -07:00
David Lord
db87879060 Merge pull request #3096 from RyanSquared/master
helpers.py: Fix docs of url_for(..., _external=True)
2019-05-16 07:30:07 -07:00
RyanSquared
5298b35572 helpers.py: Fix docs of url_for(..., _external=True) 2019-05-16 06:54:20 -07:00
Sebastian Jakubiak
2ff41f0e48 Fix misplaced paren in docs 2019-05-13 22:22:40 +02:00
David Lord
15808685f2 Merge pull request #3191 from jaydarius/master
replace "otherwise" with "or" to complete the "either" statement in templates doc
2019-05-13 06:45:13 -07:00
jaydarius
b028b995ce use or to complete the either statement 2019-05-08 10:59:55 -04:00
David Baumgold
f5f021e593 Merge pull request #3183 from singingwolfboy/pre-commit
Pre-commit: Black
2019-05-06 16:34:46 -04:00
David Baumgold
85ce588b3b Reformat with black
https://github.com/python/black
2019-05-06 16:28:58 -04:00
David Baumgold
64e3cdda48 Set up pre-commit to run black
Call it automatically via tox
2019-05-06 16:28:54 -04:00
David Baumgold
16b78e3d62 Merge pull request #3175 from singingwolfboy/fix-rst-line-too-long
fix RST line too long
2019-05-06 15:23:35 -04:00
David Lord
3dd82e8939 Merge pull request #3178 from LindsayYoung/patch-1
Create CODE_OF_CONDUCT.md
2019-05-06 13:46:38 -04:00
Lindsay Young
5bd3320e03 Create CODE_OF_CONDUCT.md
Ticket is referenced in [#Issue 1](https://github.com/pallets/meta/issues/1) in the Meta repo.
Spoke with @davidism and the decision was to use Contributor Covenant. It has easy GitHub integration and quality text.

For context, Here is a comparison of different codes of conduct from geek feminism:
Contributor Covenant looks like it is a good default because it covers:

Descriptions of common but unacceptable behavior
Reporting instructions with contact information
Information about enforcement
Clear demarcation between anti-harassment policy and general community guidelines
2019-05-06 12:41:01 -04:00
David Baumgold
3b6d1ecd24 fix RST line too long 2019-05-06 11:11:32 -04:00
David Lord
5649b888c2 Merge pull request #3173 from pwlandoll/1.0-maintenance
Add link to official Discord chat server
2019-05-06 10:49:29 -04:00
Peter Landoll
105cc0ae94 Add link to official Discord chat server 2019-05-06 09:39:25 -04:00
Matt Cooper
1c3242c734 make a "future" toxenv 2019-05-04 20:46:33 -04:00
Matt Cooper
069d2a90f5 do an allowed-failure the right way 2019-05-04 20:29:08 -04:00
Matt Cooper
0140c22c51 try moving junit into tox.ini 2019-05-04 16:59:10 -04:00
Matt Cooper
7c1ba5f02a add test output and a run against Python RC 2019-05-04 16:24:13 -04:00
David Lord
31091f5fa1 Set up Azure Pipelines (#3170)
initial Azure Pipelines setup
2019-05-04 10:51:57 -04:00
Matt Cooper
b86631685c one more todo 2019-05-04 10:40:10 -04:00
Matt Cooper
ceac23d7e6 remove unsupported Python 2019-05-04 10:22:29 -04:00
Matt Cooper
87475f9357 add TODOs 2019-05-04 10:19:50 -04:00
Matt Cooper
cb35a18772 initial Azure Pipelines setup 2019-05-04 09:45:20 -04:00
David Lord
dea71a8ea2 Merge pull request #3155 from zabbal/master
Bump Jinja2 requirements
2019-04-15 11:28:17 -07:00
Max
59a2f1ec93 Bump Jinja2 requirements
The 2.10.1 version was released 2019-04-06 and contains important security fix.
This change allows flask users to avoid implicit insecure dependency.
2019-04-15 17:13:07 +02:00
David Lord
26d79e5632 Merge pull request #3150 from greyli/fix-route-defaults-doc
[Doc] Fix typo in code example for route defaults
2019-04-11 19:11:21 -07:00
Grey Li
e4f8be4ee5 Fix typo in URL defaults example 2019-04-12 09:45:58 +08:00
David Lord
cb22dc8cc2 Merge pull request #3113 from greyli/improve-doc-quickstart
doc: Improve description for valid view func return value
2019-03-06 05:40:22 -08:00
Grey Li
89a3e0c915 doc: Improve description for valid view func return value
* improve wording.
* remove unnecessary spaces.
2019-03-06 10:34:21 +08:00