Commit graph

1752 commits

Author SHA1 Message Date
Mark Hildreth
6a37c1716d Fixed incorrect grammar in Config.rst
Fixed incorrect grammar in "SESSION_REFRESH_EACH_REQUEST" configuration description.
2013-12-24 14:36:28 -05:00
Afik
67c165bcbb Update celery.rst
With the latest version of Celery (3.1.6), following this tutorial produces the following error when attempting to start the celery worker: 

    user_preload = tuple(self.app.user_options['preload'] or ())
AttributeError: 'Flask' object has no attribute 'user_options'

Using `app` as the variable name here confuses celery. Renaming `app` to `flask_app` in the tutorial solves the issue and allows the celery worker to start successfully.
2013-12-16 22:04:51 -08:00
Armin Ronacher
afd3c4532b Rewrapped lines 2013-11-09 13:41:09 +00:00
Reetta Vaahtoranta
0d648fa468 Changed the wording of some sentences there were difficult to understand. 2013-11-09 13:13:14 +00:00
Daniel Neuhäuser
d4f8634289 Merge pull request #899 from pengfei-xue/master
fix typo(there-> their)
2013-11-01 02:18:14 -07:00
Pengfei Xue
ecb31c6804 fix typo 2013-10-30 16:45:44 +08:00
d3spis3d
05dbf52fa5 URL Reversing in Quickstart #779
Updated quickstart to make clear that URL reversing refers to the use of
url_for() to build the URL. Issue #779
2013-10-30 11:29:18 +11:00
Daniel Neuhäuser
d14f57d9b8 Merge pull request #895 from daybarr/patch-1
Fix typo in docs for error_handler_spec
2013-10-29 02:35:48 -07:00
Day Barr
c021e58775 Fix typo in docs for error_handler_spec 2013-10-25 16:51:29 +01:00
Daniel Neuhäuser
5689ef3639 Fix typo s/at at/at a/ 2013-10-22 14:01:33 +02:00
Daniel Neuhäuser
b63a9926dd Merge branch '0.10-maintenance' 2013-10-16 20:13:19 +02:00
Daniel Neuhäuser
a3a2f521f1 Clear exceptions when pushing a context
Fixes #882
2013-10-16 20:12:20 +02:00
Daniel Neuhäuser
544118bef9 Merge pull request #891 from ThiefMaster/docs-flaskext
Don't refer to flaskext in app.extensions docs
2013-10-16 10:09:41 -07:00
Daniel Neuhäuser
4212e67d29 Merge pull request #890 from seancron/documentation-fix
Documentation fix: Makes the error names consistent
2013-10-16 10:08:49 -07:00
Daniel Neuhäuser
cab514e9f1 Merge pull request #886 from talam/patch-1
Updated some typos
2013-10-16 10:06:01 -07:00
Adrian
46b5754d97 Don't refer to flaskext in docs 2013-10-15 21:47:42 +02:00
Sean Cronin
a7f5d60789 Makes the error names consistent 2013-10-15 12:37:25 -04:00
talam
b7f21831fa Updated some typos
Fixed some incorrect variable references.
2013-10-12 18:14:26 -04:00
rsyring
fc85bf42ae Update appfactories.rst, make extension related section clearer 2013-10-11 08:39:46 -04:00
Alexey Shamrin
f161a71c19 quickstart: import request in HTTP methods example 2013-10-03 05:15:27 +04:00
Hyunjun Kim
5ecca4c0da Fix a typo on blueprints module name. 2013-10-02 15:10:27 +09:00
defuz
475b0c1cd9 fix typo (jsonfiy) 2013-09-26 18:46:30 +03:00
dmackinnon
231f45b432 Fix typo 2013-09-25 11:50:02 -04:00
Daniel Neuhäuser
5d20501604 Merge pull request #863 from jet-sun/patch-1
Fix typo.
2013-09-08 11:27:27 -07:00
Jet Sun
6ebe45b0ad Fix typo. 2013-09-07 17:42:06 -07:00
Daniel Neuhäuser
ff59db16bc Merge pull request #858 from svieira/patch-2
Patch for tutorial (minor code error)
2013-09-04 07:54:42 -07:00
Sean Vieira
12d6ec4130 Fix with block 2013-09-03 23:36:10 -04:00
Daniel Neuhäuser
36d70d8789 Merge pull request #843 from wbowlin/master
corrected documentation for Request get_json()
2013-09-03 10:58:04 -07:00
Daniel Neuhäuser
5207c69064 Fix #856 ommited typo in quickstart 2013-09-03 19:47:00 +02:00
Armin Ronacher
8f1dada542 Some cleanups 2013-09-02 04:57:01 +06:00
Armin Ronacher
51d7c8de7d Merge branch 'master' of github.com:mitsuhiko/flask 2013-09-01 01:43:24 +06:00
Armin Ronacher
05161d3584 Rewrote tutorial to use the g based appcontext object 2013-09-01 01:32:41 +06:00
Armin Ronacher
42cf782ee3 Removed g object from example as it was unused 2013-08-30 19:50:45 +06:00
Daniel Neuhäuser
29f3a1ac23 Merge pull request #844 from adamobeng/patch-1
Fix typo
2013-08-25 04:25:50 -07:00
Adam Obeng
9cff681f97 Fix typo 2013-08-24 21:21:18 -04:00
Will Bowlin
3e90de2e10 corrected documentation for Request get_json() 2013-08-23 00:22:57 -05:00
Daniel Neuhäuser
be73233a55 Merge pull request #840 from mhils/master
Fix typo in docstring
2013-08-20 14:35:01 -07:00
Maximilian Hils
17e5fb365d Fix typo in docstring 2013-08-19 10:56:08 +02:00
Daniel Neuhäuser
2d8a21c732 Merge branch '0.10-maintenance' 2013-08-13 15:58:46 +02:00
Daniel Neuhäuser
94f4360137 Explain is_package AttributeError in find_package
When a PEP 302 import hook is used that doesn't implement .is_package()
an AttributeError is raised. This looks like a bug in Flask. This change
fixes that problem in the sense that it explains, that the
AttributeError is intentional.
2013-08-13 15:53:58 +02:00
Daniel Neuhäuser
f3c5bff990 Merge pull request #831 from homeworkprod/json-docs-typo-fix
Fixed tiny but distracting typo.
2013-08-11 12:40:57 -07:00
Jochen Kupperschmidt
8246ce6a15 Fixed tiny but distracting typo. 2013-08-11 15:59:46 +02:00
Matt Wright
b290bf4079 Add ability to config from a JSON file 2013-08-07 18:03:37 -04:00
Armin Ronacher
1b08d527c7 Merge branch 'master' of github.com:mitsuhiko/flask 2013-08-05 09:08:29 +01:00
Kevin Burke
9e5ab21c8e app.py: Link to correct EnvironBuilder docs 2013-08-04 22:33:17 -07:00
Armin Ronacher
a2bc61b5ab Merge pull request #819 from chason/master
Changed sort_json test to test str sorting
2013-08-04 13:59:22 -07:00
Chason Chaffin
5e8dd8b287 Changed sort_json test to test str sorting
Tests when simplejson was installed were failing because of a change in
how it sorted in v3.0.0. This change first tests it via normal int
sorting for stdlib json then if that fails, it tests against str sorting
for simplejson.
2013-08-04 01:42:23 -07:00
Armin Ronacher
08931401e8 Merge pull request #817 from llimllib/master
Fix doc bug in patterns/sqlite3, clarify use of make_dicts
2013-08-01 01:15:17 -07:00
Bill Mill
159ae3dc26 Fix doc bug, clarify use of make_dicts 2013-07-31 22:06:15 -04:00
Armin Ronacher
2e17ad7fd4 Merge pull request #816 from untitaker/allowed_methods
Fix #815
2013-07-31 07:44:44 -07:00