Commit Graph

Select branches

Hide Pull Requests

admin2

ah-stable

dev-ah

eb2py.crt

experimental

fake_migrate

fix-missing-folders-in-script

issue-2274

jwt_allow_decorator_fix

master

mdipierro

mdipierro-test1

migrator-pr

modular

patch-1

patch-2

patch-json-handoff

testing

2.18.4

R-2.0.2

R-2.0.4

R-2.0.5

R-2.0.6

R-2.0.7

R-2.0.8

R-2.0.9

R-2.1.1

R-2.10.1

R-2.10.2

R-2.10.3

R-2.10.4

R-2.10.4.beta

R-2.11.1

R-2.11.2

R-2.12.1

R-2.12.2

R-2.12.3

R-2.13.1

R-2.13.2

R-2.13.3

R-2.13.4

R-2.14.1

R-2.14.2

R-2.14.3

R-2.14.4

R-2.14.5

R-2.14.6

R-2.15.0b2

R-2.15.1

R-2.15.2

R-2.15.3

R-2.15.4

R-2.16.0b1

R-2.16.1

R-2.17.1

R-2.17.2

R-2.18.2

R-2.18.3

R-2.2.1

R-2.3.1

R-2.3.2

R-2.4.2

R-2.4.3

R-2.4.4

R-2.4.5

R-2.4.6

R-2.4.7

R-2.5.1

R-2.6.1

R-2.6.2

R-2.6.3

R-2.6.4

R-2.7.1

R-2.7.2

R-2.7.3

R-2.7.4

R-2.8.1

R-2.8.2

R-2.9.10

R-2.9.11

R-2.9.12

R-2.9.2

R-2.9.3

R-2.9.4

R-2.9.5

R-2.9.6

R-2.9.7

R-2.9.8

R-2.9.9

latest

Mono Color

• bde9562b78 api_tokens in example mdipierro 2015-06-28 09:49:50 -05:00
• 9a1229470a support for api_tokens mdipierro 2015-06-28 09:48:08 -05:00
• f781b9e1f5 Merge branch 'peregrinius-master' mdipierro 2015-06-28 09:08:54 -05:00
• fa32b7577b fixed a bug and added support for user/bulk_register mdipierro 2015-06-28 09:01:10 -05:00
• 68526a0c6d allow unsorted multiword query in grid search mdipierro 2015-06-28 07:52:34 -05:00
• ad2003c618 fixed recently introduced sanitize bug mdipierro 2015-06-27 00:33:16 -05:00
• c1ecf823d8 added link to new tutorial mdipierro 2015-06-26 08:07:31 -05:00
• 6134f82452 fixed issuer #239, locking error on FreeBSD, thanks josejachuf mdipierro 2015-06-26 06:58:07 -05:00
• fbb5a8b9bb fixed issue #968, IS_MATCH validator bug with unicode, thanks alex0834 mdipierro 2015-06-25 04:36:16 -05:00
• df34869d65 fixes #978, autotypes and unicode strings, thanks remcoboerma mdipierro 2015-06-25 04:31:41 -05:00
• 28e6999e7d fixed issue #980, Admin application: can't access directories with space in directory name, thanks mmihaltz mdipierro 2015-06-25 04:30:10 -05:00
• f4f77b0cb6 fixed issue #982, LOAD with ajax=False and args mdipierro 2015-06-25 04:23:49 -05:00
• 23ddb6c3c2 fixed issue #999, gluon.sanitiizer.sanitze improvement, thanks macfiron mdipierro 2015-06-25 04:19:01 -05:00
• b636a5d6e9 more companies mdipierro 2015-06-25 03:26:18 -05:00
• efc392966e Merge pull request #1005 from cs09g/patch-3 mdipierro 2015-06-18 06:31:51 -05:00
• cffa59a80c Merge pull request #1004 from cs09g/patch-2 mdipierro 2015-06-18 06:31:22 -05:00
• 82a1b9f628 Merge pull request #1003 from cs09g/patch-1 mdipierro 2015-06-18 06:31:08 -05:00
• 94d2f1453d Merge pull request #1002 from cs09g/patch-5 mdipierro 2015-06-18 06:30:30 -05:00
• a1875ee362 Merge pull request #1001 from cs09g/patch-3 mdipierro 2015-06-18 06:29:57 -05:00
• 5f13dca712 Merge pull request #1000 from niphlod/fix/readme mdipierro 2015-06-18 06:28:39 -05:00
• f78d423c92 change misspelling Chase choi 2015-06-18 17:13:38 +09:00
• f60ae809b6 simplified conditions Chase choi 2015-06-18 17:05:34 +09:00
• 34dd8af101 remove duplicated execution Chase choi 2015-06-18 16:55:04 +09:00
• 6bf6ebab1b change initialization Chase choi 2015-06-18 16:40:59 +09:00
• 29bf50425b Update appadmin.py Chase choi 2015-06-18 16:31:28 +09:00
• 8a7612c976 after appveyor hooks have been defined... niphlod 2015-06-17 21:23:29 +02:00
• 97489fd277 Merge pull request #998 from niphlod/build/appveyor mdipierro 2015-06-17 02:00:48 -05:00
• b86184fe58 Merge pull request #997 from niphlod/fix/bs3_grid_checkbox mdipierro 2015-06-17 02:00:34 -05:00
• 2ce53e9957 move to codecov and enable appveyor too niphlod 2015-06-14 20:44:08 +02:00
• d61c372c95 fix display of checkboxes in search form of grid niphlod 2015-06-11 21:54:21 +02:00
• 73e176365f Merge pull request #995 from niphlod/fix/994 mdipierro 2015-06-07 21:47:28 -05:00
• 33f12d91a5 Merge pull request #992 from btreecat/master mdipierro 2015-06-07 21:47:08 -05:00
• d0f1286f03 Merge pull request #991 from cs09g/patch-2 mdipierro 2015-06-07 21:44:44 -05:00
• 04d698109e Merge pull request #990 from cs09g/patch-1 mdipierro 2015-06-07 21:44:19 -05:00
• 0e9c5caf4d added request_reset_password_on... mdipierro 2015-06-07 21:28:18 -05:00
• 509b0a6987 fixes is_in_set repr too niphlod 2015-06-06 09:50:44 +02:00
• e0074ebcac fixes #994 niphlod 2015-06-05 22:10:33 +02:00
• 918fdf2f0c Fixed authentication using different login methods. Stephen Tanner 2015-06-02 12:24:35 -04:00
• 8e827f7a09 Update appadmin.py Chase choi 2015-06-02 01:28:51 +09:00
• cf2d5b637b remove invalid initialize Chase choi 2015-06-02 01:00:25 +09:00
• 236fdcfafc R-2.11.2 R-2.11.2 mdipierro 2015-05-30 11:30:16 -05:00
• ce0f83d00c Merge pull request #988 from gi0baro/master mdipierro 2015-05-30 11:29:09 -05:00
• 156d771ab3 Track pyDAL 15.05.29 gi0baro 2015-05-29 13:45:52 -05:00
• 01474c99b0 R-2.11.1 R-2.11.1 mdipierro 2015-05-28 23:22:16 -05:00
• 66d15491ca Merge pull request #984 from ilvalle/minorfix mdipierro 2015-05-28 23:17:21 -05:00
• 376a27da73 Merge pull request #983 from Euphorbium/patch-1 mdipierro 2015-05-28 23:16:33 -05:00
• 0f95c13dc7 Merge pull request #981 from gi0baro/master mdipierro 2015-05-28 23:16:02 -05:00
• a2e7794b92 Invite user peregrinius 2015-05-29 15:22:36 +12:00
• 926de90ee4 fixed bug in orderby when it is a list mdipierro 2015-05-28 13:59:03 -05:00
• 538f375284 lazy request.uuid ilvalle 2015-05-24 20:15:28 +02:00
• 4c61c0962d fix cPickle not defined error Juozas Masiulis 2015-05-28 14:29:43 +03:00
• 9b71646fc5 Track pyDAL 15.05.26 gi0baro 2015-05-26 14:36:04 +02:00
• 1e66fa3a93 new version number mdipierro 2015-05-24 19:14:49 -05:00
• 57a8dfe034 Merge pull request #977 from austinprog/patch-1 mdipierro 2015-05-24 18:58:22 -05:00
• 77e7631740 Merge pull request #976 from niphlod/fix/ubuntu_nginx_hardening mdipierro 2015-05-24 18:57:51 -05:00
• ba978d55cf Merge pull request #975 from gi0baro/master mdipierro 2015-05-24 18:57:36 -05:00
• 12e8ee5c25 Merge pull request #974 from niphlod/fix/redis_cache_multiapp mdipierro 2015-05-24 18:57:26 -05:00
• d293e98b43 Changed "Import about this GIT repo" Line 16, typo Austin 2015-05-24 18:13:03 -05:00
• 4f316d0294 thanks @wmunguiam for spotting niphlod 2015-05-24 21:25:27 +02:00
• 81e15879d4 Track pyDAL 15.05 gi0baro 2015-05-23 16:37:52 +02:00
• cd1d6c5af1 redis multi-app. Thanks Lisandro for spotting it niphlod 2015-05-21 22:26:04 +02:00
• c7d3758c77 Merge pull request #973 from omniavx/patch-1 mdipierro 2015-05-20 08:27:41 -05:00
• 040e52278e Merge pull request #956 from cassiobotaro/master mdipierro 2015-05-20 08:27:16 -05:00
• 3daf953c66 syncing maintenance again mdipierro 2015-05-20 08:26:03 -05:00
• de3d722ac9 fixed import, thanks Auden RovelleQuartz mdipierro 2015-05-20 08:24:33 -05:00
• ff10eab373 Update dal.py omniavx 2015-05-20 00:11:46 -05:00
• eb4d159b37 fixed process_batch_upload mdipierro 2015-05-18 23:28:17 -05:00
• 5ef7a8e9a1 maintains web2py pattern Cássio Botaro 2015-05-14 12:24:58 -03:00
• 76cfba7047 Merge pull request #964 from matclab/mail-send-lazy-to-unicode mdipierro 2015-05-14 09:17:04 -05:00
• f77f307869 Merge pull request #970 from ailnlv/patch-1 mdipierro 2015-05-14 09:16:52 -05:00
• 5ef8648929 Merge pull request #967 from bletourmy/fix/966 mdipierro 2015-05-14 09:16:31 -05:00
• ed042685ea Merge pull request #965 from niphlod/fix/962 mdipierro 2015-05-14 09:16:10 -05:00
• d09ce57f12 Merge pull request #961 from niphlod/fix/628 mdipierro 2015-05-14 09:14:06 -05:00
• 169818b275 Fixing https://github.com/web2py/web2py/issues/969 ailnlv 2015-05-13 19:23:56 -03:00
• 4b14a87463 fixes #966 - deadlock in cache.disk Bernard Letourmy 2015-05-12 09:12:28 +08:00
• cadf38b4f6 fixes #962 niphlod 2015-05-11 21:24:20 +02:00
• a6226d6391 Convert subject and body to unicode before sending mail Mathieu Clabaut 2015-05-09 17:59:18 +02:00
• 5c167907eb fixes #628 niphlod 2015-05-08 21:51:56 +02:00
• 587ff56a94 linked 15.03-maintenance again mdipierro 2015-05-07 22:26:42 -05:00
• 6f91fdd833 minor refactoring in grid(orderby) mdipierro 2015-05-06 08:56:56 -05:00
• 6e2f9ad043 fixed examples support mdipierro 2015-05-04 11:23:44 -05:00
• cdca2793e0 Maintain py2.6k compability Cássio Botaro 2015-05-04 12:55:44 -03:00
• a0ee649884 Update tests Cássio Botaro 2015-05-04 12:49:14 -03:00
• 380b491724 Return old behaviours Cássio Botaro 2015-05-04 12:41:06 -03:00
• f45bf73992 Merge branch 'master' of github.com:web2py/web2py mdipierro 2015-05-03 16:42:42 -05:00
• 94461724f6 Merge pull request #954 from cassiobotaro/master mdipierro 2015-05-03 16:42:12 -05:00
• c36c391786 More test to prove backward compatibility Cássio Botaro 2015-05-03 14:03:26 -03:00
• f6db7c995f Its necessary because of default=None trick Cássio Botaro 2015-05-03 14:02:11 -03:00
• ccc4b96709 Added one more test Cássio Botaro 2015-05-03 13:36:24 -03:00
• 71b02e3044 Maintain backward compatibility Cássio Botaro 2015-05-03 13:35:05 -03:00
• 99fb1c3010 Merge branch 'master' of github.com:web2py/web2py mdipierro 2015-05-03 10:31:37 -05:00
• 20067d7b93 Merge pull request #953 from niphlod/fix/691 mdipierro 2015-05-03 10:31:32 -05:00
• 44eb35c617 Merge pull request #952 from niphlod/fix/734 mdipierro 2015-05-03 10:31:21 -05:00
• df03317054 Merge pull request #951 from niphlod/tests/cache_ram_and_disk mdipierro 2015-05-03 10:31:08 -05:00
• 9d873cbd1c reverted last commit mdipierro 2015-05-03 10:30:43 -05:00
• 1bb4117cbd Merge pull request #950 from cassiobotaro/master mdipierro 2015-05-03 10:23:08 -05:00
• e834186a86 Merge pull request #950 from cassiobotaro/master mdipierro 2015-05-03 10:23:08 -05:00
• 1394942feb removed reference to python 2.5 mdipierro 2015-05-03 10:09:07 -05:00
• 32b9b5c799 fixes issue #691 niphlod 2015-05-03 16:06:10 +02:00
• 340d7b5e6f fixes #734 niphlod 2015-05-03 15:51:13 +02:00