cffa59a80c
Merge pull request #1004 from cs09g/patch-2
...
simplified conditions
2015-06-18 06:31:22 -05:00
82a1b9f628
Merge pull request #1003 from cs09g/patch-1
...
remove duplicated execution
2015-06-18 06:31:08 -05:00
94d2f1453d
Merge pull request #1002 from cs09g/patch-5
...
change initialization
2015-06-18 06:30:30 -05:00
a1875ee362
Merge pull request #1001 from cs09g/patch-3
...
Update appadmin.py
2015-06-18 06:29:57 -05:00
5f13dca712
Merge pull request #1000 from niphlod/fix/readme
...
after appveyor hooks have been defined...
2015-06-18 06:28:39 -05:00
f60ae809b6
simplified conditions
2015-06-18 17:05:34 +09:00
34dd8af101
remove duplicated execution
...
is that really duplicated or missing something to add for difference?
2015-06-18 16:55:04 +09:00
6bf6ebab1b
change initialization
...
ok must be True or False.
set False is better for initialization
2015-06-18 16:40:59 +09:00
29bf50425b
Update appadmin.py
2015-06-18 16:31:28 +09:00
8a7612c976
after appveyor hooks have been defined...
2015-06-17 21:23:29 +02:00
97489fd277
Merge pull request #998 from niphlod/build/appveyor
...
move to codecov and enable appveyor too
2015-06-17 02:00:48 -05:00
b86184fe58
Merge pull request #997 from niphlod/fix/bs3_grid_checkbox
...
fix display of checkboxes in search form of grid
2015-06-17 02:00:34 -05:00
2ce53e9957
move to codecov and enable appveyor too
2015-06-14 21:17:52 +02:00
d61c372c95
fix display of checkboxes in search form of grid
2015-06-11 21:54:21 +02:00
73e176365f
Merge pull request #995 from niphlod/fix/994
...
fixes #994
2015-06-07 21:47:28 -05:00
33f12d91a5
Merge pull request #992 from btreecat/master
...
Fixed authentication using different login methods.
2015-06-07 21:47:08 -05:00
d0f1286f03
Merge pull request #991 from cs09g/patch-2
...
Update appadmin.py
2015-06-07 21:44:44 -05:00
04d698109e
Merge pull request #990 from cs09g/patch-1
...
remove invalid initialize
2015-06-07 21:44:19 -05:00
0e9c5caf4d
added request_reset_password_on...
2015-06-07 21:28:18 -05:00
509b0a6987
fixes is_in_set repr too
2015-06-06 09:50:44 +02:00
e0074ebcac
fixes #994
...
we were overriding default classes for specific widgets
2015-06-05 22:10:33 +02:00
918fdf2f0c
Fixed authentication using different login methods.
2015-06-02 12:24:35 -04:00
8e827f7a09
Update appadmin.py
2015-06-02 01:28:51 +09:00
cf2d5b637b
remove invalid initialize
2015-06-02 01:00:25 +09:00
236fdcfafc
R-2.11.2
2015-05-30 11:30:16 -05:00
ce0f83d00c
Merge pull request #988 from gi0baro/master
...
Track pyDAL 15.05.29
2015-05-30 11:29:09 -05:00
156d771ab3
Track pyDAL 15.05.29
2015-05-29 13:45:52 -05:00
01474c99b0
R-2.11.1
2015-05-28 23:22:16 -05:00
66d15491ca
Merge pull request #984 from ilvalle/minorfix
...
lazy request.uuid
2015-05-28 23:17:21 -05:00
376a27da73
Merge pull request #983 from Euphorbium/patch-1
...
fix cPickle not defined error
2015-05-28 23:16:33 -05:00
0f95c13dc7
Merge pull request #981 from gi0baro/master
...
Track pyDAL 15.05.26
2015-05-28 23:16:02 -05:00
926de90ee4
fixed bug in orderby when it is a list
2015-05-28 13:59:03 -05:00
538f375284
lazy request.uuid
2015-05-28 18:30:06 +02:00
4c61c0962d
fix cPickle not defined error
2015-05-28 14:29:43 +03:00
9b71646fc5
Track pyDAL 15.05.26
2015-05-26 14:36:04 +02:00
1e66fa3a93
new version number
2015-05-24 19:14:49 -05:00
57a8dfe034
Merge pull request #977 from austinprog/patch-1
...
Changed "Import about this GIT repo" Line 16, typo
2015-05-24 18:58:22 -05:00
77e7631740
Merge pull request #976 from niphlod/fix/ubuntu_nginx_hardening
...
thanks @wmunguiam for spotting
2015-05-24 18:57:51 -05:00
ba978d55cf
Merge pull request #975 from gi0baro/master
...
Track pyDAL 15.05
2015-05-24 18:57:36 -05:00
12e8ee5c25
Merge pull request #974 from niphlod/fix/redis_cache_multiapp
...
redis multi-app. Thanks Lisandro for spotting it
2015-05-24 18:57:26 -05:00
d293e98b43
Changed "Import about this GIT repo" Line 16, typo
...
My proposal is to change it to "Important reminder about this GIT Repo", as I think the "Import" part in the current one is a typo.
2015-05-24 18:13:03 -05:00
4f316d0294
thanks @wmunguiam for spotting
2015-05-24 21:25:27 +02:00
81e15879d4
Track pyDAL 15.05
2015-05-23 16:37:52 +02:00
cd1d6c5af1
redis multi-app. Thanks Lisandro for spotting it
...
redis_cache didn't play well with multiple apps for a silly mistake.
Glad that Lisadro pointed out
2015-05-21 22:26:04 +02:00
c7d3758c77
Merge pull request #973 from omniavx/patch-1
...
Update dal.py
2015-05-20 08:27:41 -05:00
040e52278e
Merge pull request #956 from cassiobotaro/master
...
More changes in List (request.args)
2015-05-20 08:27:16 -05:00
3daf953c66
syncing maintenance again
2015-05-20 08:26:03 -05:00
de3d722ac9
fixed import, thanks Auden RovelleQuartz
2015-05-20 08:24:33 -05:00
ff10eab373
Update dal.py
...
I was running my application and got this error
{
<type 'exceptions.ImportError'> cannot import name Set
Version
web2py™ Version 2.10.4-stable+timestamp.2015.04.26.15.11.54
Python Python 2.7.3: /usr/bin/python (prefix: /usr)
Traceback
1.
2.
3.
4.
5.
6.
7.
8.
9.
10.
11.
12.
13.
14.
15.
16.
Traceback (most recent call last):
File "/home/www-data/web2py/gluon/restricted.py", line 227, in restricted
exec ccode in environment
File "/home/www-data/web2py/applications/omniavx_cxn/controllers/valuecache.py", line 6897, in <module>
File "/home/www-data/web2py/gluon/globals.py", line 393, in <lambda>
self._caller = lambda f: f()
File "/home/www-data/web2py/applications/omniavx_cxn/controllers/valuecache.py", line 6584, in browse_bacct_callback
from plugin_PowerGrid.CallBack import CallBack
File "/home/www-data/web2py/gluon/custom_import.py", line 95, in custom_importer
return base_importer(pname, globals, locals, fromlist, level)
File "/home/www-data/web2py/gluon/custom_import.py", line 134, in __call__
result = NATIVE_IMPORTER(name, globals, locals, fromlist, level)
File "applications/omniavx_cxn/modules/plugin_PowerGrid/CallBack.py", line 41, in <module>
from gluon.dal import Table ,Query, Set, Rows, Row
ImportError: cannot import name Set
}
same code produced no error in earlier version of web2py
line 15 of web2py/gluon/dal.py is
{
from pydal.objects import Row, Rows, Table, Query, Expression
}
replacing that with
{
from pydal.objects import Row, Rows, Table, Query, Set, Expression
}
solves the problem
2015-05-20 00:11:46 -05:00
eb4d159b37
fixed process_batch_upload
2015-05-18 23:28:17 -05:00
mdipierro