Commit graph

283 commits

Author SHA1 Message Date
Joost Cassee
c6f24decb5 Add changelog entry for last commit, bump version 2015-05-17 15:13:51 +02:00
Peter Bittner
3f22d2881f Merge pull request #60 from mgaitan/update_setup
mark the package python 3 compatible
2015-05-15 23:14:48 +02:00
Martín Gaitán
8838b97167 mark the package python 3 compatible 2015-05-15 11:11:46 -03:00
Joost Cassee
f391a1d27c Merge pull request #58 from jcassee/remove-wrong-branch-name-from-build-status-badge
Remove wrong branch name from Build Status badge
2015-04-27 22:00:39 +02:00
Joost Cassee
8fd4361bfe Merge pull request #57 from jcassee/flake8-code-not-tests
Fix flake8 complaints (except for templatetags and tests)
2015-04-27 22:00:18 +02:00
Peter Bittner
b002debe67 Remove wrong branch name from Build Status badge
* Travis/Github sometimes yields a broken badge image with a query parameter (should now be better)
* The image's ALT text was "develop", which is wrong of course
2015-04-25 02:20:22 +02:00
Peter Bittner
88a7cb625f Fix line-too-long complaints (flake8) 2015-04-25 02:00:39 +02:00
Peter Bittner
99ce2f5fcb Merge branch 'master' into flake8-code-not-tests 2015-04-25 01:49:55 +02:00
Joost Cassee
9792c6c531 Merge pull request #56 from jcassee/beautiful-badges
Add beautiful badges to README
2015-04-23 10:58:01 +02:00
Peter Bittner
7c02c9364c Fix typo 2015-04-23 01:38:00 +02:00
Peter Bittner
b968f12c4e Add beautiful badges to README
Clickable badges:

* current PyPI package version number
* Travis-CI build status
* downloads per month from PyPI
* license info
2015-04-23 01:33:41 +02:00
Joost Cassee
4fc1f74319 Update changelog with Django 1.8 compatibility 2015-04-21 01:15:06 +02:00
Joost Cassee
f2f0f34076 Merge pull request #55 from jcassee/test-with-django-18-too
Also test with Django 1.8 (Travis-CI)
2015-04-21 01:10:56 +02:00
Peter Bittner
001d44b10f Make Travis-CI use Tox for test matrix execution
see http://jsatt.com/blog/using-tox-with-travis-ci-to-test-django-apps/
2015-04-21 00:20:02 +02:00
Peter Bittner
8103e5d94a Refactor tox.ini with conditional settings
see https://testrun.org/tox/latest/config.html#generating-environments-conditional-settings

Also test Django 1.8 with tox
2015-04-21 00:00:12 +02:00
Peter Bittner
58d83fe5aa Indentation corrections (PEP8)
Correct all flake8 complaints except: in tests, in templatetags, E501 line too long
2015-04-20 23:08:19 +02:00
Peter Bittner
fa3cdf108c Also test with Django 1.8 (Travis-CI)
Plus white-space changes to match typically used YAML syntax (indentation of lists).

This commit may close issue #54 if all goes well.
2015-04-20 22:36:59 +02:00
Joost Cassee
e46804810f Merge pull request #53 from jcassee/update-readme-co-maintainer
Update README (co-maintainer, headers)
2015-04-20 14:58:46 +02:00
Peter Bittner
79051b28a7 Move link to correct section 2015-04-20 14:42:23 +02:00
Peter Bittner
d99146da0b Remove co-maintainer note, add headers 2015-04-20 14:38:37 +02:00
Joost Cassee
e44141be80 Update Clickmap id regular expression 2015-04-19 11:08:26 +02:00
Joost Cassee
72b17165cb Update intersphinx mapping to Django 1.8 2015-04-19 10:51:20 +02:00
Joost Cassee
adb184adfd Update changelog and bump version 2015-04-19 10:49:25 +02:00
Joost Cassee
aab1cfc508 Merge pull request #52 from amadornimbis/master
Adding python 3 compatibility
2015-04-19 10:36:06 +02:00
Eric Amador
e5f88b543f django 1.4 doesn't have python 3.x support. 2015-04-18 01:13:36 -04:00
Eric Amador
5855a1693a django 1.4 doesn't have python 3.x support. 2015-04-18 01:11:43 -04:00
Eric Amador
ff25a20ab7 Adding python 3.3 and 3.4 to Travis. 2015-04-18 00:58:42 -04:00
Eric Amador
67f29fdb2b Use assertRaisesRegex when available. 2015-04-18 00:42:54 -04:00
Eric Amador
dcf51bc6ca assertEqual was deprecated in python 3.2 2015-04-18 00:33:56 -04:00
Eric Amador
dc031d9e01 Make exception handling python 3 compatible. 2015-04-18 00:22:38 -04:00
Eric Amador
b8aa694d07 Updating tox file for python 3.3 and 3.4. Removing unused targets. 2015-04-18 00:22:11 -04:00
Joost Cassee
871a6efd1b Add note about looking for a maintainer 2015-03-09 20:51:42 +01:00
Joost Cassee
d1b28ef809 Update intersphinx links to Django 1.7 2015-03-09 20:51:28 +01:00
Joost Cassee
31b06af0ce Update changelog, authors and version 2015-03-09 20:51:14 +01:00
Joost Cassee
c5c886d5bf Fix up docs style 2015-03-09 20:50:54 +01:00
Joost Cassee
54d922496d Merge pull request #50 from mgaitan/mixpanel_identify
update mixpanel indetify code.
2015-03-09 20:36:13 +01:00
Joost Cassee
fe608af67c Merge pull request #49 from craigbruce/master
Add Django 1.7 support
2015-03-09 20:34:09 +01:00
Joost Cassee
abb8e4cbbf Merge pull request #48 from mgaitan/uservoice_identify_users
Identifying authenticated users in Uservoice
2015-03-09 20:32:45 +01:00
Joost Cassee
447ea49f98 Merge pull request #45 from 7wonders/master
Fixes #44
2015-03-09 20:32:12 +01:00
Joost Cassee
6f65f836d0 Merge pull request #43 from bittner/master
Corrected verb, added link to PRs
2015-03-09 20:31:41 +01:00
Martín Gaitán
e1bfe4c40a send user properties 2014-09-19 13:22:50 -03:00
Martín Gaitán
b8f1203bca update test 2014-09-09 09:02:42 -03:00
Martín Gaitán
6992f170de update test 2014-09-09 09:01:43 -03:00
Martín Gaitán
3f31081113 update mixpanel indetify code. See https://mixpanel.com/help/reference/javascript-full-api-reference#mixpanel.identify for reference 2014-09-09 08:58:56 -03:00
Craig Bruce
51a08742c5 removed custom override_settings, using django instead. Removed with/without app decorators as only use in a few places. Updated all tests to use django provided override_settings. 2014-09-05 12:26:08 -07:00
Craig Bruce
3e417d0357 added Django 1.7 to tox and travis 2014-09-05 11:42:31 -07:00
Craig Bruce
c929410aef incorrect variable names/syntax (this should not of worked) 2014-09-05 11:40:00 -07:00
Craig Bruce
38b9cc70e6 fixed various typos, this would of failed previously 2014-09-05 11:23:20 -07:00
Craig Bruce
7ccd84d1d3 added default middleware for django 1.7 2014-09-05 11:22:25 -07:00
Craig Bruce
33af2c6184 minor pep8 fix 2014-09-05 10:32:10 -07:00