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

3583 Commits

Author SHA1 Message Date
David Lord 5a49b96d0e
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 8590d65a57
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 d0bfb065e5
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 957f48a98d
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 af3c24c7df
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 aade460f15
Merge pull request #3179 from Lee-W/MethodView-inheritance 
Fix MethodView inheritance Error (#3138)
 2019-05-17 14:18:40 -07:00
LeeW 1f3923a999
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 8ef56c8c6d
Merge pull request #3174 from icreatedanaccount/master 
Allow mode='rt' on open_resource() helper
 2019-05-17 13:32:40 -07:00
David Lord 6dbcbdee35
add sphinx-issues 2019-05-17 13:26:54 -07:00
David Lord 6f703a564c
clean up open_resource and tests 2019-05-17 13:23:27 -07:00
icreatedanaccount ad709be46e
Allow mode='rt' on open_resource() helper 2019-05-17 13:22:13 -07:00
David Lord 05a4e15ee4
Merge branch '1.0.x' 2019-05-17 11:13:08 -07:00
David Lord 99660cc409
release version 1.0.3 2019-05-17 10:57:51 -07:00
David Lord 3dc84ec460
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 a4f0f19796
don't push app context for test client json 2019-05-17 09:00:08 -07:00
David Lord f2c854060a
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 e2f4b53396
Fix dev-server warning message readability (#3168) 2019-05-16 19:03:08 -07:00
David Lord ab3f922533
Merge pull request #3154 from brunoais/more-explicit-session-transaction 
More explicit explanation: session testing
 2019-05-16 18:17:45 -07:00
brunoais 6142aa64ae
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 55801b5653
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 ac78da0bb0
removed unused reference to url_join 2019-05-16 17:47:14 -07:00
David Lord 953284a8d0
Merge branch '1.0.x' 2019-05-16 17:37:05 -07:00
David Lord 814a7ea96f
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 84f8e1634f
azure pipelines ci on 1.0.x branch 2019-05-16 14:32:21 -07:00
David Lord bcf8cb1fd4
azure config, fix docs build 2019-05-16 12:45:03 -07:00
David Lord 2236ba980c
Merge branch '1.0.x' 2019-05-16 12:18:36 -07:00
David Lord d68abe99f6
Merge pull request #3203 from vtbassmatt/patch-1 
add Azure Pipelines to test coverage
 2019-05-16 12:12:06 -07:00
Matt Cooper af813d0d36
add Azure Pipelines to readme 2019-05-16 12:07:43 -07:00
David Lord ded0f68c16
Merge pull request #3199 from alecbrooks/master 
Fix various small spelling errors.
 2019-05-16 11:54:34 -07:00
A Brooks 4e272fc042
Fix various small spelling errors. 2019-05-16 11:50:10 -07:00
David Lord 7f782ba84e
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 0df2620c5f
update docs on gunicorn deploy and app discovery 2019-05-16 10:45:03 -07:00
David Lord 00ca5b7328
Merge pull request #3159 from abhinavsagar/updatedoc 
Improved CONTRIBUTING.rst
 2019-05-16 10:23:17 -07:00
David Lord e61fd5f6cb
add instructions for bug and feature branches 2019-05-16 10:22:21 -07:00
Abhinav c2b4b745e9
add more git commands to contributing doc 2019-05-16 10:22:01 -07:00
David Lord 8609b7d840
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 994cd1db33
replaced deprecated sample code in proxy-setup docs 2019-05-16 09:54:49 -07:00
David Lord bbedd64540
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 e5b0fe6841
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 eadb99eb93
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 5e41e409bc
fix discord link, clean up 2019-05-16 09:47:56 -07:00
Abdur-Rahmaan Janhangeer 62fe1563ad
Update CONTRIBUTING.rst 2019-05-16 09:43:51 -07:00
David Lord 4091013ee1
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 800c744fe7
improve env vars config example 2019-05-16 08:48:34 -07:00
David Lord b765e0db50
Merge pull request #3196 from jakseb/fix-docs-paren 
Fix misplaced paren in docs
 2019-05-16 08:28:58 -07:00
David Lord 4260b7c2d3
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 c88e4634a5
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 d23b160e6d
helpers.py: Fix docs of url_for(..., _external=True) 2019-05-16 06:54:20 -07:00
Sebastian Jakubiak 205c943ded Fix misplaced paren in docs 2019-05-13 22:22:40 +02:00
David Lord 49a0464e3c
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