diff --git a/applications/examples/private/content/en/default/documentation/more.markmin b/applications/examples/private/content/en/default/documentation/more.markmin index 881a7431..89388237 100644 --- a/applications/examples/private/content/en/default/documentation/more.markmin +++ b/applications/examples/private/content/en/default/documentation/more.markmin @@ -10,6 +10,7 @@ - [[Intro video http://www.youtube.com/watch?v=BXzqmHx6edY]] and [[code examples https://github.com/mjhea0/web2py]] - [[Step by step tutorial https://milesm.pythonanywhere.com/wiki]] - [[web2py Reference Project http://www.web2pyref.com/]] +- [[An advanced tutorial https://milesm.pythonanywhere.com/wiki]] - [[Killer Web Development Tutorial http://killer-web-development.com/]] - [[Real Python for the Web http://www.realpython.com]] (web development with web2py and more!) - [[Admin Demo http://www.web2py.com/demo_admin popup]] (web-based IDE) @@ -19,9 +20,9 @@ #### Code - [[web2pyslices (recipes) http://www.web2pyslices.com popup]] -- [[Layouts http://www.web2py.com/layouts popup]] +- [[Dashboard welcome app https://github.com/mjbeller/web2py-starter]] +- [[stupid.css theme https://github.com/mdipierro/web2py-welcome-theme-stupid]] - [[Plugins http://www.web2py.com/plugins popup]] -- [[More Plugins http://dev.s-cubism.com/web2py_plugins]] - [[Appliances http://www.web2py.com/appliances popup]] - [[web2py utils http://packages.python.org/web2py_utils/ popup]] - [[Sublime text 3 plugin https://bitbucket.org/kfog/w2p popup]] diff --git a/applications/welcome/models/db.py b/applications/welcome/models/db.py index 6e12479b..32dc27d5 100644 --- a/applications/welcome/models/db.py +++ b/applications/welcome/models/db.py @@ -5,7 +5,7 @@ ## File is released under public domain and you can use without limitations ######################################################################### -if request.global_settings.web2py_version < "2.13.3": +if request.global_settings.web2py_version < "2.14.1": raise HTTP(500, "Requires web2py 2.13.3 or newer") ## if SSL/HTTPS is properly configured and you want all HTTP requests to diff --git a/gluon/packages/dal b/gluon/packages/dal index 4ba3e4eb..60e97e7c 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit 4ba3e4eb6dfe5a275ded08feb5dccdf62bc1b81e +Subproject commit 60e97e7cfd1da98f3cf38b2023965226d42e5e5b