 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 |
|
|
Khalid
|
84b8be34ec
|
Arabic Translation Added
Not perfect yet , but it's the first version.
|
2014-06-06 23:50:47 +03: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 |
|
|
ortgit
|
87edbccf5b
|
Added support for two-step authentication. The login function will
now email a 6-digit code to users if the user is part of a group
with role 'web2py TWo-Step Authentication'.
|
2014-04-27 01:39:51 -04:00 |
|
|
Massimo
|
287d8e3e18
|
added private folder back to design page, thanks szunny
|
2014-04-15 10:27:31 -05:00 |
|
|
Massimo
|
7e470d7786
|
added missing files
|
2014-04-15 10:22:57 -05:00 |
|
|
Massimo
|
caafff74b3
|
reverted rpx_account for backward compatibility and added janrain_account for the new engage.js api
|
2014-04-15 10:16:02 -05:00 |
|
|
mdipierro
|
53ecc17b57
|
Merge pull request #424 from omartrinidad/master
Updated regex to manage white space in titles
|
2014-04-13 10:39:53 -05:00 |
|
|
Omar Trinidad Gutiérrez Méndez
|
d301f78396
|
Typo
Fixed subtle typo
|
2014-04-11 08:38:01 -05:00 |
|
|
niphlod
|
0c30bc5d7d
|
few "fashion" tweaks plus sphinx over epydoc docs
|
2014-04-08 23:03:15 +02:00 |
|
|
mdipierro
|
fab4d1e782
|
welcome + gae should use ndb as example
|
2014-03-31 00:24:52 -05:00 |
|
|
mdipierro
|
29ca1872b0
|
GAE should use 2.7, not 2.5
|
2014-03-29 17:28:45 -05:00 |
|
|
mdipierro
|
8d11647a8d
|
better fix for patch 414, starting web2py from other folder
|
2014-03-29 17:07:25 -05:00 |
|
|
luizpedone
|
cfb3be9363
|
Updated the pt-br welcome application translation.
|
2014-03-25 20:38:09 -03:00 |
|
|
ilvalle
|
7cd3ffbcbd
|
codemirror 4.0.3 (new upstream major release)
|
2014-03-25 12:56:39 +01:00 |
|
|
mdipierro
|
96a1969cb6
|
merged
|
2014-03-19 12:34:47 -05:00 |
|
|
Alexandre Andrade
|
d06e4f63d7
|
added translations to pt-br language file
|
2014-03-19 11:58:45 -03:00 |
|
|
Alexandre Andrade
|
4125230cfc
|
added translations to pt-br language file
|
2014-03-19 11:38:44 -03:00 |
|
|
Alexandre Andrade
|
a35bc8635b
|
added pt-br language file
|
2014-03-19 11:35:50 -03:00 |
|
|
luizpedone
|
af5cd04044
|
Fix some typos, correct some translations.
|
2014-03-19 07:56:16 -03:00 |
|
|
luizpedone
|
3fbe1d3e85
|
Update translation to pt-br.
|
2014-03-18 11:11:14 -03:00 |
|
|
mdipierro
|
e9eb8cbfc7
|
Merge pull request #403 from pyner/master
Update default.py
|
2014-03-15 21:09:44 -05:00 |
|
|
samuel bonilla
|
4f82bed52e
|
Update default.py
new alert: it's a plugin is not an application
|
2014-03-13 20:04:00 -05:00 |
|
|
mdipierro
|
ad72cea9a6
|
fixed issue 1891:Remove response.meta.description from menu.py in welcome app, thanks sourcingp
|
2014-03-09 17:29:41 -05:00 |
|
|
mdipierro
|
e43df945b4
|
no more pypy test for today
|
2014-03-08 14:28:18 -06:00 |
|
|
mdipierro
|
ae0749d6b8
|
reverted some bs3 changes
|
2014-03-03 08:13:37 -06:00 |
|
|
mdipierro
|
29042f08a1
|
back to bs2
|
2014-03-02 17:17:21 -06:00 |
|