maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity
1770 commits 4 branches 69 tags 36 MiB
Commit graph

1770 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kenneth Reitz
9427e16567 Merge pull request #707 from xsleonard/patch-1 
Mention register_error_handler in errorhandler doc
 2014-03-21 17:03:02 -04:00
Kenneth Reitz
9c434ebc67 Merge pull request #885 from jmhobbs/master 
Update url_for documentation for Flask.url_build_error_handlers
 2014-03-21 17:01:55 -04:00
Kenneth Reitz
21f3ad2671 Merge pull request #830 from hntw/patch-1 
Update blueprints.rst - Add Error Handlers
 2014-03-21 16:54:35 -04:00
Kenneth Reitz
bddcc1e763 Merge pull request #838 from enkore/master 
get_cookie_path: fix docstring
 2014-03-21 16:46:43 -04:00
Kenneth Reitz
7e4d51c91c Merge pull request #869 from christophersu/doc-fix-1 
Add missing import on SQLAlchemy documentation page
 2014-03-21 16:46:05 -04:00
Kenneth Reitz
7f5b6c692d Merge pull request #876 from defuz/templates-auto-reload 
Add TEMPLATES_AUTO_RELOAD config key
 2014-03-21 16:43:20 -04:00
Kenneth Reitz
4c0253f9fd Merge pull request #862 from bikerm16/master 
Minor test fixes
 2014-03-21 16:39:13 -04:00
Kenneth Reitz
58681ec11e Merge pull request #889 from mattskone/master 
Escaped 'text' keyword in column name.
 2014-03-21 16:38:00 -04:00
Kenneth Reitz
02eb9c99fd Merge pull request #977 from Ivoz/patch-1 
Update windows installation and other notes
 2014-03-21 16:36:12 -04:00
Kenneth Reitz
872094c556 Merge pull request #1000 from mikar/master 
harmless comment fixes/typos
 2014-03-21 16:21:18 -04:00
Kenneth Reitz
a7b5cec629 Merge pull request #1004 from kylestev/patch-1 
Small punctuation change in unicode doc
 2014-03-21 16:21:01 -04:00
Armin Ronacher
36e86be06d Merge branch 'master' of github.com:mitsuhiko/flask 2014-03-19 23:07:58 +00:00
Armin Ronacher
95fa9f21ec Added a missing import 2014-03-19 23:07:42 +00:00
Kyle Stevenson
8cd66bf178 Small punctuation change in unicode doc 
Just makes it easier on the eyes/brain.
 2014-03-19 10:23:17 -07:00
max demian
db12a8f5e4 Update wrappers.py 2014-03-15 14:45:37 +01:00
max demian
6974d52815 Update views.py 2014-03-15 14:44:27 +01:00
max demian
2eef63a320 Update signals.py 2014-03-15 14:42:21 +01:00
max demian
f3f7b640b9 Update sessions.py 
missing backticks in docstring
 2014-03-15 14:38:19 +01:00
max demian
cb25c42316 Update json.py 2014-03-15 14:35:21 +01:00
Daniel Neuhäuser
69db1e9b1f Merge pull request #872 from dmackinnon/patch-1 
Fix typo
 2014-03-13 20:38:41 +01:00
Daniel Neuhäuser
718c3a3ce7 Merge pull request #874 from defuz/patch-1 
fix typo (jsonfiy -> jsonify)
 2014-03-13 20:38:19 +01:00
Daniel Neuhäuser
a71b65cb15 Merge pull request #877 from yoloseem/patch-1 
Fix a typo on blueprints module name.
 2014-03-13 20:35:29 +01:00
Daniel Neuhäuser
caa0c00420 Merge pull request #878 from shamrin/patch-1 
quickstart: import `request` in HTTP methods example
 2014-03-13 20:33:46 +01:00
Daniel Neuhäuser
06857c9ba5 Add Config.get_namespace to CHANGES 2014-03-13 20:23:43 +01:00
Daniel Neuhäuser
ba80e1e33b Fix Python 3 compat issue in Config.get_namespace 2014-03-13 20:22:18 +01:00
Daniel Neuhäuser
0674ee875d Merge branch 'config-namespaces' of https://github.com/mattupstate/flask into config-namespaces 
Conflicts:
	flask/config.py
 2014-03-13 20:20:22 +01:00
Daniel Neuhäuser
2c2c240d6d Merge pull request #994 from roskoff/master 
Added 'import os' statement
 2014-03-13 19:25:34 +01:00
Daniel Neuhäuser
ff3ef8511e Merge pull request #997 from charlax/ca/fix/response_class_documentation 
Clarify the after_request argument
 2014-03-13 19:24:53 +01:00
Charles-Axel Dein
dfae2679a6 Clarify the after_request argument 
Make it a bit clearer that it's an instance of response_class that is
expected, not the actual response_class class.
 2014-03-05 15:22:59 -08:00
Eliseo Ocampos
ffff509cf0 Added 'import os' statement 
Added 'import os' statement so you can use os.path.join() when defining DATABASE location
 2014-03-04 14:57:12 -08:00
Kenneth Reitz
7a353a7d1b Merge pull request #980 from grampajoe/patch-1 
Update docs copyright date
 2014-03-03 13:17:29 -05:00
Daniel Neuhäuser
d43bfb261a Add assertIsInstance to FlaskTestCase on 2.6 
This fixes an error in ConfigTestCase.test_custom_config_class
 2014-02-20 19:17:59 +01:00
Daniel Neuhäuser
3f8e29b12c Add Flask.config_class to changelog 2014-02-20 19:15:42 +01:00
Daniel Neuhäuser
66e51d5be7 Merge branch 'master' of https://github.com/Xion/flask into Xion-master 
Conflicts:
	flask/testsuite/config.py
 2014-02-20 19:12:56 +01:00
Joe Friedl
19baae3d34 Update docs copyright date 
Happy belated New Year!
 2014-02-13 10:28:21 -05:00
Daniel Neuhäuser
97411295e3 Add Config.from_json to changelog 2014-02-12 23:53:51 +01:00
Daniel Neuhäuser
95a1ce4d6e Merge branch 'config-from-json' of https://github.com/mattupstate/flask into mattupstate-config-from-json 2014-02-12 23:42:39 +01:00
Matt Iversen
a8e88bebd1 Update windows installation and other notes 
Making allowance for new convenience of `get-pip.py` that automatically installs setuptools and pip together.

Stop recommending distribute, which has now been merged into setuptools.
 2014-02-11 07:24:31 +11:00
Armin Ronacher
98754b0e4f Merge branch '0.10-maintenance' 2014-02-09 16:08:03 +00:00
Armin Ronacher
ddb5f9dc49 Fixed a broken test 2014-02-09 16:07:56 +00:00
Armin Ronacher
82f99f42a8 Disarmed a sentence a bit 2014-02-09 13:35:38 +00:00
Armin Ronacher
135d090c0f Merge branch 'master' of github.com:mitsuhiko/flask 2014-02-09 13:29:56 +00:00
Armin Ronacher
5b0545bf80 Merge branch '0.10-maintenance' 2014-02-09 13:29:03 +00:00
Armin Ronacher
fb622380d0 Use older descriptor to support older werkzeug versions 2014-02-09 13:28:57 +00:00
Armin Ronacher
47a41b645f Merge pull request #884 from rsyring/patch-2 
Update appfactories.rst, make extension related section clearer
 2014-02-09 13:27:35 +00:00
Armin Ronacher
a9503580d2 Merge branch '0.10-maintenance' 2014-02-09 13:27:05 +00:00
Armin Ronacher
141a5533c9 Documented fix for #879 2014-02-09 13:26:32 +00:00
Armin Ronacher
75f2af7a6a Use a condition variable instead of sleeping 2014-02-09 13:25:36 +00:00
Alexis Svinartchouk
280d865960 fix issue #879 and add a test for it 
Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
 2014-02-09 13:22:05 +00:00
Armin Ronacher
c938771258 Merge branch 'master' of github.com:mitsuhiko/flask 2014-02-09 13:21:08 +00:00