dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,543 Commits 18 Branches 72 Tags
1dea18b8a1bd6fbd64978d00a07dbdee451663f3
Commit Graph

7543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Leonel Câmara 8d8095b1f5 Added fix - you cannot concatenate lists with tuples and sets and it was possible that this would happen 2014-07-29 19:39:14 +01:00
Leonel Câmara 757fb934d5 Fixed a bug where as_list was setting the compact value for the rows permanently instead of only temporarily while processing the rows. 2014-07-29 18:56:45 +01:00
Leonel Câmara 1ee8d3cb97 Added an optional render argument to as_trees that if true causes it to render the rows before building the tree 2014-07-29 18:01:11 +01: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
Omar Trinidad Gutiérrez Méndez dec69b8252 Deleted unnecessary variable 
before:
        iso_format = iso_format = {'_data-w2p_datetime_format' : '%Y-%m-%d %H:%M:%S'}

now:
        iso_format = {'_data-w2p_datetime_format' : '%Y-%m-%d %H:%M:%S'}
 2014-07-28 11:35:56 -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
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
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
abastardi d2563c434b Fix default validator when unique=True 
Append the IS_NOT_IN_DB validator so it is applied to the final value after any previous validators may have altered the original value.
 2014-07-09 13:51:26 -04:00
ilvalle 609a931f91 always appends IS_NOT_IN_DB 2014-07-09 17:05:36 +02:00
mdipierro fcadaa981d settings is_gae in autocomplete 2014-07-09 07:07:26 -05:00
ilvalle e7208c6569 fix unique validator with date/time fields 2014-07-08 23:14:28 +02:00
ilvalle f2bc3cca36 fix show_if with belongs 2014-07-08 12:22:31 +02: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
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 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
Omar Trinidad Gutiérrez Méndez 13d4d892b7 Update sqlhtml.py 
Improved readability in code
 2014-07-01 16:24:40 -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