Joost Cassee
af4f5ab675
Fix Tox configuration in .travis.yml
2014-04-29 01:27:38 +02:00
Joost Cassee
12a24c0d17
Small fixes to tox and docs
...
- Remove testing environments for Django 1.2 and 1.3
- Update Django Sphinx links to 1.6
- Fix docs warning in intercom.rst
2014-04-29 01:21:40 +02:00
Joost Cassee
f70b3e6132
Fix typo in tox.ini
2014-04-29 01:17:41 +02:00
Joost Cassee
54a4c67a07
Add Django 1.6 to Tox environments
2014-04-29 01:14:04 +02:00
Joost Cassee
cef2956edb
Merge branch 'master' of github.com:greenkahuna/django-analytical into greenkahuna-master
2014-04-29 01:05:22 +02:00
skoczen
7751777b4e
Fixes up extra slashes.
2014-04-28 15:54:39 -07:00
skoczen
559cd3677f
sort_keys all the things!
2014-04-28 15:52:36 -07:00
Joost Cassee
0ba4bc4456
Remove reference to simplejson
2014-04-28 23:19:44 +02:00
Joost Cassee
da01567365
Add Martín Gaitán to authors list
2014-04-28 22:58:04 +02:00
Joost Cassee
2b323bdb72
Merge branch 'uservoice' of github.com:mgaitan/django-analytical into mgaitan-uservoice
2014-04-28 22:53:26 +02:00
skoczen
a94f0d8bb0
Adds support for custom variables, in a similar pattern to woopra's tag.
2014-04-28 10:10:23 -07:00
skoczen
6ebdb3de98
Properly moves to body_bottom.
2014-04-25 10:48:18 -07:00
skoczen
d76a0981b8
Adds intercom.io support, fixes inconsent fails from json ordering.
2014-04-25 10:46:30 -07:00
Joost Cassee
6763d3e06b
Merge pull request #33 from craigbruce/master
...
Replaced simplejson with json
2013-12-20 01:54:41 -08:00
Craig Bruce
90ff353de2
replaced simplejson with json
2013-12-19 22:00:28 -07:00
Martín Gaitán
ba2c13c57c
assertIn fallback for py2.6/dj1.2
2013-11-26 20:34:33 -03:00
Martín Gaitán
064dd5b681
empty key returns no code
2013-11-26 20:18:48 -03:00
Martín Gaitán
010612b115
update tests
2013-11-26 14:49:45 -03:00
Martín Gaitán
afcda9e8bd
updating tests
2013-11-26 14:34:31 -03:00
Martín Gaitán
b83f1b5c1a
doc typo
2013-11-26 14:16:47 -03:00
Martín Gaitán
e781f3ed93
trigger custom
2013-11-26 14:15:29 -03:00
Martín Gaitán
e1983ad8a9
flatten confiuration. update doc
2013-11-26 13:55:46 -03:00
Martín Gaitán
d24802b358
update docs
2013-11-26 12:44:05 -03:00
Martín Gaitán
63020a2062
Updated uservoice service tracking code.
...
Now all custom options are in `USERVOICE_WIDGET_OPTIONS`. This could be overriden per-view
with a `uservoice_widget_option` context variable.
For example, to override the default trigger position you could set:
USERVOICE_WIDGET_OPTIONS = (('addTrigger',
{"trigger_position": "bottom-left",
"mode": "contact"}),)
`USERVOICE_WIDGET_OPTIONS` accepts any Uservoice's JS SDK configuration
See https://developer.uservoice.com/docs/widgets/overview/
2013-11-26 12:18:12 -03:00
Joost Cassee
be591d66f1
Create Travis-CI configuration
2013-11-21 15:12:20 +01:00
Joost Cassee
02d5664705
Fix Max Arnold's name in changelog
2013-11-21 14:10:34 +01:00
Joost Cassee
6343b103f3
Bump version and update changelog
2013-11-19 07:44:55 +01:00
Joost Cassee
1b647249e6
Merge pull request #31 from max-arnold/master
...
Add support for GA Display Advertising features
2013-11-18 22:42:06 -08:00
Max Arnold
2a13008ffc
improve variable names and snippet readability
2013-11-19 10:07:55 +07:00
Max Arnold
440d078d86
add support for GA Display Advertising features
...
https://support.google.com/analytics/answer/3450482
The Google Analytics Display Advertising features include the following:
- Demographics and Interests reporting
- Remarketing with Google Analytics
- DoubleClick Campaign Manager integration (for Google Analytics Premium)
2013-10-26 10:17:38 +07:00
Joost Cassee
11719a99f6
Fix Reinvigorate link
...
reinvigorate.com -> reinvigorate.net
2013-07-17 23:21:33 +02:00
Joost Cassee
8e3c6ef34d
Update Sphinx links to Django 1.5 and Python 2.7
2013-04-11 04:07:17 +02:00
Joost Cassee
b5b4716db8
Update Clickmap integration and changelog
2013-04-11 04:02:50 +02:00
Joost Cassee
5dacedf9a4
Merge https://github.com/arteria/django-analytical
2013-04-11 03:51:48 +02:00
Joost Cassee
9fb770953d
Merge pull request #25 from sidmitra/master
...
Upgrading mixpanel js script code to v2.1
2013-04-10 18:37:38 -07:00
Walter Renner
a631acb591
Added tests for Clickmap integration
2013-04-05 14:23:34 +02:00
Walter Renner
fe12e97fba
Added documentation for Clickmap integration
2013-04-05 13:55:00 +02:00
Sid Mitra
480b92c326
Upgrading mixpanel js script code to v2.2
2013-04-05 01:30:34 +05:30
Joost Cassee
e1242f37d1
Update changelog
2013-03-25 01:12:23 +01:00
Joost Cassee
c2f9713a6c
Bump version
2013-03-25 01:10:26 +01:00
Joost Cassee
341b57f683
Merge branch 'master' of github.com:jcassee/django-analytical
2013-03-25 01:10:15 +01:00
Joost Cassee
7870252ba2
Merge pull request #23 from tinnet/feature/django1.5-testing-in-tox
...
Add django 1.5 to tox
2013-03-24 17:09:37 -07:00
Joost Cassee
f8cf9d39a7
Update version and changelog
2013-03-25 00:58:14 +01:00
Joost Cassee
782c8d90cf
Merge branch 'master' of github.com:jcassee/django-analytical
2013-03-25 00:50:15 +01:00
Joost Cassee
cb71b7ca0a
Merge pull request #22 from tinnet/feature/ga-anonymize-ip
...
Add 'IP Anonymization' setting to GA tracking pixel
2013-03-24 16:34:18 -07:00
Joost Cassee
a57fd27164
Add reminder to UserVoice docs
2013-03-25 00:25:17 +01:00
Tinnet Coronam
f11a35e4ed
use final django 1.5
2013-03-08 16:32:52 +01:00
Tinnet Coronam
a88d7272a6
added documentation for ANONYMIZE_IP
2013-03-08 16:04:12 +01:00
Tinnet Coronam
f4f99f6d6d
add test for ip anonymization
2013-01-14 09:25:31 +01:00
Tinnet Coronam
2fd6dc1f77
add ip anonymization setting to google analytics
2013-01-14 09:18:27 +01:00