Commit Graph

1100 Commits

Author SHA1 Message Date
mdipierro e40c4835e7 Merge pull request #1464 from niphlod/fix/1309
fixes #1309 (and sessions2trash.py, too)
2016-09-23 13:51:22 -05:00
mdipierro 763e639915 Merge pull request #1463 from niphlod/fix/1407
fixes #1407, encouraging a sane default
2016-09-23 13:50:30 -05:00
niphlod dd8b0760b5 fixes #1309 (and sessions2trash.py, too) 2016-09-22 01:34:34 +02:00
niphlod e5355b5b12 fixes #1407, encouraging a sane default 2016-09-22 00:34:24 +02:00
niphlod 8ddccd4139 removed leftover (be careful (BOTH contributors and mergers)) 2016-09-21 23:13:45 +02:00
Vinyl Darkscratch 808c85fdc3 Update welcome/es.py, Spanish complete! 2016-09-10 22:12:48 -07:00
Vinyl Darkscratch 9263f8c4c3 Fixed test errors
Cleaned the damage caused by a faulty script run that created a test
error as described in
https://travis-ci.org/web2py/web2py/builds/158680015
2016-09-10 22:06:14 -07:00
Vinyl Darkscratch aee0f8dbc5 Stripped unused strings from translations 2016-09-09 01:59:14 -07:00
Vinyl Darkscratch f9dce481f7 Added encoding to plural files
Added “# -*- coding: utf-8 -*-“ lines to all plural files
2016-09-09 01:09:39 -07:00
Vinyl Darkscratch 05537b9916 Language update 2016-09-09 00:43:39 -07:00
Vinyl Darkscratch 38f1e318cf Update translations 2016-09-09 00:17:40 -07:00
mdipierro e87378b07f allow a cllback in streamer 2016-08-16 19:12:47 -05:00
mdipierro fb0bca3709 Merge pull request #1425 from zvolsky/_plugin_failure
F redirect in admin/default/design (install of plugin)
2016-08-16 18:50:09 -05:00
mdipierro a2354addec Merge pull request #1423 from gi0baro/master
Updated pyDAL to 16.08
2016-08-16 18:49:10 -05:00
mdipierro 7a20866d4f Merge pull request #1416 from vdubya/master
minor grammatical fix
2016-08-16 18:48:46 -05:00
zvolsky 9e5bf2bf03 F error message in admin/default/design (install of plugin) 2016-08-16 13:38:13 +02:00
zvolsky 16b11c7ef2 F redirect in admin/default/design (install of plugin) 2016-08-16 13:28:29 +02:00
Giovanni Barillari 0528a347b3 Updated pyDAL to 16.08 2016-08-13 15:38:55 +02:00
mdipierro 116a7ff006 removed unwanted hosts.deny 2016-08-01 05:09:39 -05:00
mdipierro a45bffc908 fixed admin imports 2016-08-01 05:02:52 -05:00
mdipierro 6543512983 fixed another import error in appadmin 2016-08-01 04:34:33 -05:00
mdipierro a6b96ba85b minor change to fabfile 2016-07-29 07:12:29 -05:00
Van Woods fe45dff9e4 minor grammatical fix 2016-07-26 18:16:10 -07:00
mdipierro 7aa617a68f fixed regex (test) 2016-07-17 15:12:04 -05:00
mdipierro 665e14186e fixed issue with sessions in db on GAE 2016-07-17 04:18:56 -05:00
mdipierro 584327553c fixed Link to Chrome extension that auto-opens error tickets #613 2016-07-11 03:30:48 -05:00
Richard Vézina bd47b7f80a .att() -> .prop() for setting autocomplete off 2016-07-10 12:30:22 -04:00
mdipierro 67b27f4daf removed webshell 2016-07-01 01:59:12 -05:00
mdipierro 46d02a3448 Merge pull request #1374 from niphlod/fix/1364
fixes #1364
2016-07-01 01:55:41 -05:00
niphlod 595e37c2de removed web shell 2016-06-28 23:34:41 +02:00
niphlod 955b30a871 fixes #1364 2016-06-28 21:36:59 +02:00
ilvalle ea337e07d0 p3 fixes in applications 2016-06-28 19:58:20 +02:00
mdipierro 5f80300c5d Merge pull request #1371 from ilvalle/py3_fixes_5
PY3 fixes
2016-06-26 00:32:09 -05:00
mdipierro 0b4b71ea09 Merge branch 'master' of github.com:web2py/web2py 2016-06-26 00:30:42 -05:00
mdipierro f8f471f51f new cheatsheet 2016-06-26 00:30:25 -05:00
ilvalle f343fab528 py3 fixes for admin app 2016-06-25 17:36:37 +02:00
ilvalle 8aecaf4514 PY3 fixes and added tests for gluon/admin.py 2016-06-24 22:54:56 +02:00
mdipierro 48350664f0 Merge pull request #1369 from zvolsky/_transl_markmin
cs translation: removed unwanted '@markmin' literal from translated s…
2016-06-22 16:39:08 -05:00
ilvalle 61795bc65e enabled test_web.py in PY3 2016-06-22 19:07:58 +02:00
zvolsky 3bb0299b29 cs translation: removed unwanted '@markmin' literal from translated strings 2016-06-22 12:19:42 +02:00
ilvalle 3270d39596 py3 fixed http.to 2016-06-21 22:24:33 +02:00
ilvalle d9c7953147 updated user_agent_parser to 1.7.8, fix webclient 2016-06-19 11:49:16 +02:00
mdipierro f4a353960b merged conflicts 2016-06-12 19:59:58 -05:00
ilvalle a1fd92b7f8 updated imports in tests 2016-06-02 14:28:21 +02:00
ilvalle 01bab81432 manually adapt few imports 2016-06-01 20:16:30 +02:00
ilvalle 48e10a3793 running libfuturize.fixes.fix_print_with_import 2016-05-30 21:23:40 +02:00
Leonel Câmara a9ee9a6b58 remove simplejson 2016-05-11 00:47:23 +01:00
mdipierro 85c37af1f4 removed unwanted file 2016-05-09 19:11:08 -05:00
mdipierro 0692272991 going back to dal 16.03 to prepare for 2.14.6 2016-05-09 00:24:14 -05:00
Leonel Câmara 944d8bd8f3 Check if host is denied before verifying password 2016-05-04 19:02:53 +01:00