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

1660 commits

This branch
This branch
All branches
Author SHA1 Message Date
Armin Ronacher
f5a02b9495 Added a warning about key sorting 2014-02-08 16:27:26 +00:00
Armin Ronacher
ccc2de1997 Merge pull request #962 from nZac/JSON-Support-doc-update 
added a note to the api documentation about JSON_SORT_KEYS. Fixes #922
 2014-02-08 16:26:27 +00:00
Armin Ronacher
11003d0c29 Merge pull request #972 from alexpearce/patch-1 
Explicitly pass the Celery instance name.
 2014-02-08 16:24:50 +00:00
Armin Ronacher
f791ede346 Merge pull request #975 from martinp/update-license 
Update copyright year in license
 2014-02-08 16:24:27 +00:00
Martin Polden
3dab2f3d41 Update copyright year 2014-02-07 10:26:26 +01:00
Alex Pearce
3d6de4dd79 Explicitly pass the Celery instance name. 
When starting a Celery worker module, it is assumed that the Celery instance within the module is called `app`. This is not the case in the Celery pattern, where it is called `celery`, and so must be explicitly referenced.
 2014-02-05 20:11:06 +00:00
Kenneth Reitz
17a3056be4 Merge pull request #961 from GCorbel/patch-1 
Remove the extra "1"
 2014-01-27 09:39:04 -08:00
Armin Ronacher
e78961c812 Fixed a missing import 2014-01-26 18:08:02 +00:00
Armin Ronacher
52e1c383fa Make Python 3 happy 2014-01-26 17:47:16 +00:00
Armin Ronacher
6ec83e18dc Added a workaround for a pypy bug in context managers 2014-01-26 17:34:37 +00:00
Nicholas Zaccardi
ea656a8909 added a note to the api documentation about JSON_SORT_KEYS. Fixes #922 2014-01-24 19:21:24 -06:00
Guriec Corbel
21aa620b6b Remove the extra "1" 2014-01-24 12:43:23 -05:00
Kenneth Reitz
de7e2bcf7a Merge pull request #947 from Ivoz/master 
Release as universal python wheel (2/3 compat)
 2014-01-23 11:07:41 -08:00
Matt Iversen
b0bb6c7f3d Release as universal python wheel (2/3 compat) 2014-01-11 11:31:22 +11:00
Daniel Neuhäuser
b2971ec68c Merge pull request #943 from skeuomorf/favicon 
Added a favicon for the docs
 2014-01-06 08:28:03 -08:00
skeuomorf
cf0953619e Added a favicon for the docs 2014-01-06 17:58:54 +02:00
Daniel Neuhäuser
d517f35d60 Merge branch '0.10-maintenance' 2014-01-02 19:21:55 +01:00
Daniel Neuhäuser
52098e1e4f Happy New Year 2014 2014-01-02 19:21:07 +01: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
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
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