Commit graph

2391 commits

Author SHA1 Message Date
Reuven
4dc2ef19ea Use pytest.raises() instead of try/catch with asser 0
This is somehow more readable, and enable using the features of pytest's ExeptionInfo (such as errisinstance).
2016-03-04 13:30:40 +02:00
Markus Unterwaditzer
e7d548595e Merge pull request #1456 from jonafato/proxy-setup-x-forwarded-proto
Add X-Forwarded-Proto header to proxy setup example docs
2016-02-17 22:02:22 +01:00
Armin Ronacher
2094e8f28e Merge pull request #1723 from ericdill/doc-update
DOC: Remove gendered language
2016-02-09 11:26:03 -08:00
Eric Dill
52daeffdc9 DOC: Remove gendered language 2016-02-09 14:24:09 -05:00
David Lord
f63cd72297 Merge pull request #1721 from pra85/patch-1
typo: interchangable -> interchangeable
2016-02-08 06:14:29 -08:00
Prayag Verma
6c0496a1f3 Fix a typo
`interchangable` → `interchangeable`
2016-02-08 19:33:34 +05:30
Kenneth Reitz
d5308bb80c Merge pull request #1716 from lord63-forks/fix-typo
Fix typo
2016-02-04 01:49:09 -05:00
lord63
07fdd1930b Update app.py 2016-02-04 14:35:03 +08:00
lord63
6d0bbd627c Fix typo
* Use the compatible way to handle the exception. You can find the
source code wsgi_app in app.py, and it use the compatible way, so update it
* Fix typo in config.py
* Fix typo in app.py
2016-02-03 21:08:22 +08:00
David Lord
22270d0f7d Merge pull request #1715 from ThiefMaster/patch-1
Add missing return to g.setdefault
2016-02-02 07:39:21 -08:00
Adrian
a4df0fbb39 Add missing return to g.setdefault 2016-02-02 16:16:01 +01:00
Kenneth Reitz
e7367c9bbf Merge pull request #1588 from Akasurde/i_1465
Updated documentation for Setuptools
2016-01-26 20:40:26 -05:00
David Lord
b4240e6bbd Merge pull request #1688 from nivm/master
Remove 'flask' from etags to obscure server technologies
2016-01-25 23:02:48 -08:00
David Lord
992d9be96e clean up 2016-01-25 22:56:51 -08:00
David Lord
7df543d5dc Merge pull request #1703 from jeffwidman/master
Cleanup jsonify() function
2016-01-25 22:52:09 -08:00
David Lord
7b1ebfbc4d Merge pull request #1679 from miguelgrinberg/passthrough-errors
Werkzeug should not block propagated exceptions from Flask
2016-01-25 22:17:04 -08:00
Jeff Widman
0edf0a0e3a Cleanup jsonify() function
Cleanup some leftover stuff from #1671. PEP8 spacing, args/kwargs don't need to be converted to list/dict, and Sphinx formatting.
2016-01-25 16:43:02 -08:00
Markus Unterwaditzer
f267191cd8 Merge pull request #1669 from jeffwidman/master
Update `tox` installation instructions to point to PyPI
2016-01-25 20:27:24 +01:00
David Lord
431db2874b Merge pull request #1671 from jeffwidman/support-json-top-level-arrays
Add support for serializing top-level arrays to JSON
2016-01-25 07:16:51 -08:00
Jeff Widman
daceb3e3a0 Add support for serializing top-level arrays to JSON
Fix #170, #248, #510, #673, #1177
2016-01-13 13:20:11 -08:00
nivm
edb65cc0f0 remove 'flask' from etags to obscure server technologies 2016-01-10 12:33:35 +02:00
Miguel Grinberg
952a6c8989 Werkzeug should not block propagated exceptions from Flask 2016-01-02 14:18:36 -08:00
Jeff Widman
102a33ca52 Update tox installation instructions to point to PyPI 2015-12-30 01:04:24 -08:00
David Lord
f17e6061fc Merge pull request #1666 from AvivC/fix-mistake-in-contributing-file
Fixed mistake in CONTRIBUTING.rst file, regarding pip install.
2015-12-27 10:42:45 -08:00
AvivC
23cf923c7c Clarified CONTRIBUTING.rst
Added 'cd flask' before 'pip install --editable .'.
2015-12-27 04:55:57 +02:00
David Lord
c1c205bcd3 Merge pull request #1661 from lord63-forks/clarify-version
Clarify the python versions that flask supports
2015-12-20 08:19:35 -08:00
lord63
7368a164c7 Clarify the python versions that flask supports 2015-12-20 20:39:38 +08:00
David Lord
9f4cbb9af4 Merge pull request #1651 from lord63-forks/remove-with-statement
Remove with_statement in flask/ctx.py
2015-12-13 09:21:01 -08:00
lord63
b55bc0baa2 Remove with_statement in flask/ctx.py 2015-12-13 22:08:31 +08:00
David Lord
dc07e26a8f Merge pull request #1648 from accraze/mod-wsgi-docs
Mod wsgi docs
2015-12-09 21:09:07 -08:00
accraze
fcd573e120 added note about directory permission syntax change
docs had httpd 2.2 syntax for directory permission with a link to Apache 2.4 changes. added an example of httpd 2.4 syntax

resolves #1644
2015-12-09 20:24:23 -08:00
David Lord
910ad01916 use https instead of git protocol
git protocol is blocked on some networks
2015-12-03 16:50:16 -08:00
David Lord
d7b20e0ad7 use https instead of git protocol
git protocol is blocked on some networks
2015-12-03 16:40:46 -08:00
David Lord
c388e9c24e add myself to authors 2015-12-03 16:40:46 -08:00
David Lord
ec07d7086a Merge pull request #1637 from d0ugal/patch-1
Fixed a typo in the appfactories docs
2015-12-03 05:03:47 -08:00
Dougal Matthews
25aab43f8e Fixed a typo
I think 'app' is the intended word here, but I am not 100% sure.
2015-12-03 09:51:24 +00:00
David Lord
db468a4618 ignore pycharm config 2015-12-01 20:58:12 -08:00
David Lord
b3b5a98fd0 Merge pull request #1630 from redian/master
Skip tests if redbaron is not installed
2015-11-27 08:57:56 -08:00
David Lord
a68a25cb1f Merge pull request #1629 from redian/patch-3
Add .cache dir to gitignore
2015-11-26 19:17:41 -08:00
Redian Ibra
96f7b07caf Skip test if redbaron is not installed 2015-11-26 22:11:34 +00:00
Redian
4a576b06e8 Add .cache dir to gitignore
I think this could be handy and potentially minimise the risk
anyone commits it to the project.

```
flask - (master) $ tree .cache/
.cache/
└── v
    └── cache
        └── lastfailed

```
2015-11-26 21:04:23 +00:00
David Lord
bd4020d9de Merge pull request #1624 from lord63-forks/fix-code-format
Render the code block in mongokit.rst
2015-11-22 00:15:58 -08:00
lord63
51b62fb044 Render the code block in mongokit.rst 2015-11-22 14:43:25 +08:00
Armin Ronacher
751fe451df Merge pull request #1558 from JonasGroeger/master
Update uwsgi/nginx deployment documentation
2015-11-12 13:08:56 +01:00
Armin Ronacher
7d6e118572 Merge pull request #1616 from dthul/typo
Fix typo.
2015-11-11 23:50:09 +01:00
Daniel Thul
2faf245876 Fix typo. 2015-11-11 23:46:51 +01:00
David Lord
915d34444b Merge pull request #1610 from lord63-forks/fix-typo
Fix typo in app_ctx_globals_class doc in app.py
2015-11-06 18:12:56 -08:00
lord63
1d49343bb1 Fix typo in app_ctx_globals_class doc in app.py 2015-11-07 09:04:24 +08:00
Armin Ronacher
8789c94d82 Merge pull request #1608 from Windfarer/patch-1
Fix a typo
2015-11-04 15:39:43 +01:00
Eric Yang
7f678aaf5a Fix a typo
Maybe this is a typo?
2015-11-04 22:08:31 +08:00