Commit graph

200 commits

Author SHA1 Message Date
Camilo Nova
8dc1622e99 Travis file cleanup 2014-05-10 09:56:28 -05:00
Camilo Nova
87a740439d Merge branch 'Andrew-Crosio-django1.7_compatibility' 2014-05-10 09:45:14 -05:00
Camilo Nova
33fe4f02b3 Fixed conflict 2014-05-10 09:44:52 -05:00
Camilo Nova
bbd688b4d2 Remove hardcoded url path 2014-05-05 16:11:54 -05:00
Andrew Crosio
298ba366b8 fixing tests for django 1.7 2014-04-25 14:55:58 +04:00
Andrew Crosio
cdb1866cbb fix for django 1.7 exception not existing 2014-04-25 14:55:46 +04:00
Camilo Nova
6152fc925d Removed python 2.6 from testing 2014-04-09 07:49:51 -05:00
Camilo Nova
8b648b8775 Use django built-in six version 2014-04-09 07:42:18 -05:00
Camilo Nova
d9e8b8cd88 Added six as requirement 2014-04-09 07:25:24 -05:00
Camilo Nova
5d61187348 Added python 2.6 for travis testing 2014-04-09 07:19:04 -05:00
Camilo Nova
5cc1dd2215 Merge pull request #69 from amrhassan/master
Replaced u string literal prefixes with six.u() calls
2014-04-09 07:15:14 -05:00
Camilo Nova
4e2a9bd02d Fixes object type issue, response is not an string 2014-04-09 07:11:02 -05:00
Camilo Nova
26b8927c77 Fixed merge conflicts 2014-04-09 07:05:10 -05:00
Camilo Nova
6ea41bb624 Merge pull request #66 from nicois/master
Python 3 compatibility fix for db_reset
2014-04-09 06:54:41 -05:00
Camilo Nova
ebabed7136 Merge pull request #65 from barseghyanartur/master
Added example project and helper scripts
2014-04-09 06:49:51 -05:00
Camilo Nova
c8232773d1 Merge pull request #72 from marianov/master
Admin command to list login attemps
2014-04-09 06:45:58 -05:00
Mariano Vassallo
9e7b1f9767 Admin command to list login attemps 2014-03-20 13:13:52 -03:00
Amr Hassan
f6f494cc11 Replaced six imports with django.utils.six ones 2014-03-05 11:43:05 +02:00
Amr Hassan
c90ee0562a Replaced u string literal prefixes with six.u() calls to make it compatible with Python 3.2 2014-03-02 12:20:21 +02:00
Flavio Curella
0a1377866f replaced assertIns and assertNotIns with assertContains and assertNotContains 2014-02-26 23:52:28 +01:00
Flavio Curella
98bafd3926 added py3k to travis 2014-02-26 22:36:38 +01:00
Nick Farrell
864508bd13 update test cases to be python3 compatible 2014-02-08 23:38:06 +11:00
Nick Farrell
3788b0d9bf Python 3 compatibility fix for db_reset 2014-02-08 22:54:35 +11:00
Artur Barseghyan
e819c70049 removed trash from example urls 2013-12-24 19:41:06 +01:00
Artur Barseghyan
29a22b97f4 added django installer 2013-12-24 19:37:01 +01:00
Artur Barseghyan
b67374dfb3 added example project and helper scripts 2013-12-24 19:30:30 +01:00
Camilo Nova
778f208cc1 Release 1.3.6 2013-11-23 11:17:15 -05:00
Camilo Nova
19182a4b43 Improved formatting 2013-11-07 19:08:16 -05:00
Camilo Nova
03c8282f89 Updated repository url and made some cleanup 2013-11-07 19:01:56 -05:00
Camilo Nova
38689a550d Added missing import 2013-11-07 18:54:35 -05:00
Camilo Nova
46c13b87de Updated django package version 2013-11-07 18:51:17 -05:00
Camilo Nova
38a9fcf4c9 Merge pull request #53 from camilonova/reset-trusted-users
Improved axes_reset command. Fixes #52
2013-11-07 15:46:57 -08:00
Camilo Nova
20ffed0fc4 Fixed conflict 2013-11-07 18:45:56 -05:00
Camilo Nova
50408ba3aa Added AttributeError in case get_profile doesn't exist 2013-11-07 15:30:22 -05:00
Alex Clark ☺
6f84ed7483 Merge pull request #61 from graingert/master
complete a zest.releaser fullrelease
2013-11-01 05:17:10 -07:00
Thomas Grainger
ecfee34598 Back to development: 1.3.6 2013-11-01 12:07:50 +00:00
Thomas Grainger
8ee1e138e4 Preparing release 1.3.5 2013-11-01 12:07:30 +00:00
Thomas Grainger
89548fd373 add history 2013-11-01 12:07:15 +00:00
Thomas Grainger
d524e3f3e9 pull version from the correct package 2013-11-01 12:02:56 +00:00
Thomas Grainger
b06498d8f3 Back to development: 1.3.5 2013-11-01 11:48:47 +00:00
Thomas Grainger
e3325d2f74 Preparing release 1.3.4 2013-11-01 11:48:08 +00:00
Alex Clark ☺
16cc393ad2 Merge pull request #60 from graingert/master
reverse version loading direction to support zest.releaser
2013-11-01 04:41:03 -07:00
Thomas Grainger
e1af717ce1 reverse version loading direction to support zest.releaser 2013-11-01 11:20:02 +00:00
Alex Clark ☺
5068510159 Merge pull request #59 from graingert/master
complete a zest.releaser prerelease in preparation for a fullrelease
2013-11-01 04:13:32 -07:00
Thomas Grainger
702358b87c add history 2013-11-01 10:45:43 +00:00
Thomas Grainger
1c85247cc0 Back to development: 1.3.4 2013-11-01 10:43:31 +00:00
Alex Clark ☺
e175553129 Merge pull request #57 from graingert/patch-1
update PyPI URL
2013-10-31 03:20:09 -07:00
Thomas Grainger
c2feae329b update PyPI URL 2013-10-31 10:01:54 +00:00
Camilo Nova
85a398569b Update travis url 2013-10-22 12:24:47 -05:00
Alex Clark ☺
0d4bb465b0 Merge pull request #56 from martey/axeslog404
Remove reference to axes.log in README.
2013-10-11 14:14:54 -07:00