Commit Graph
100 Commits
Author SHA1 Message Date
mdipierro d04a3e62ae no more epydoc 2014-08-26 14:39:20 -05:00
mdipierro a3f3496709 fixed security issue again, thanks Niphlod 2014-08-26 14:38:09 -05:00
mdipierro 59630f0a14 Merge pull request #482 from niphlod/docs/sched_and_tools
doc fixes
2014-08-26 14:36:44 -05:00
mdipierro 18ab865e59 2.9.6-beta 2014-08-26 14:30:46 -05:00
mdipierro 3738f7dc7a reverted to bs2 for an early release 2014-08-26 14:29:15 -05:00
mdipierro 6f42bac66d removed epydoc and fixed a typo in pevious commit 2014-08-26 14:24:20 -05:00
mdipierro 2d3ccfaba7 removed epydoc and fixed a typo in pevious commit 2014-08-26 14:24:07 -05:00
mdipierro 80d9722964 more security, thanks Niphlod 2014-08-26 14:21:28 -05:00
mdipierro bac9039c6e increased security in admin and appadmin 2014-08-25 16:36:10 -05:00
mdipierro 353d83aa4e max_linked_inline broked, removed 2014-08-21 18:22:47 -05:00
mdipierro fa05c01c7d fixed a problem with extra fields and better validation errors 2014-08-21 17:22:03 -05:00
mdipierro b18dda1f53 fixed the toolbar, thanks Niphlod 2014-08-20 21:45:58 -05:00
mdipierro 5d63dfea2b better bootstrap3 forms, thanks Ricardo Pedroso 2014-08-20 21:26:10 -05:00
mdipierro 031b1ceec7 Merge pull request #480 from rpedroso/bs3
bootstrap3 formstyle improvements
2014-08-20 21:16:56 -05:00
mdipierro 9ad30aa64d experimental saml2 support 2014-08-20 21:05:03 -05:00
mdipierro c7beeaf5c5 added utils.obj2dict 2014-08-19 18:57:25 -05:00
mdipierro a0d7470cf3 setup-web2py-ubuntu works on 14.04, thanks Ivan Di Giusto 2014-08-16 23:21:19 -05:00
mdipierro f84afaadbb removed files committed by mistake, thanks Niphlod 2014-08-16 12:20:00 -05:00
mdipierro 4811d6c45e {0} -> %s in scripts/cpdb.py 2014-08-14 21:41:09 -05:00
mdipierro 0cc5280f0d Merge remote-tracking branch 'origin/master' 2014-08-14 19:57:44 -05:00
mdipierro 6dfeab284c Merge pull request #479 from leonelcamara/master
reverse_geocode
2014-08-14 19:53:35 -05:00
mdipierro f4ebc5097e Log In/Sign Up instead of login/register 2014-08-14 19:48:09 -05:00
mdipierro 88e971b9d8 fixed typo default table3cols 2014-08-14 19:40:01 -05:00
mdipierro b595c40320 fixed welcome and bs3 2014-08-14 19:20:46 -05:00
mdipierro 65ab4b8550 response.form_label_separator 2014-08-14 19:12:47 -05:00
mdipierro 7de0861fb5 response.formstyle, reponse.label_separator 2014-08-14 19:10:51 -05:00
mdipierro eb9e35f860 very weird GAE hack 2014-08-14 16:27:46 -05:00
mdipierro 715cc484d4 removed legacy files 2014-08-14 16:23:48 -05:00
mdipierro 13026231f1 fixed registration_id on GAe, thanks Luca 2014-08-14 13:39:04 -05:00
mdipierro 3f65b8bfc8 fixed an issue with lack of validators in 'double' type 2014-08-11 00:02:08 -05:00
mdipierro 5e07ed79cc Added support for stdlib's pbkdf2, thanks Ayrx 2014-08-10 12:45:37 -05:00
mdipierro 2a2800bc25 Merge pull request #476 from leonelcamara/master
Small Refactoring of BaseAdapter.delete
2014-08-10 12:39:30 -05:00
mdipierro 7e15c1a1da fixed a ''...'' regex in markmin, thanks Leonel 2014-08-10 12:07:32 -05:00
mdipierro cbad6c712c upgraded to bs 3.2.0 2014-08-09 02:16:27 -05:00
mdipierro 01f85f2483 experimental 2.10.0 2014-08-09 02:10:50 -05:00
mdipierro bb13d6b729 fixed some bugs and another bs2->bs3 attempt 2014-08-09 01:52:09 -05:00
mdipierro 6b98e30000 fixing a mess part 2 2014-08-09 01:03:23 -05:00
mdipierro e9ed69e7a9 fixing a mess 2014-08-09 01:02:58 -05:00
mdipierro 5c9282aca5 fixed issue 1947, raw args in expose, thanks iiijjjiii 2014-08-08 00:50:42 -05:00
mdipierro 669a22c8be fixed issue 1950, allow change password for any old password complexity 2014-08-08 00:38:10 -05:00
mdipierro 5cbbcd3685 fixed postgresql bug introduced in recent commit? 2014-08-08 00:13:31 -05:00
mdipierro 6fc97775dc fixed redirection bug 2014-08-08 00:07:34 -05:00
mdipierro 535a39feaa request.is_shell and request.is_scheduler 2014-08-07 23:55:32 -05:00
mdipierro ab84c95179 fixed 1961, redirect(..,headers=request.headers), thanks remco.boerma 2014-08-07 23:48:42 -05:00
mdipierro 6db3b0621c Fixed issue 1962, postgres INSERT ... RETURING id, thanks perakojotgenije 2014-08-07 23:43:22 -05:00
mdipierro a858f811a1 Fixed issue 1954, re-raising exceptions the right way, thanks Marton 2014-08-07 23:33:34 -05:00
mdipierro 309a7c39ca merging latest online fixes after local brach fix 2014-08-06 14:52:10 -05:00
mdipierro d4e71073d7 Merge remote-tracking branch 'origin/master' 2014-08-06 14:50:53 -05:00
mdipierro 63529e5ad8 not sure what happened but fixing local commit 2014-08-06 14:50:51 -05:00
mdipierro d1118b606b Merge pull request #478 from alexdba/master
Option to limit inline display of linked tables
2014-08-06 14:45:23 -05:00
mdipierro 8f649f1820 Merge pull request #475 from omartrinidad/master
Changed a condition in order to not show `None` if there is no errors
2014-08-06 14:44:13 -05:00
mdipierro 24c0c3d129 Merge branch 'master' of github.com:web2py/web2py into HEAD 2014-08-05 01:44:20 -05:00
mdipierro 3dec218ff0 Merge pull request #477 from niphlod/enhancement/scheduler_deps
new feature (task dependencies) and a little bit of refactoring
2014-08-05 01:44:11 -05:00
mdipierro 9866e54c00 Merge branch 'master' of github.com:web2py/web2py into HEAD 2014-08-01 01:46:53 -05:00
mdipierro 356b4164c3 syncing 2014-08-01 01:46:46 -05:00
mdipierro eff9b2d174 Merge pull request #474 from leonelcamara/master
Added an optional render argument to as_trees that if True causes it to ...
2014-08-01 01:43:36 -05:00
mdipierro 91ced9007e Merge pull request #473 from omartrinidad/master
Deleted unnecessary variable
2014-08-01 01:37:35 -05:00
mdipierro c6e766d5e1 template converter for alternative delimiters 2014-07-29 11:52:50 -05:00
mdipierro 2be0a95dab template converter for alternative delimiters 2014-07-29 11:45:43 -05:00
mdipierro d9e0e08a91 reverted latest commit, Leonel is right, better to use closures 2014-07-29 09:57:12 -05:00
mdipierro bd44a42c89 allow arbistrary params to formstyle=style(placeholder=True, errors='down'), thanks André Kablu 2014-07-28 23:29:26 -05:00
mdipierro 024912bda1 fixed conflict between GAE and 2-factor authentication 2014-07-28 22:01:48 -05:00
mdipierro 29303488ab support for Oracle REGEXP_LIKE, thanks Alexander Rasin 2014-07-28 00:21:45 -05:00
mdipierro 0201007e2c ldap CA support, thanks Maggs and Shane 2014-07-27 11:15:37 -05:00
mdipierro c3116b094c Merge pull request #472 from ilvalle/fix_editor
editor:potential fix for requests cancelled due to same origin policy
2014-07-27 10:54:23 -05:00
mdipierro 29ed8494dc Merge pull request #471 from omartrinidad/master
Typo. Your -> You
2014-07-27 10:53:54 -05:00
mdipierro a0d105a5ec Merge pull request #470 from whoot/master
German translation
2014-07-27 10:53:28 -05:00
mdipierro 7b2b8155f9 Merge pull request #469 from abastardi/issue/unique_validator
Fix default validator when unique=True
2014-07-10 02:07:46 -05:00
mdipierro ad2ca992aa Merge pull request #467 from ilvalle/fix_show_if
fix show_if with belongs
2014-07-10 02:06:40 -05:00
mdipierro fcadaa981d settings is_gae in autocomplete 2014-07-09 07:07:26 -05:00
mdipierro 195acce3b9 Merge pull request #466 from viniciusban/pt_br_translations
pt-br translations for admin and welcome apps
2014-07-04 01:47:22 -05:00
mdipierro 27eb797e2b Merge pull request #465 from omartrinidad/patch-1
Update sqlhtml.py
2014-07-04 01:46:17 -05:00
mdipierro 5d3c915c61 added parent links 2014-07-03 12:22:55 -05:00
mdipierro 1606c938a7 better handling of uploads in hypermedia.py 2014-07-03 11:56:15 -05:00
mdipierro 9a6f0b59ad fixed errors reporting in collection+json 2014-07-02 18:35:25 -05:00
mdipierro 55016cbd4d fixed guessable CSRF token when detect_record_change, thanks Stephen Röttger 2014-07-02 08:27:02 -05:00
mdipierro eec39aeeec smarter upload of binary data 2014-07-02 07:26:16 -05:00
mdipierro bc1b4ad03a fixed some problems with collection+json 2014-07-02 03:01:30 -05:00
mdipierro 6e8e95eb3e jquery.js 1.11.1 2014-06-30 09:57:29 -05:00
mdipierro 0be4f73102 no more analytics.min.js 2014-06-30 09:55:13 -05:00
mdipierro b61e8c6132 allow id in email msg 2014-06-25 10:52:36 -05:00
mdipierro 22044768cb Merge pull request #464 from cccaballero/master
Added dict based meta generation
2014-06-25 01:02:07 -05:00
mdipierro d712d3b83c fixed redirect 2014-06-24 12:46:17 -05:00
mdipierro bf52e012a7 rules->policies in hypermedia 2014-06-23 01:03:17 -05:00
mdipierro 7bb8735f2f Hypermedia API and Collection+JSON 2014-06-22 14:57:35 -05:00
mdipierro 1ca5e5524e fixed possible bug in dal 2014-06-19 17:17:29 -05:00
mdipierro 21bdf114b4 Merge pull request #462 from niphlod/fix/scheduler_disabled
a DISABLED worker shouldn't resume after completing a task
2014-06-15 22:20:17 -05:00
mdipierro 12c2668da1 Merge pull request #460 from niphlod/fix/scheduler
removed leftover print
2014-06-15 21:02:25 -05:00
mdipierro e172c2cade Merge pull request #459 from flavour/master
Remove duplicate import
2014-06-14 13:15:09 -05:00
mdipierro e33704467b fixed typo in recent commit 2014-06-14 10:07:51 -05:00
mdipierro 255dd9777d fixed typo in recent commit 2014-06-14 10:06:13 -05:00
mdipierro 8b8baf10a3 fixed issue 1942, redirect in federated login security check 2014-06-13 22:24:57 -05:00
mdipierro e42b835687 Merge branch 'master' of github.com:web2py/web2py 2014-06-13 22:16:43 -05:00
mdipierro 559961897e Merge pull request #458 from niphlod/fix/like_ansi_behaviour
fix like behaviour as ANSI-SQL LIKE
2014-06-13 22:16:21 -05:00
mdipierro 6cee7ce238 Merge branch 'master' of github.com:web2py/web2py 2014-06-13 22:12:01 -05:00
mdipierro c9421ac526 Merge pull request #457 from niphlod/enhancement/scheduler
scheduler's refactoring
2014-06-13 22:11:40 -05:00
mdipierro 3266c541b6 fixed CAST LONGTEXT issue with mysql 2014-06-13 11:46:50 -05:00
mdipierro d442b003ea restored .travis.yml 2014-06-08 00:34:46 -05:00
mdipierro e5557edccd Merge pull request #456 from niphlod/enhancement/mssql4
mssql4 adapter enhancements
2014-06-08 00:29:15 -05:00
mdipierro 5ec386fb7b Merge pull request #455 from niphlod/fix/test_rewrite
fix rewrite tests under Windows
2014-06-08 00:28:15 -05:00