django 1.9 fixes - #23

Open
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop
Open

django 1.9 fixes#23
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop

Conversation

@theromis

@theromistheromis commented Dec 16, 2015

Copy link
Copy Markdown

No description provided.

Bogdan Klichukand others added 30 commits August 22, 2011 19:17
Bogdan Klichuk
Resolved problem with circ dep (app_directories.Loader)
45d39a6
Bogdan Klichuk
Added south migrations
5c090eb
@svetlyak40wt
added visitor to admin interface to capture IPs for banning
69ab8d2
@jmichelsen
added visitor to admin interface to capture IPs for banning
41488a5
@jmichelsen
Merge branch 'master' of github.com:jmichelsen/django-tracking
5af4a51
@jspiros
Added support for Django 1.4+ time-zone-aware datetimes by using djan…
2f9cfe9
…go.utils.timezone.now() in place of datetime.datetime.now() where available.
@jspiros
Merge branch 'develop'
f700d74
* develop:
Added support for Django 1.4+ time-zone-aware datetimes by using django.utils.timezone.now() in place of datetime.datetime.now() where available.
Daryl Antony
settings.AUTH_USER_MODEL
a292a37
Daryl Antony
hardcode tracking version
3e21cf1
@nkeilar
listeners depends on Django which isn't installed for in fres environ…
fbec0f9
…ment
Patrick Craston
Make compatible with Django 1.6
1fe2340
Patrick Craston
Port compatibility fix for Django 1.5
e140fb2
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
Make compatible with latest Django
10a593f
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
update changes
1f56494
Stephen J. Fuhry
gitignore
88865bb
Stephen J. Fuhry
don't need this import
d69833a
Stephen J. Fuhry
HAS_GEOIP doesn't seem to exist anymore
9444460
jonykwa
Fixed Django 1.6 error: cannot import name HAS_GEOIP
092c42a
jonykwa
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
177a469
jonykwa
Update urls.py
57058d9
compatibility with Django1.6
@jlachowski
catch Integrity exception added
dd3a666
@jlachowski
missing import added
f22e5df
@jlachowski
rollback & safe point added
bf247a2
@jlachowski
pip install update
5fbb3c6
@jlachowski
version bump
af14719
@jlachowski
packet name change
b7b4793
@jlachowski
Merge branch 'master' of github.com:jlachowski/django-tracking
693d5ca
@ramusus
merged with 0.4.1 version from bitbucket
63129a5
@glossarytingtun
Fixing the issue with timezone aware timestamps
1697b56
@glossarytingtun
Fixing tracking pkg dependency error
27345aa
bashuand others added 22 commits September 19, 2015 08:46
@bashu
Merge branch 'jmichelsen-master' into develop
f3c3e3c
* jmichelsen-master:
added visitor to admin interface to capture IPs for banning
added visitor to admin interface to capture IPs for banning
@bashu
resolving conflicts
0a1e52b
@bashu
Merge branch 'commoncode-master' into develop
ddcd83f
* commoncode-master:
hardcode tracking version
settings.AUTH_USER_MODEL
@bashu
Merge branch 'master' ofhttps://github.com/madteckhead/django-tracking…
374c401
… into madteckhead-master
* 'master' of https://github.com/madteckhead/django-tracking:
listeners depends on Django which isn't installed for in fres environment
@bashu
Merge branch 'madteckhead-master' into develop
5a21f20
* madteckhead-master:
listeners depends on Django which isn't installed for in fres environment
@bashu
resolving conflicts
ee85014
@bashu
Merge branch 'MontmereLimited-master' into develop
05c7a2b
* MontmereLimited-master:
HAS_GEOIP doesn't seem to exist anymore
don't need this import
gitignore
@bashu
resolving conflicts
272c6c4
@bashu
Merge branch 'stewiegaribaldi-master' into develop
0b9e29a
* stewiegaribaldi-master:
Update urls.py
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
Fixed Django 1.6 error: cannot import name HAS_GEOIP
@bashu
resolving conflicts
27b2280
@bashu
Merge branch 'ramusus-master' into develop
0200fb3
* ramusus-master:
merged with 0.4.1 version from bitbucket
@bashu
resolving conflicts
f39c518
@bashu
Merge branch 'pythonhacker-master' into develop
78be201
* pythonhacker-master:
version.py for versioning
Fixing tracking pkg dependency error
Fixing the issue with timezone aware timestamps
@bashu
resolving conflicts
b84f90b
@bashu
Merge branch 'pcraston-master' into develop
09a7474
* pcraston-master:
update changes
Make compatible with latest Django
Port compatibility fix for Django 1.5
Make compatible with Django 1.6
@bashu
resolving conflicts
82f7095
@bashu
Merge branch 'bkeating-master' into develop
aec31a9
* bkeating-master:
Removed rogue character
``IPAddressField`` is now ``GenericIPAddressField``
``get_query_set`` is now ``get_queryset``
packet name change
version bump
pip install update
rollback & safe point added
missing import added
catch Integrity exception added
@bashu
Update .landscape.yaml
f6883f8
@theromis
django 1.9 fixes
d843ba6
@theromis
fix for multibyte
ec42d3e
@theromis
fix for right base
9140ff4
@theromis
user name can not exist
47fd398
@ghost

ghost commented Apr 7, 2016

Copy link
Copy Markdown

thanks! worked great for me in 1.9

@theromis

theromis commented May 4, 2016

Copy link
Copy Markdown
Author

if everything works fin may be good idea to merge and close pull request?

@theromis

theromis commented May 18, 2016

Copy link
Copy Markdown
Author

could you merge my changes?

@theromis

theromis commented May 8, 2017

Copy link
Copy Markdown
Author

have new IPv^ fix, is it possible to merge? @detimirikajidedo

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@theromis@Gun1tSurya@svetlyak40wt@jmichelsen@jspiros@nkeilar@jlachowski@ramusus@glossarytingtun@bkeating@bashu
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

django 1.9 fixes - #23

Open
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop
Open

django 1.9 fixes#23
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop

Conversation

@theromis

@theromistheromis commented Dec 16, 2015

Copy link
Copy Markdown

No description provided.

Bogdan Klichukand others added 30 commits August 22, 2011 19:17
Bogdan Klichuk
Resolved problem with circ dep (app_directories.Loader)
45d39a6
Bogdan Klichuk
Added south migrations
5c090eb
@svetlyak40wt
added visitor to admin interface to capture IPs for banning
69ab8d2
@jmichelsen
added visitor to admin interface to capture IPs for banning
41488a5
@jmichelsen
Merge branch 'master' of github.com:jmichelsen/django-tracking
5af4a51
@jspiros
Added support for Django 1.4+ time-zone-aware datetimes by using djan…
2f9cfe9
…go.utils.timezone.now() in place of datetime.datetime.now() where available.
@jspiros
Merge branch 'develop'
f700d74
* develop:
Added support for Django 1.4+ time-zone-aware datetimes by using django.utils.timezone.now() in place of datetime.datetime.now() where available.
Daryl Antony
settings.AUTH_USER_MODEL
a292a37
Daryl Antony
hardcode tracking version
3e21cf1
@nkeilar
listeners depends on Django which isn't installed for in fres environ…
fbec0f9
…ment
Patrick Craston
Make compatible with Django 1.6
1fe2340
Patrick Craston
Port compatibility fix for Django 1.5
e140fb2
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
Make compatible with latest Django
10a593f
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
update changes
1f56494
Stephen J. Fuhry
gitignore
88865bb
Stephen J. Fuhry
don't need this import
d69833a
Stephen J. Fuhry
HAS_GEOIP doesn't seem to exist anymore
9444460
jonykwa
Fixed Django 1.6 error: cannot import name HAS_GEOIP
092c42a
jonykwa
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
177a469
jonykwa
Update urls.py
57058d9
compatibility with Django1.6
@jlachowski
catch Integrity exception added
dd3a666
@jlachowski
missing import added
f22e5df
@jlachowski
rollback & safe point added
bf247a2
@jlachowski
pip install update
5fbb3c6
@jlachowski
version bump
af14719
@jlachowski
packet name change
b7b4793
@jlachowski
Merge branch 'master' of github.com:jlachowski/django-tracking
693d5ca
@ramusus
merged with 0.4.1 version from bitbucket
63129a5
@glossarytingtun
Fixing the issue with timezone aware timestamps
1697b56
@glossarytingtun
Fixing tracking pkg dependency error
27345aa
bashuand others added 22 commits September 19, 2015 08:46
@bashu
Merge branch 'jmichelsen-master' into develop
f3c3e3c
* jmichelsen-master:
added visitor to admin interface to capture IPs for banning
added visitor to admin interface to capture IPs for banning
@bashu
resolving conflicts
0a1e52b
@bashu
Merge branch 'commoncode-master' into develop
ddcd83f
* commoncode-master:
hardcode tracking version
settings.AUTH_USER_MODEL
@bashu
Merge branch 'master' ofhttps://github.com/madteckhead/django-tracking…
374c401
… into madteckhead-master
* 'master' of https://github.com/madteckhead/django-tracking:
listeners depends on Django which isn't installed for in fres environment
@bashu
Merge branch 'madteckhead-master' into develop
5a21f20
* madteckhead-master:
listeners depends on Django which isn't installed for in fres environment
@bashu
resolving conflicts
ee85014
@bashu
Merge branch 'MontmereLimited-master' into develop
05c7a2b
* MontmereLimited-master:
HAS_GEOIP doesn't seem to exist anymore
don't need this import
gitignore
@bashu
resolving conflicts
272c6c4
@bashu
Merge branch 'stewiegaribaldi-master' into develop
0b9e29a
* stewiegaribaldi-master:
Update urls.py
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
Fixed Django 1.6 error: cannot import name HAS_GEOIP
@bashu
resolving conflicts
27b2280
@bashu
Merge branch 'ramusus-master' into develop
0200fb3
* ramusus-master:
merged with 0.4.1 version from bitbucket
@bashu
resolving conflicts
f39c518
@bashu
Merge branch 'pythonhacker-master' into develop
78be201
* pythonhacker-master:
version.py for versioning
Fixing tracking pkg dependency error
Fixing the issue with timezone aware timestamps
@bashu
resolving conflicts
b84f90b
@bashu
Merge branch 'pcraston-master' into develop
09a7474
* pcraston-master:
update changes
Make compatible with latest Django
Port compatibility fix for Django 1.5
Make compatible with Django 1.6
@bashu
resolving conflicts
82f7095
@bashu
Merge branch 'bkeating-master' into develop
aec31a9
* bkeating-master:
Removed rogue character
``IPAddressField`` is now ``GenericIPAddressField``
``get_query_set`` is now ``get_queryset``
packet name change
version bump
pip install update
rollback & safe point added
missing import added
catch Integrity exception added
@bashu
Update .landscape.yaml
f6883f8
@theromis
django 1.9 fixes
d843ba6
@theromis
fix for multibyte
ec42d3e
@theromis
fix for right base
9140ff4
@theromis
user name can not exist
47fd398
@ghost

ghost commented Apr 7, 2016

Copy link
Copy Markdown

thanks! worked great for me in 1.9

@theromis

theromis commented May 4, 2016

Copy link
Copy Markdown
Author

if everything works fin may be good idea to merge and close pull request?

@theromis

theromis commented May 18, 2016

Copy link
Copy Markdown
Author

could you merge my changes?

@theromis

theromis commented May 8, 2017

Copy link
Copy Markdown
Author

have new IPv^ fix, is it possible to merge? @detimirikajidedo

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@theromis@Gun1tSurya@svetlyak40wt@jmichelsen@jspiros@nkeilar@jlachowski@ramusus@glossarytingtun@bkeating@bashu
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

django 1.9 fixes - #23

Open
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop
Open

django 1.9 fixes#23
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop

Conversation

@theromis

@theromistheromis commented Dec 16, 2015

Copy link
Copy Markdown

No description provided.

Bogdan Klichukand others added 30 commits August 22, 2011 19:17
Bogdan Klichuk
Resolved problem with circ dep (app_directories.Loader)
45d39a6
Bogdan Klichuk
Added south migrations
5c090eb
@svetlyak40wt
added visitor to admin interface to capture IPs for banning
69ab8d2
@jmichelsen
added visitor to admin interface to capture IPs for banning
41488a5
@jmichelsen
Merge branch 'master' of github.com:jmichelsen/django-tracking
5af4a51
@jspiros
Added support for Django 1.4+ time-zone-aware datetimes by using djan…
2f9cfe9
…go.utils.timezone.now() in place of datetime.datetime.now() where available.
@jspiros
Merge branch 'develop'
f700d74
* develop:
Added support for Django 1.4+ time-zone-aware datetimes by using django.utils.timezone.now() in place of datetime.datetime.now() where available.
Daryl Antony
settings.AUTH_USER_MODEL
a292a37
Daryl Antony
hardcode tracking version
3e21cf1
@nkeilar
listeners depends on Django which isn't installed for in fres environ…
fbec0f9
…ment
Patrick Craston
Make compatible with Django 1.6
1fe2340
Patrick Craston
Port compatibility fix for Django 1.5
e140fb2
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
Make compatible with latest Django
10a593f
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
update changes
1f56494
Stephen J. Fuhry
gitignore
88865bb
Stephen J. Fuhry
don't need this import
d69833a
Stephen J. Fuhry
HAS_GEOIP doesn't seem to exist anymore
9444460
jonykwa
Fixed Django 1.6 error: cannot import name HAS_GEOIP
092c42a
jonykwa
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
177a469
jonykwa
Update urls.py
57058d9
compatibility with Django1.6
@jlachowski
catch Integrity exception added
dd3a666
@jlachowski
missing import added
f22e5df
@jlachowski
rollback & safe point added
bf247a2
@jlachowski
pip install update
5fbb3c6
@jlachowski
version bump
af14719
@jlachowski
packet name change
b7b4793
@jlachowski
Merge branch 'master' of github.com:jlachowski/django-tracking
693d5ca
@ramusus
merged with 0.4.1 version from bitbucket
63129a5
@glossarytingtun
Fixing the issue with timezone aware timestamps
1697b56
@glossarytingtun
Fixing tracking pkg dependency error
27345aa
bashuand others added 22 commits September 19, 2015 08:46
@bashu
Merge branch 'jmichelsen-master' into develop
f3c3e3c
* jmichelsen-master:
added visitor to admin interface to capture IPs for banning
added visitor to admin interface to capture IPs for banning
@bashu
resolving conflicts
0a1e52b
@bashu
Merge branch 'commoncode-master' into develop
ddcd83f
* commoncode-master:
hardcode tracking version
settings.AUTH_USER_MODEL
@bashu
Merge branch 'master' ofhttps://github.com/madteckhead/django-tracking…
374c401
… into madteckhead-master
* 'master' of https://github.com/madteckhead/django-tracking:
listeners depends on Django which isn't installed for in fres environment
@bashu
Merge branch 'madteckhead-master' into develop
5a21f20
* madteckhead-master:
listeners depends on Django which isn't installed for in fres environment
@bashu
resolving conflicts
ee85014
@bashu
Merge branch 'MontmereLimited-master' into develop
05c7a2b
* MontmereLimited-master:
HAS_GEOIP doesn't seem to exist anymore
don't need this import
gitignore
@bashu
resolving conflicts
272c6c4
@bashu
Merge branch 'stewiegaribaldi-master' into develop
0b9e29a
* stewiegaribaldi-master:
Update urls.py
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
Fixed Django 1.6 error: cannot import name HAS_GEOIP
@bashu
resolving conflicts
27b2280
@bashu
Merge branch 'ramusus-master' into develop
0200fb3
* ramusus-master:
merged with 0.4.1 version from bitbucket
@bashu
resolving conflicts
f39c518
@bashu
Merge branch 'pythonhacker-master' into develop
78be201
* pythonhacker-master:
version.py for versioning
Fixing tracking pkg dependency error
Fixing the issue with timezone aware timestamps
@bashu
resolving conflicts
b84f90b
@bashu
Merge branch 'pcraston-master' into develop
09a7474
* pcraston-master:
update changes
Make compatible with latest Django
Port compatibility fix for Django 1.5
Make compatible with Django 1.6
@bashu
resolving conflicts
82f7095
@bashu
Merge branch 'bkeating-master' into develop
aec31a9
* bkeating-master:
Removed rogue character
``IPAddressField`` is now ``GenericIPAddressField``
``get_query_set`` is now ``get_queryset``
packet name change
version bump
pip install update
rollback & safe point added
missing import added
catch Integrity exception added
@bashu
Update .landscape.yaml
f6883f8
@theromis
django 1.9 fixes
d843ba6
@theromis
fix for multibyte
ec42d3e
@theromis
fix for right base
9140ff4
@theromis
user name can not exist
47fd398
@ghost

ghost commented Apr 7, 2016

Copy link
Copy Markdown

thanks! worked great for me in 1.9

@theromis

theromis commented May 4, 2016

Copy link
Copy Markdown
Author

if everything works fin may be good idea to merge and close pull request?

@theromis

theromis commented May 18, 2016

Copy link
Copy Markdown
Author

could you merge my changes?

@theromis

theromis commented May 8, 2017

Copy link
Copy Markdown
Author

have new IPv^ fix, is it possible to merge? @detimirikajidedo

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@theromis@Gun1tSurya@svetlyak40wt@jmichelsen@jspiros@nkeilar@jlachowski@ramusus@glossarytingtun@bkeating@bashu
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

django 1.9 fixes - #23

Open
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop
Open

django 1.9 fixes#23
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop

Conversation

@theromis

@theromistheromis commented Dec 16, 2015

Copy link
Copy Markdown

No description provided.

Bogdan Klichukand others added 30 commits August 22, 2011 19:17
Bogdan Klichuk
Resolved problem with circ dep (app_directories.Loader)
45d39a6
Bogdan Klichuk
Added south migrations
5c090eb
@svetlyak40wt
added visitor to admin interface to capture IPs for banning
69ab8d2
@jmichelsen
added visitor to admin interface to capture IPs for banning
41488a5
@jmichelsen
Merge branch 'master' of github.com:jmichelsen/django-tracking
5af4a51
@jspiros
Added support for Django 1.4+ time-zone-aware datetimes by using djan…
2f9cfe9
…go.utils.timezone.now() in place of datetime.datetime.now() where available.
@jspiros
Merge branch 'develop'
f700d74
* develop:
Added support for Django 1.4+ time-zone-aware datetimes by using django.utils.timezone.now() in place of datetime.datetime.now() where available.
Daryl Antony
settings.AUTH_USER_MODEL
a292a37
Daryl Antony
hardcode tracking version
3e21cf1
@nkeilar
listeners depends on Django which isn't installed for in fres environ…
fbec0f9
…ment
Patrick Craston
Make compatible with Django 1.6
1fe2340
Patrick Craston
Port compatibility fix for Django 1.5
e140fb2
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
Make compatible with latest Django
10a593f
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
update changes
1f56494
Stephen J. Fuhry
gitignore
88865bb
Stephen J. Fuhry
don't need this import
d69833a
Stephen J. Fuhry
HAS_GEOIP doesn't seem to exist anymore
9444460
jonykwa
Fixed Django 1.6 error: cannot import name HAS_GEOIP
092c42a
jonykwa
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
177a469
jonykwa
Update urls.py
57058d9
compatibility with Django1.6
@jlachowski
catch Integrity exception added
dd3a666
@jlachowski
missing import added
f22e5df
@jlachowski
rollback & safe point added
bf247a2
@jlachowski
pip install update
5fbb3c6
@jlachowski
version bump
af14719
@jlachowski
packet name change
b7b4793
@jlachowski
Merge branch 'master' of github.com:jlachowski/django-tracking
693d5ca
@ramusus
merged with 0.4.1 version from bitbucket
63129a5
@glossarytingtun
Fixing the issue with timezone aware timestamps
1697b56
@glossarytingtun
Fixing tracking pkg dependency error
27345aa
bashuand others added 22 commits September 19, 2015 08:46
@bashu
Merge branch 'jmichelsen-master' into develop
f3c3e3c
* jmichelsen-master:
added visitor to admin interface to capture IPs for banning
added visitor to admin interface to capture IPs for banning
@bashu
resolving conflicts
0a1e52b
@bashu
Merge branch 'commoncode-master' into develop
ddcd83f
* commoncode-master:
hardcode tracking version
settings.AUTH_USER_MODEL
@bashu
Merge branch 'master' ofhttps://github.com/madteckhead/django-tracking…
374c401
… into madteckhead-master
* 'master' of https://github.com/madteckhead/django-tracking:
listeners depends on Django which isn't installed for in fres environment
@bashu
Merge branch 'madteckhead-master' into develop
5a21f20
* madteckhead-master:
listeners depends on Django which isn't installed for in fres environment
@bashu
resolving conflicts
ee85014
@bashu
Merge branch 'MontmereLimited-master' into develop
05c7a2b
* MontmereLimited-master:
HAS_GEOIP doesn't seem to exist anymore
don't need this import
gitignore
@bashu
resolving conflicts
272c6c4
@bashu
Merge branch 'stewiegaribaldi-master' into develop
0b9e29a
* stewiegaribaldi-master:
Update urls.py
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
Fixed Django 1.6 error: cannot import name HAS_GEOIP
@bashu
resolving conflicts
27b2280
@bashu
Merge branch 'ramusus-master' into develop
0200fb3
* ramusus-master:
merged with 0.4.1 version from bitbucket
@bashu
resolving conflicts
f39c518
@bashu
Merge branch 'pythonhacker-master' into develop
78be201
* pythonhacker-master:
version.py for versioning
Fixing tracking pkg dependency error
Fixing the issue with timezone aware timestamps
@bashu
resolving conflicts
b84f90b
@bashu
Merge branch 'pcraston-master' into develop
09a7474
* pcraston-master:
update changes
Make compatible with latest Django
Port compatibility fix for Django 1.5
Make compatible with Django 1.6
@bashu
resolving conflicts
82f7095
@bashu
Merge branch 'bkeating-master' into develop
aec31a9
* bkeating-master:
Removed rogue character
``IPAddressField`` is now ``GenericIPAddressField``
``get_query_set`` is now ``get_queryset``
packet name change
version bump
pip install update
rollback & safe point added
missing import added
catch Integrity exception added
@bashu
Update .landscape.yaml
f6883f8
@theromis
django 1.9 fixes
d843ba6
@theromis
fix for multibyte
ec42d3e
@theromis
fix for right base
9140ff4
@theromis
user name can not exist
47fd398
@ghost

ghost commented Apr 7, 2016

Copy link
Copy Markdown

thanks! worked great for me in 1.9

@theromis

theromis commented May 4, 2016

Copy link
Copy Markdown
Author

if everything works fin may be good idea to merge and close pull request?

@theromis

theromis commented May 18, 2016

Copy link
Copy Markdown
Author

could you merge my changes?

@theromis

theromis commented May 8, 2017

Copy link
Copy Markdown
Author

have new IPv^ fix, is it possible to merge? @detimirikajidedo

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@theromis@Gun1tSurya@svetlyak40wt@jmichelsen@jspiros@nkeilar@jlachowski@ramusus@glossarytingtun@bkeating@bashu
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

django 1.9 fixes - #23

Open
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop
Open

django 1.9 fixes#23
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop

Conversation

@theromis

@theromistheromis commented Dec 16, 2015

Copy link
Copy Markdown

No description provided.

Bogdan Klichukand others added 30 commits August 22, 2011 19:17
Bogdan Klichuk
Resolved problem with circ dep (app_directories.Loader)
45d39a6
Bogdan Klichuk
Added south migrations
5c090eb
@svetlyak40wt
added visitor to admin interface to capture IPs for banning
69ab8d2
@jmichelsen
added visitor to admin interface to capture IPs for banning
41488a5
@jmichelsen
Merge branch 'master' of github.com:jmichelsen/django-tracking
5af4a51
@jspiros
Added support for Django 1.4+ time-zone-aware datetimes by using djan…
2f9cfe9
…go.utils.timezone.now() in place of datetime.datetime.now() where available.
@jspiros
Merge branch 'develop'
f700d74
* develop:
Added support for Django 1.4+ time-zone-aware datetimes by using django.utils.timezone.now() in place of datetime.datetime.now() where available.
Daryl Antony
settings.AUTH_USER_MODEL
a292a37
Daryl Antony
hardcode tracking version
3e21cf1
@nkeilar
listeners depends on Django which isn't installed for in fres environ…
fbec0f9
…ment
Patrick Craston
Make compatible with Django 1.6
1fe2340
Patrick Craston
Port compatibility fix for Django 1.5
e140fb2
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
Make compatible with latest Django
10a593f
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
update changes
1f56494
Stephen J. Fuhry
gitignore
88865bb
Stephen J. Fuhry
don't need this import
d69833a
Stephen J. Fuhry
HAS_GEOIP doesn't seem to exist anymore
9444460
jonykwa
Fixed Django 1.6 error: cannot import name HAS_GEOIP
092c42a
jonykwa
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
177a469
jonykwa
Update urls.py
57058d9
compatibility with Django1.6
@jlachowski
catch Integrity exception added
dd3a666
@jlachowski
missing import added
f22e5df
@jlachowski
rollback & safe point added
bf247a2
@jlachowski
pip install update
5fbb3c6
@jlachowski
version bump
af14719
@jlachowski
packet name change
b7b4793
@jlachowski
Merge branch 'master' of github.com:jlachowski/django-tracking
693d5ca
@ramusus
merged with 0.4.1 version from bitbucket
63129a5
@glossarytingtun
Fixing the issue with timezone aware timestamps
1697b56
@glossarytingtun
Fixing tracking pkg dependency error
27345aa
bashuand others added 22 commits September 19, 2015 08:46
@bashu
Merge branch 'jmichelsen-master' into develop
f3c3e3c
* jmichelsen-master:
added visitor to admin interface to capture IPs for banning
added visitor to admin interface to capture IPs for banning
@bashu
resolving conflicts
0a1e52b
@bashu
Merge branch 'commoncode-master' into develop
ddcd83f
* commoncode-master:
hardcode tracking version
settings.AUTH_USER_MODEL
@bashu
Merge branch 'master' ofhttps://github.com/madteckhead/django-tracking…
374c401
… into madteckhead-master
* 'master' of https://github.com/madteckhead/django-tracking:
listeners depends on Django which isn't installed for in fres environment
@bashu
Merge branch 'madteckhead-master' into develop
5a21f20
* madteckhead-master:
listeners depends on Django which isn't installed for in fres environment
@bashu
resolving conflicts
ee85014
@bashu
Merge branch 'MontmereLimited-master' into develop
05c7a2b
* MontmereLimited-master:
HAS_GEOIP doesn't seem to exist anymore
don't need this import
gitignore
@bashu
resolving conflicts
272c6c4
@bashu
Merge branch 'stewiegaribaldi-master' into develop
0b9e29a
* stewiegaribaldi-master:
Update urls.py
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
Fixed Django 1.6 error: cannot import name HAS_GEOIP
@bashu
resolving conflicts
27b2280
@bashu
Merge branch 'ramusus-master' into develop
0200fb3
* ramusus-master:
merged with 0.4.1 version from bitbucket
@bashu
resolving conflicts
f39c518
@bashu
Merge branch 'pythonhacker-master' into develop
78be201
* pythonhacker-master:
version.py for versioning
Fixing tracking pkg dependency error
Fixing the issue with timezone aware timestamps
@bashu
resolving conflicts
b84f90b
@bashu
Merge branch 'pcraston-master' into develop
09a7474
* pcraston-master:
update changes
Make compatible with latest Django
Port compatibility fix for Django 1.5
Make compatible with Django 1.6
@bashu
resolving conflicts
82f7095
@bashu
Merge branch 'bkeating-master' into develop
aec31a9
* bkeating-master:
Removed rogue character
``IPAddressField`` is now ``GenericIPAddressField``
``get_query_set`` is now ``get_queryset``
packet name change
version bump
pip install update
rollback & safe point added
missing import added
catch Integrity exception added
@bashu
Update .landscape.yaml
f6883f8
@theromis
django 1.9 fixes
d843ba6
@theromis
fix for multibyte
ec42d3e
@theromis
fix for right base
9140ff4
@theromis
user name can not exist
47fd398
@ghost

ghost commented Apr 7, 2016

Copy link
Copy Markdown

thanks! worked great for me in 1.9

@theromis

theromis commented May 4, 2016

Copy link
Copy Markdown
Author

if everything works fin may be good idea to merge and close pull request?

@theromis

theromis commented May 18, 2016

Copy link
Copy Markdown
Author

could you merge my changes?

@theromis

theromis commented May 8, 2017

Copy link
Copy Markdown
Author

have new IPv^ fix, is it possible to merge? @detimirikajidedo

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@theromis@Gun1tSurya@svetlyak40wt@jmichelsen@jspiros@nkeilar@jlachowski@ramusus@glossarytingtun@bkeating@bashu
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

django 1.9 fixes - #23

Open
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop
Open

django 1.9 fixes#23
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop

Conversation

@theromis

@theromistheromis commented Dec 16, 2015

Copy link
Copy Markdown

No description provided.

Bogdan Klichukand others added 30 commits August 22, 2011 19:17
Bogdan Klichuk
Resolved problem with circ dep (app_directories.Loader)
45d39a6
Bogdan Klichuk
Added south migrations
5c090eb
@svetlyak40wt
added visitor to admin interface to capture IPs for banning
69ab8d2
@jmichelsen
added visitor to admin interface to capture IPs for banning
41488a5
@jmichelsen
Merge branch 'master' of github.com:jmichelsen/django-tracking
5af4a51
@jspiros
Added support for Django 1.4+ time-zone-aware datetimes by using djan…
2f9cfe9
…go.utils.timezone.now() in place of datetime.datetime.now() where available.
@jspiros
Merge branch 'develop'
f700d74
* develop:
Added support for Django 1.4+ time-zone-aware datetimes by using django.utils.timezone.now() in place of datetime.datetime.now() where available.
Daryl Antony
settings.AUTH_USER_MODEL
a292a37
Daryl Antony
hardcode tracking version
3e21cf1
@nkeilar
listeners depends on Django which isn't installed for in fres environ…
fbec0f9
…ment
Patrick Craston
Make compatible with Django 1.6
1fe2340
Patrick Craston
Port compatibility fix for Django 1.5
e140fb2
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
Make compatible with latest Django
10a593f
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
update changes
1f56494
Stephen J. Fuhry
gitignore
88865bb
Stephen J. Fuhry
don't need this import
d69833a
Stephen J. Fuhry
HAS_GEOIP doesn't seem to exist anymore
9444460
jonykwa
Fixed Django 1.6 error: cannot import name HAS_GEOIP
092c42a
jonykwa
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
177a469
jonykwa
Update urls.py
57058d9
compatibility with Django1.6
@jlachowski
catch Integrity exception added
dd3a666
@jlachowski
missing import added
f22e5df
@jlachowski
rollback & safe point added
bf247a2
@jlachowski
pip install update
5fbb3c6
@jlachowski
version bump
af14719
@jlachowski
packet name change
b7b4793
@jlachowski
Merge branch 'master' of github.com:jlachowski/django-tracking
693d5ca
@ramusus
merged with 0.4.1 version from bitbucket
63129a5
@glossarytingtun
Fixing the issue with timezone aware timestamps
1697b56
@glossarytingtun
Fixing tracking pkg dependency error
27345aa
bashuand others added 22 commits September 19, 2015 08:46
@bashu
Merge branch 'jmichelsen-master' into develop
f3c3e3c
* jmichelsen-master:
added visitor to admin interface to capture IPs for banning
added visitor to admin interface to capture IPs for banning
@bashu
resolving conflicts
0a1e52b
@bashu
Merge branch 'commoncode-master' into develop
ddcd83f
* commoncode-master:
hardcode tracking version
settings.AUTH_USER_MODEL
@bashu
Merge branch 'master' ofhttps://github.com/madteckhead/django-tracking…
374c401
… into madteckhead-master
* 'master' of https://github.com/madteckhead/django-tracking:
listeners depends on Django which isn't installed for in fres environment
@bashu
Merge branch 'madteckhead-master' into develop
5a21f20
* madteckhead-master:
listeners depends on Django which isn't installed for in fres environment
@bashu
resolving conflicts
ee85014
@bashu
Merge branch 'MontmereLimited-master' into develop
05c7a2b
* MontmereLimited-master:
HAS_GEOIP doesn't seem to exist anymore
don't need this import
gitignore
@bashu
resolving conflicts
272c6c4
@bashu
Merge branch 'stewiegaribaldi-master' into develop
0b9e29a
* stewiegaribaldi-master:
Update urls.py
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
Fixed Django 1.6 error: cannot import name HAS_GEOIP
@bashu
resolving conflicts
27b2280
@bashu
Merge branch 'ramusus-master' into develop
0200fb3
* ramusus-master:
merged with 0.4.1 version from bitbucket
@bashu
resolving conflicts
f39c518
@bashu
Merge branch 'pythonhacker-master' into develop
78be201
* pythonhacker-master:
version.py for versioning
Fixing tracking pkg dependency error
Fixing the issue with timezone aware timestamps
@bashu
resolving conflicts
b84f90b
@bashu
Merge branch 'pcraston-master' into develop
09a7474
* pcraston-master:
update changes
Make compatible with latest Django
Port compatibility fix for Django 1.5
Make compatible with Django 1.6
@bashu
resolving conflicts
82f7095
@bashu
Merge branch 'bkeating-master' into develop
aec31a9
* bkeating-master:
Removed rogue character
``IPAddressField`` is now ``GenericIPAddressField``
``get_query_set`` is now ``get_queryset``
packet name change
version bump
pip install update
rollback & safe point added
missing import added
catch Integrity exception added
@bashu
Update .landscape.yaml
f6883f8
@theromis
django 1.9 fixes
d843ba6
@theromis
fix for multibyte
ec42d3e
@theromis
fix for right base
9140ff4
@theromis
user name can not exist
47fd398
@ghost

ghost commented Apr 7, 2016

Copy link
Copy Markdown

thanks! worked great for me in 1.9

@theromis

theromis commented May 4, 2016

Copy link
Copy Markdown
Author

if everything works fin may be good idea to merge and close pull request?

@theromis

theromis commented May 18, 2016

Copy link
Copy Markdown
Author

could you merge my changes?

@theromis

theromis commented May 8, 2017

Copy link
Copy Markdown
Author

have new IPv^ fix, is it possible to merge? @detimirikajidedo

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@theromis@Gun1tSurya@svetlyak40wt@jmichelsen@jspiros@nkeilar@jlachowski@ramusus@glossarytingtun@bkeating@bashu
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

django 1.9 fixes - #23

Open
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop
Open

django 1.9 fixes#23
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop

Conversation

@theromis

@theromistheromis commented Dec 16, 2015

Copy link
Copy Markdown

No description provided.

Bogdan Klichukand others added 30 commits August 22, 2011 19:17
Bogdan Klichuk
Resolved problem with circ dep (app_directories.Loader)
45d39a6
Bogdan Klichuk
Added south migrations
5c090eb
@svetlyak40wt
added visitor to admin interface to capture IPs for banning
69ab8d2
@jmichelsen
added visitor to admin interface to capture IPs for banning
41488a5
@jmichelsen
Merge branch 'master' of github.com:jmichelsen/django-tracking
5af4a51
@jspiros
Added support for Django 1.4+ time-zone-aware datetimes by using djan…
2f9cfe9
…go.utils.timezone.now() in place of datetime.datetime.now() where available.
@jspiros
Merge branch 'develop'
f700d74
* develop:
Added support for Django 1.4+ time-zone-aware datetimes by using django.utils.timezone.now() in place of datetime.datetime.now() where available.
Daryl Antony
settings.AUTH_USER_MODEL
a292a37
Daryl Antony
hardcode tracking version
3e21cf1
@nkeilar
listeners depends on Django which isn't installed for in fres environ…
fbec0f9
…ment
Patrick Craston
Make compatible with Django 1.6
1fe2340
Patrick Craston
Port compatibility fix for Django 1.5
e140fb2
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
Make compatible with latest Django
10a593f
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
update changes
1f56494
Stephen J. Fuhry
gitignore
88865bb
Stephen J. Fuhry
don't need this import
d69833a
Stephen J. Fuhry
HAS_GEOIP doesn't seem to exist anymore
9444460
jonykwa
Fixed Django 1.6 error: cannot import name HAS_GEOIP
092c42a
jonykwa
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
177a469
jonykwa
Update urls.py
57058d9
compatibility with Django1.6
@jlachowski
catch Integrity exception added
dd3a666
@jlachowski
missing import added
f22e5df
@jlachowski
rollback & safe point added
bf247a2
@jlachowski
pip install update
5fbb3c6
@jlachowski
version bump
af14719
@jlachowski
packet name change
b7b4793
@jlachowski
Merge branch 'master' of github.com:jlachowski/django-tracking
693d5ca
@ramusus
merged with 0.4.1 version from bitbucket
63129a5
@glossarytingtun
Fixing the issue with timezone aware timestamps
1697b56
@glossarytingtun
Fixing tracking pkg dependency error
27345aa
bashuand others added 22 commits September 19, 2015 08:46
@bashu
Merge branch 'jmichelsen-master' into develop
f3c3e3c
* jmichelsen-master:
added visitor to admin interface to capture IPs for banning
added visitor to admin interface to capture IPs for banning
@bashu
resolving conflicts
0a1e52b
@bashu
Merge branch 'commoncode-master' into develop
ddcd83f
* commoncode-master:
hardcode tracking version
settings.AUTH_USER_MODEL
@bashu
Merge branch 'master' ofhttps://github.com/madteckhead/django-tracking…
374c401
… into madteckhead-master
* 'master' of https://github.com/madteckhead/django-tracking:
listeners depends on Django which isn't installed for in fres environment
@bashu
Merge branch 'madteckhead-master' into develop
5a21f20
* madteckhead-master:
listeners depends on Django which isn't installed for in fres environment
@bashu
resolving conflicts
ee85014
@bashu
Merge branch 'MontmereLimited-master' into develop
05c7a2b
* MontmereLimited-master:
HAS_GEOIP doesn't seem to exist anymore
don't need this import
gitignore
@bashu
resolving conflicts
272c6c4
@bashu
Merge branch 'stewiegaribaldi-master' into develop
0b9e29a
* stewiegaribaldi-master:
Update urls.py
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
Fixed Django 1.6 error: cannot import name HAS_GEOIP
@bashu
resolving conflicts
27b2280
@bashu
Merge branch 'ramusus-master' into develop
0200fb3
* ramusus-master:
merged with 0.4.1 version from bitbucket
@bashu
resolving conflicts
f39c518
@bashu
Merge branch 'pythonhacker-master' into develop
78be201
* pythonhacker-master:
version.py for versioning
Fixing tracking pkg dependency error
Fixing the issue with timezone aware timestamps
@bashu
resolving conflicts
b84f90b
@bashu
Merge branch 'pcraston-master' into develop
09a7474
* pcraston-master:
update changes
Make compatible with latest Django
Port compatibility fix for Django 1.5
Make compatible with Django 1.6
@bashu
resolving conflicts
82f7095
@bashu
Merge branch 'bkeating-master' into develop
aec31a9
* bkeating-master:
Removed rogue character
``IPAddressField`` is now ``GenericIPAddressField``
``get_query_set`` is now ``get_queryset``
packet name change
version bump
pip install update
rollback & safe point added
missing import added
catch Integrity exception added
@bashu
Update .landscape.yaml
f6883f8
@theromis
django 1.9 fixes
d843ba6
@theromis
fix for multibyte
ec42d3e
@theromis
fix for right base
9140ff4
@theromis
user name can not exist
47fd398
@ghost

ghost commented Apr 7, 2016

Copy link
Copy Markdown

thanks! worked great for me in 1.9

@theromis

theromis commented May 4, 2016

Copy link
Copy Markdown
Author

if everything works fin may be good idea to merge and close pull request?

@theromis

theromis commented May 18, 2016

Copy link
Copy Markdown
Author

could you merge my changes?

@theromis

theromis commented May 8, 2017

Copy link
Copy Markdown
Author

have new IPv^ fix, is it possible to merge? @detimirikajidedo

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@theromis@Gun1tSurya@svetlyak40wt@jmichelsen@jspiros@nkeilar@jlachowski@ramusus@glossarytingtun@bkeating@bashu
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

django 1.9 fixes - #23

Open
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop
Open

django 1.9 fixes#23
theromis wants to merge 76 commits into
bashu:developfrom
theromis:develop

Conversation

@theromis

@theromistheromis commented Dec 16, 2015

Copy link
Copy Markdown

No description provided.

Bogdan Klichukand others added 30 commits August 22, 2011 19:17
Bogdan Klichuk
Resolved problem with circ dep (app_directories.Loader)
45d39a6
Bogdan Klichuk
Added south migrations
5c090eb
@svetlyak40wt
added visitor to admin interface to capture IPs for banning
69ab8d2
@jmichelsen
added visitor to admin interface to capture IPs for banning
41488a5
@jmichelsen
Merge branch 'master' of github.com:jmichelsen/django-tracking
5af4a51
@jspiros
Added support for Django 1.4+ time-zone-aware datetimes by using djan…
2f9cfe9
…go.utils.timezone.now() in place of datetime.datetime.now() where available.
@jspiros
Merge branch 'develop'
f700d74
* develop:
Added support for Django 1.4+ time-zone-aware datetimes by using django.utils.timezone.now() in place of datetime.datetime.now() where available.
Daryl Antony
settings.AUTH_USER_MODEL
a292a37
Daryl Antony
hardcode tracking version
3e21cf1
@nkeilar
listeners depends on Django which isn't installed for in fres environ…
fbec0f9
…ment
Patrick Craston
Make compatible with Django 1.6
1fe2340
Patrick Craston
Port compatibility fix for Django 1.5
e140fb2
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
Make compatible with latest Django
10a593f
from https://bitbucket.org/romanalexander/django-tracking
Patrick Craston
update changes
1f56494
Stephen J. Fuhry
gitignore
88865bb
Stephen J. Fuhry
don't need this import
d69833a
Stephen J. Fuhry
HAS_GEOIP doesn't seem to exist anymore
9444460
jonykwa
Fixed Django 1.6 error: cannot import name HAS_GEOIP
092c42a
jonykwa
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
177a469
jonykwa
Update urls.py
57058d9
compatibility with Django1.6
@jlachowski
catch Integrity exception added
dd3a666
@jlachowski
missing import added
f22e5df
@jlachowski
rollback & safe point added
bf247a2
@jlachowski
pip install update
5fbb3c6
@jlachowski
version bump
af14719
@jlachowski
packet name change
b7b4793
@jlachowski
Merge branch 'master' of github.com:jlachowski/django-tracking
693d5ca
@ramusus
merged with 0.4.1 version from bitbucket
63129a5
@glossarytingtun
Fixing the issue with timezone aware timestamps
1697b56
@glossarytingtun
Fixing tracking pkg dependency error
27345aa
bashuand others added 22 commits September 19, 2015 08:46
@bashu
Merge branch 'jmichelsen-master' into develop
f3c3e3c
* jmichelsen-master:
added visitor to admin interface to capture IPs for banning
added visitor to admin interface to capture IPs for banning
@bashu
resolving conflicts
0a1e52b
@bashu
Merge branch 'commoncode-master' into develop
ddcd83f
* commoncode-master:
hardcode tracking version
settings.AUTH_USER_MODEL
@bashu
Merge branch 'master' ofhttps://github.com/madteckhead/django-tracking…
374c401
… into madteckhead-master
* 'master' of https://github.com/madteckhead/django-tracking:
listeners depends on Django which isn't installed for in fres environment
@bashu
Merge branch 'madteckhead-master' into develop
5a21f20
* madteckhead-master:
listeners depends on Django which isn't installed for in fres environment
@bashu
resolving conflicts
ee85014
@bashu
Merge branch 'MontmereLimited-master' into develop
05c7a2b
* MontmereLimited-master:
HAS_GEOIP doesn't seem to exist anymore
don't need this import
gitignore
@bashu
resolving conflicts
272c6c4
@bashu
Merge branch 'stewiegaribaldi-master' into develop
0b9e29a
* stewiegaribaldi-master:
Update urls.py
Fixed TypeError: can't compare offset-naive and offset-aware datetimes
Fixed Django 1.6 error: cannot import name HAS_GEOIP
@bashu
resolving conflicts
27b2280
@bashu
Merge branch 'ramusus-master' into develop
0200fb3
* ramusus-master:
merged with 0.4.1 version from bitbucket
@bashu
resolving conflicts
f39c518
@bashu
Merge branch 'pythonhacker-master' into develop
78be201
* pythonhacker-master:
version.py for versioning
Fixing tracking pkg dependency error
Fixing the issue with timezone aware timestamps
@bashu
resolving conflicts
b84f90b
@bashu
Merge branch 'pcraston-master' into develop
09a7474
* pcraston-master:
update changes
Make compatible with latest Django
Port compatibility fix for Django 1.5
Make compatible with Django 1.6
@bashu
resolving conflicts
82f7095
@bashu
Merge branch 'bkeating-master' into develop
aec31a9
* bkeating-master:
Removed rogue character
``IPAddressField`` is now ``GenericIPAddressField``
``get_query_set`` is now ``get_queryset``
packet name change
version bump
pip install update
rollback & safe point added
missing import added
catch Integrity exception added
@bashu
Update .landscape.yaml
f6883f8
@theromis
django 1.9 fixes
d843ba6
@theromis
fix for multibyte
ec42d3e
@theromis
fix for right base
9140ff4
@theromis
user name can not exist
47fd398
@ghost

ghost commented Apr 7, 2016

Copy link
Copy Markdown

thanks! worked great for me in 1.9

@theromis

theromis commented May 4, 2016

Copy link
Copy Markdown
Author

if everything works fin may be good idea to merge and close pull request?

@theromis

theromis commented May 18, 2016

Copy link
Copy Markdown
Author

could you merge my changes?

@theromis

theromis commented May 8, 2017

Copy link
Copy Markdown
Author

have new IPv^ fix, is it possible to merge? @detimirikajidedo

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

11 participants

@theromis@Gun1tSurya@svetlyak40wt@jmichelsen@jspiros@nkeilar@jlachowski@ramusus@glossarytingtun@bkeating@bashu