Commit graph

3590 commits

Author SHA1 Message Date
shidenggui
e9efad7cf4 allow customizing url map class 2019-05-18 21:50:56 -07:00
David Lord
1593079758 Merge pull request #3195 from eruvanos/json_support_dataclass
Support dataclass in JSONEncoder (if available)
2019-05-18 21:44:21 -07:00
Eruvanos
36362454c3 support dataclass in JSONEncoder 2019-05-18 21:37:54 -07:00
David Lord
6c83bde636 Merge pull request #3182 from qil026/issue-3134-url-join
Remove ending slash from static_url_path
2019-05-18 21:27:31 -07:00
Frankie Liu
c7432f50cb Remove ending slash from static_url_path 2019-05-18 21:23:14 -07:00
David Lord
1dd28e18b2 Merge pull request #3185 from EtiennePelletier/Flask-3022
Simplify flask.cli.main
2019-05-18 21:19:57 -07:00
EtiennePelletier
5fe3d43ab6 Simplify flask.cli.main
Werkzeug>=0.15's reloader now properly detects `python -m module`.
Fixes #3022
2019-05-18 21:15:09 -07:00
David Lord
317e4663d7 Merge pull request #3181 from EtiennePelletier/Flask-3125
Use Werkzeug's JSONMixin class (moved from Flask) and update tests
2019-05-18 21:10:12 -07:00
EtiennePelletier
1a9616d581 Use Werkzeug's JSONMixin class and update tests
Flask's JSONMixin class was moved to Werkzeug>=0.15

Co-authored-by: Jeffrey Eliasen <jeff@jke.net>
2019-05-18 20:57:26 -07:00
David Lord
3a670370c8 Merge pull request #3190 from EtiennePelletier/jinja2-977
Make jinja_options a dict rather than ImmutaleDict
2019-05-18 08:44:03 -07:00
David Lord
797e24ebb2 use dict literal syntax for jinja_options
clarify docs about when jinja_options can be modified
2019-05-18 08:35:47 -07:00
EtiennePelletier
f2270e7a28 Make jinja_options a dict rather than ImmutaleDict
This allows changing jinja environment options from the flask app:
>>> app.jinja_options['undefined'] = jinja2.ChainableUndefined
2019-05-18 05:31:55 -07:00
David Lord
1a4dbe5c48 Merge pull request #3179 from Lee-W/MethodView-inheritance
Fix MethodView inheritance Error (#3138)
2019-05-17 14:18:40 -07:00
LeeW
43fe5f7d0b Inherit "methods" in MethodView
* Current behavior: If a base class inherits MethodView and child class
  inherits without overwriting "methods". The "methods" defined in base
  class would be ignored
* Fix: Inherit all the "methods" defined in base classes if "methods"
  variable is not overwritten
2019-05-17 13:57:06 -07:00
David Lord
c82324cb56 Merge pull request #3174 from icreatedanaccount/master
Allow mode='rt' on open_resource() helper
2019-05-17 13:32:40 -07:00
David Lord
479041907f add sphinx-issues 2019-05-17 13:26:54 -07:00
David Lord
371d1ab40d clean up open_resource and tests 2019-05-17 13:23:27 -07:00
icreatedanaccount
07a177043f Allow mode='rt' on open_resource() helper 2019-05-17 13:22:13 -07:00
David Lord
d37b992a54 Merge branch '1.0.x' 2019-05-17 11:13:08 -07:00
David Lord
92785ead80 release version 1.0.3 2019-05-17 10:57:51 -07:00
David Lord
5425b0c2eb Merge pull request #3206 from pallets/test-client-json
don't push app context for test client json
2019-05-17 09:04:37 -07:00
David Lord
8a431d4342 don't push app context for test client json 2019-05-17 09:00:08 -07:00
David Lord
f2df578d41 Merge pull request #3169 from DamianSkrzypczak/3168-improve-warning-about-dev-server-use-in-production
Fix dev-server warning message readability (#3168)
2019-05-16 19:23:19 -07:00
DamianSkrzypczak
975ede3628 Fix dev-server warning message readability (#3168) 2019-05-16 19:03:08 -07:00
David Lord
40d67dfc17 Merge pull request #3154 from brunoais/more-explicit-session-transaction
More explicit explanation: session testing
2019-05-16 18:17:45 -07:00
brunoais
b7bac12723 More explicit explanation: session testing
Use a more explicit explanation on how to write code to test own code
when sessions are needed.
The previous code was not fully explicit that the client is supposed
to be called after the session transaction and not during.
2019-05-16 18:07:18 -07:00
David Lord
81b0d5dfe8 Merge pull request #3166 from mekarpeles/refactor/unused-url_join
removed unused reference to url_join
2019-05-16 17:56:30 -07:00
Michael E. Karpeles
4918fe2903 removed unused reference to url_join 2019-05-16 17:47:14 -07:00
David Lord
a6142060f0 Merge branch '1.0.x' 2019-05-16 17:37:05 -07:00
David Lord
a9028832f5 Merge pull request #3204 from pallets/azure
azure pipelines ci on 1.0.x branch
2019-05-16 17:32:45 -07:00
David Lord
6a8c1eeb6c azure pipelines ci on 1.0.x branch 2019-05-16 14:32:21 -07:00
David Lord
d4470466cc azure config, fix docs build 2019-05-16 12:45:03 -07:00
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