Commit Graph

839 Commits

Author SHA1 Message Date
mdipierro 0120ad5b95 upgraded simplejson 2014-09-14 16:37:09 -05:00
mdipierro 6a75132d54 CROSS JOIN, thanks jotbe 2014-09-14 14:57:12 -05:00
Jason Brower da195b787d Improve the graphing to show the name of the application. 2014-09-13 20:26:03 +03:00
ilvalle 7fa8f1fa08 fix web2py.js with show_if and grid 2014-09-05 16:17:36 +02:00
mdipierro d6a2d0c3ee R-2.9.6 2014-09-01 20:37:53 -05:00
mdipierro 33fcfe2736 links to new videos 2014-08-30 21:33:27 -05:00
mdipierro a3f3496709 fixed security issue again, thanks Niphlod 2014-08-26 14:38:09 -05:00
mdipierro 3738f7dc7a reverted to bs2 for an early release 2014-08-26 14:29:15 -05:00
mdipierro bac9039c6e increased security in admin and appadmin 2014-08-25 16:36:10 -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 c7beeaf5c5 added utils.obj2dict 2014-08-19 18:57:25 -05:00
Ricardo Pedroso a6bf692b61 bootstrap3 formstyle improvements 2014-08-16 19:28:42 +01:00
mdipierro f84afaadbb removed files committed by mistake, thanks Niphlod 2014-08-16 12:20:00 -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 7de0861fb5 response.formstyle, reponse.label_separator 2014-08-14 19:10:51 -05:00
mdipierro 715cc484d4 removed legacy files 2014-08-14 16:23:48 -05:00
mdipierro cbad6c712c upgraded to bs 3.2.0 2014-08-09 02:16:27 -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 63529e5ad8 not sure what happened but fixing local commit 2014-08-06 14:50:51 -05:00
Leonel Câmara c73cc084ad Merge branch 'master' of git://github.com/web2py/web2py
Conflicts:
	applications/admin/languages/pt.py
	gluon/dal.py
2014-07-29 20:19:26 +01:00
Leonel Câmara ad1dd3afdd minor 2014-07-29 20:11:50 +01: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
ilvalle 967a37adc4 online editor:potential fix for requests cancelled due to same origin policy 2014-07-22 10:22:48 +02:00
Omar Trinidad Gutiérrez Méndez c4264c986b Typo Spanish 2014-07-20 21:21:16 -05:00
Omar Trinidad Gutiérrez Méndez ca18097f9c Spanish localization in admin application 2014-07-20 21:06:50 -05:00
Omar Trinidad Gutiérrez Méndez 130540dafc Typo. Your -> You 2014-07-20 19:10:26 -05:00
Jan Rude 9fa165430a Update de.py
Missed some translations
2014-07-17 10:20:57 +02:00
Jan Rude 2b9a9b4d11 Update de.py
Missed some translations
2014-07-17 10:18:53 +02:00
Jan Rude cac45aa5a5 Added german translation 2014-07-16 20:03:37 +02:00
Jan Rude b068540c4c Added/Improved some translations 2014-07-16 20:03:06 +02:00
Jan Rude c24e1d52d9 Added/Improved some translations 2014-07-16 20:02:19 +02:00
Jan Rude 2cd8623e92 Update de.py 2014-07-16 20:00:58 +02:00
root 773933602e Added/improved german translation 2014-07-16 19:58:03 +02:00
viniciusban ed29758819 pt-br translation for welcome app 2014-07-03 23:15:43 -03:00
viniciusban d99f4d4e7d pt-br translation for admin app 2014-07-03 23:05:11 -03: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 ceb479e0cd fixed issue 1924:Reset Password form does not show password strength. 2014-05-26 23:56:56 -05:00
mdipierro 7e9c9dbe93 Merge pull request #431 from ortgit/enhancement/two_step_authentication
Added support for two-step authentication.
2014-05-26 22:27:23 -05:00
Mariano Reingart bfce57f5da fixed excessive attribute sanitization in generic generation of PDF (pyfpdf) 2014-05-21 15:10:25 -03:00
mdipierro 7cfa2a54b7 remove more bloat 2014-05-09 15:43:10 -05:00
mdipierro 27bb2ee6b8 removed some files but not all (for now) 2014-05-09 15:24:18 -05:00