Daniel Neuhäuser
97815b999e
Merge pull request #737 from untitaker/sprint-branch
...
Fix some literals
12 years ago
Markus Unterwaditzer
05f66ad735
Fix some literals
12 years ago
Daniel Neuhäuser
3f51a09db4
itsdangerous uses json instead of simplejson now
12 years ago
Daniel Neuhäuser
884aad8ece
Test using itsdangerous with 3.x support
12 years ago
Daniel Neuhäuser
ee013e01b0
Merge pull request #736 from ThomasWaldmann/sprint-branch
...
some more work on py 3.3 port
12 years ago
Daniel Neuhäuser
da5edad23a
Use werkzeug@sprint-branch in tox
12 years ago
Thomas Waldmann
e1d356fb71
ported some more stuff to py 3.3
...
removed init_jinja_globals hack from app.py after consulting mitsuhiko
(didn't work on py 3.3 "as is")
removed with_statement future imports, not needed any more
needs more work on 2.7 as well as on 3.3
12 years ago
Thomas Waldmann
a503520ac5
copy _compat.py from flask in here (and adapt docstring)
12 years ago
Armin Ronacher
aecc41deb8
Restore 2.5 support for the time being
12 years ago
Armin Ronacher
81c9b3570b
Removed 2.5 from travis
12 years ago
Daniel Neuhäuser
ceb7c7f771
Don't notify IRC for this branch
12 years ago
Daniel Neuhäuser
506db0eab2
Use print_function
12 years ago
Daniel Neuhäuser
c618db92d6
reload_module is in six.moves
12 years ago
Daniel Neuhäuser
8494574fdf
Merge branch 'six' of github.com:ThomasWaldmann/flask into ThomasWaldmann-six
...
Conflicts:
flask/testsuite/__init__.py
12 years ago
Thomas Waldmann
287905e67c
py3 compat: use six.reload_module
12 years ago
Daniel Neuhäuser
aba1d3a507
Test on 3.3 on travis
12 years ago
Daniel Neuhäuser
323a840c5a
Add tox.ini
12 years ago
Thomas Waldmann
522cd00093
python-modernize automated changes: fix_unicode (but without six.u())
12 years ago
Thomas Waldmann
dcd052366b
python-modernize automated changes: fix_next
12 years ago
Thomas Waldmann
0f8c47c988
python-modernize automated changes: fix_dict
12 years ago
Thomas Waldmann
cfbfff2d26
python-modernize automated changes: misc. minor stuff
12 years ago
Thomas Waldmann
1b753cb1b1
require 'six' in setup.py, add flask._compat for stuff not yet in 'six'
12 years ago
Daniel Neuhäuser
05923f7f2f
Merge branch 'exec' of github.com:ThomasWaldmann/flask into sprint-branch
...
Conflicts:
flask/config.py
12 years ago
Daniel Neuhäuser
26a9e90734
Merge pull request #734 from ThomasWaldmann/methodattrs
...
automated change using python-modernize: fix methodattrs
12 years ago
Daniel Neuhäuser
bbdfc83902
Merge pull request #732 from ThomasWaldmann/exceptions_as
...
automated change using python-modernize: use 'as' in except
12 years ago
Daniel Neuhäuser
c87735ff1b
Merge pull request #731 from ThomasWaldmann/docs
...
document python 2.6 minimum requirement, remove stuff that refers to 2.5
12 years ago
Thomas Waldmann
40fad2ece8
document python 2.6 minimum requirement, remove all stuff that refers to 2.5
12 years ago
Thomas Waldmann
b8b769ad41
automated change using python-modernize: fix methodattrs
12 years ago
Thomas Waldmann
b52b7b1f93
automated change using python-modernize: replace execfile
12 years ago
Thomas Waldmann
6caaa8a527
automated change using python-modernize: use 'as' in except
12 years ago
Armin Ronacher
521398d5e7
Added missing newlines to readme
12 years ago
Armin Ronacher
b89af66346
Revert "update README to markdown"
...
This reverts commit fb6dee3639
.
12 years ago
Armin Ronacher
1c2dddb355
Merge branch 'master' of github.com:mitsuhiko/flask
12 years ago
Armin Ronacher
574a97cd70
Disabled memory tests by default
12 years ago
Armin Ronacher
7265bb7fa0
Merge pull request #676 from lambdadi/master
...
Database improperly closed in the test case within this tutorial
12 years ago
Armin Ronacher
335e0af731
Merge pull request #708 from xealot/master
...
Blueprint.after_request causes Flask to ignore @after_this_request
12 years ago
Armin Ronacher
c349c91aff
Added support for UUID objects to JSON serializer as well
12 years ago
Armin Ronacher
18673ba370
Added uuid support for new session serialization and documented it
12 years ago
Armin Ronacher
38eed272f9
Merge branch 'master' of github.com:mitsuhiko/flask
12 years ago
Armin Ronacher
2ba37d2b85
Fixed some rst markup problems
12 years ago
Armin Ronacher
ef62e8440e
Merge pull request #702 from edburnett/master
...
AJAX with jQuery documentation update
12 years ago
Armin Ronacher
6a8acc115e
Merge pull request #709 from halexus/patch-1
...
Update README of example Flaskr
12 years ago
Armin Ronacher
833198c91b
Added a missing comma
12 years ago
Armin Ronacher
30d9efb24a
Merge branch 'master' of github.com:mitsuhiko/flask
12 years ago
Armin Ronacher
097353695e
Added flask.copy_current_request_context which simplies working with greenlets
12 years ago
Kenneth Reitz
1441e02256
Merge pull request #714 from jsnmoon/master
...
Fixed documentation typo
12 years ago
Kenneth Reitz
34433cfd98
Merge pull request #719 from cenkalti/master
...
Syntax highlighting for PyPI long description
12 years ago
Kenneth Reitz
9abe26c14c
Merge pull request #723 from akshar-raaj/fix_docs_design
...
Fixed documentation in 'Design Decisions in Flask'
12 years ago
Akshar Raaj
a9b22af9bc
Fixed documentation in 'Design Decisions in Flask'
12 years ago
Cenk Altı
1358fd9f3e
Syntax highlighting for PyPI long description
12 years ago