Chen Rotem Levy
9877ad5155
fix in_base for base='/'
...
If the base directory already ends with '/' the test failed.
It failed because we added an extra '/' to make sure that '/foobar' is
not under '/foo', so ask '/foobar/'.startswith('/foo/').
Whoever when we have the base already start with '/' we might test:
'/foo/bar/'.startwith('/foo//'), and give a false negative. We
shouldn't have this case, because we normalized the path, but in the
case of the root directory ('/') even a normalized path ends with '/',
and thus when base='/' this function failed.
Some re-factoring was needed to make this base testable.
2016-06-11 12:19:16 +03:00
Chen Rotem Levy
e020395bdc
apply pull request #1313
...
This should have resolved security issue#1261 -- gluon.tools.Expose
symlinks, however it does not deal well with the case where the base
exposed directory is '/'
2016-06-11 11:20:23 +03:00
mdipierro
15a26c00b1
Merge pull request #1352 from zvolsky/_revert_wiki
...
revert wiki to earlier (properly working) state
2016-06-07 20:36:52 -05:00
zvolsky
225a286162
revert wiki to earlier (properly working) state
2016-06-07 15:10:03 +02:00
zvolsky
876508a227
grid: custom representation of None value, in view
2016-06-06 12:43:11 +02:00
zvolsky
0c52f2a561
grid: custom representation of None value
2016-06-06 12:25:06 +02:00
mdipierro
154073c3a6
Merge pull request #1341 from nextghost/master
...
Ignore internal attributes when checking whether new session was changed
2016-06-03 10:04:00 -05:00
Michele Comitini
67f85fd631
allow token renewal with http authorization header.
2016-05-31 23:55:58 +02:00
Martin Doucha
40b8a4d75d
Whitespace fix
2016-05-28 22:25:58 +02:00
Martin Doucha
54e443dfad
Ignore internal attributes when checking whether new session was changed
2016-05-28 21:54:24 +02:00
Michele Comitini
95c1a734d1
fix wrong reference to request out of current namespace
2016-05-27 00:23:25 +02:00
mdipierro
cbd8c63b26
Merge pull request #1335 from zvolsky/_breadcrumb_divider
...
better breadcrumb divider for smartgrid
2016-05-23 22:20:57 -05:00
Carlos Cesar Caballero Díaz
47b1bf7323
fixing dictionary changed size error on SQLFORM using extra_fields
...
When uses the extra_fields keyword argument in SQLFORM rises an
"RuntimeError: dictionary changed size during iteration" exception
because is trying to remove a dictionary element while is iterating the
dict
2016-05-23 14:36:10 -04:00
zvolsky
a70e966f0c
breadcrumb divider, finished
2016-05-20 19:04:07 +02:00
Leonel Câmara
180ebcd7f1
Removed unnecessary version checks
...
Fixed 2 memory leaks in restricted.py
2016-05-19 19:03:54 +01:00
mdipierro
56b29553c5
Merge pull request #1330 from oscarfonts/catalan-plurals
...
Added catalan plural rules
2016-05-14 10:16:39 -05:00
Oscar Fonts
62f49d0f57
Added catalan plural rules
2016-05-12 16:14:01 +02:00
Leonel Câmara
1029a70d10
more tests for languages module
...
removed 2.5/2.6 compatibility in test_validators.py
2016-05-12 02:00:14 +01:00
mdipierro
be1845ad83
Merge pull request #1327 from leonelcamara/ditch26
...
Ditch python2.6
2016-05-11 01:35:52 -05:00
mdipierro
5246d808f0
Merge pull request #1326 from michele-comitini/jwt-decorator-fix
...
make allows_jwt a real decorator. Tests included!
2016-05-11 01:35:44 -05:00
Leonel Câmara
87a3de22d7
remove ordereddict
2016-05-11 01:03:04 +01:00
Leonel Câmara
a9ee9a6b58
remove simplejson
2016-05-11 00:47:23 +01:00
Michele Comitini
7d48d6ba03
removed logging leftover
2016-05-10 01:35:22 +02:00
Michele Comitini
4658e172c3
removed forgotten print statement
2016-05-10 01:11:08 +02:00
Michele Comitini
2c26a8c33a
make allows_jwt a real decorator. Tests included!
2016-05-10 00:50:33 +02:00
Giovanni Barillari
625c7ae82e
Fix #1324
2016-05-09 23:38:52 +02:00
mdipierro
87935a45ba
Merge branch 'master' of github.com:web2py/web2py
2016-05-09 00:24:29 -05:00
mdipierro
0692272991
going back to dal 16.03 to prepare for 2.14.6
2016-05-09 00:24:14 -05:00
mdipierro
c9f11c068c
Merge pull request #1322 from ShySec/oneall_optimization
...
simplified oneall dname handling
2016-05-09 00:05:06 -05:00
mdipierro
54b0feeffb
Merge pull request #1321 from ShySec/master
...
fixed timing attack in gluon.utils.compare
2016-05-09 00:04:39 -05:00
kelson
822e68ac16
simplified oneall dname handling
2016-05-06 16:10:19 -04:00
kelson
292af5adc6
fixed timing attack in gluon.utils.compare
2016-05-06 14:14:32 -04:00
niphlod
c6d4fb8f38
sync with main scheduler
2016-05-05 21:36:51 +02:00
Leonel Câmara
810520b3f0
more tests for validators
2016-05-03 02:38:50 +01:00
mdipierro
af18582198
Merge pull request #1315 from niphlod/enhancement/scheduler
...
can now process tasks with huge_results
2016-05-02 10:16:38 -05:00
mdipierro
2d6ca49675
Merge pull request #1314 from chenl/issue_1310
...
issue#1310
2016-05-02 10:16:03 -05:00
mdipierro
db36e4380d
Merge pull request #1308 from leonelcamara/test_week8
...
partial tests for appadmin, testing a bunch of other stuff in the pro…
2016-05-02 10:13:54 -05:00
niphlod
2031a43058
can now process tasks with huge_results
...
Added tests, too. Cleanups leftovers better, so fixes #1304
2016-05-01 22:01:49 +02:00
Chen Rotem Levy
07d764f3c6
issue#1310
...
undo PR#1194
2016-04-30 13:41:11 +03:00
Leonel Câmara
b8b63302f4
add test_appadmin to tests/__init__.py
2016-04-26 17:17:19 +01:00
Leonel Câmara
fa1af36adf
partial tests for appadmin, testing a bunch of other stuff in the process
2016-04-26 04:31:22 +01:00
zvolsky
b6ee82bbde
script for language files update has new param to update existing translations
2016-04-25 11:06:02 +02:00
mdipierro
8ed6736e82
Merge pull request #1306 from BuhtigithuB/improve/html-and-it-tests
...
improve html.py, new url_encode=True/False test, review/close #1279
2016-04-24 18:44:38 -05:00
Hardirc
c6b844a3e4
minor improve html.py, new url_encode=True/False test, review and close 1279
2016-04-24 09:47:57 -04:00
Leonel Câmara
c7bb69a0b0
consistent naming
2016-04-21 20:12:00 +01:00
Leonel Câmara
8b402b491c
100% coverage for recfile
2016-04-21 20:01:23 +01:00
mdipierro
735d79c211
latest pydal fixed connection issue
2016-04-19 22:45:49 -05:00
mdipierro
4177b4fe58
included fixes from dal
2016-04-19 11:42:24 -05:00
mdipierro
82aec9ba39
new fixes from Giovanni
2016-04-19 11:30:40 -05:00
Giovanni Barillari
dc28664270
Tracking pydal 85c530c
2016-04-19 17:41:29 +02:00