Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Add Support for Django 1.11 and add Python 3 support. #27

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
+285 −64
Open

[WIP] Add Support for Django 1.11 and add Python 3 support. #27

Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
af1a3b8
adding ability to revert a change to a model
binarymatt Sep 23, 2013
95f6de8
adding revert action for delete and change operations
binarymatt Sep 23, 2013
a915372
Merge remote-tracking branch 'upstream/master'
binarymatt Oct 7, 2013
f8b472f
When loading fixtures, do not trigger audits.
Oct 22, 2013
a3c784b
Merge pull request #1 from briandailey/feature/accommodate-fixtures
briandailey Oct 23, 2013
4eb06ae
Bumping version number.
Oct 23, 2013
46566eb
Increased Auditchange old_value and new_value to textfield
egdelwonk Nov 1, 2013
bca746d
Merge pull request #2 from egdelwonk/increase_auditchange_values
briandailey Nov 1, 2013
f432e8d
Changing version, contributors.
briandailey Mar 25, 2014
c92d47c
Merge pull request #3 from briandailey/master
briandailey Mar 25, 2014
62567ed
adding ability to revert a change to a model
binarymatt Sep 23, 2013
fcf4054
adding revert action for delete and change operations
binarymatt Sep 23, 2013
6c9d328
Back-merging latest.
Sep 18, 2014
51e1817
Back merging from stratasan fork.
Sep 18, 2014
8f8f4df
Merge pull request #4 from briandailey/master
briandailey Sep 18, 2014
66ecb5e
Adding build status badge.
Sep 18, 2014
167428f
t push Merge branch 'master' of github.com:stratasan/django-simple-audit
Sep 18, 2014
e3d26b5
use rst format.
Sep 18, 2014
b804c1b
https
Sep 18, 2014
3b7fc83
Back-merging upstream.
Nov 3, 2015
af36081
Remove maxlength on integer field.
Nov 3, 2015
37751f1
IPAddressField has been deprecated. Support for it (except in histori…
Nov 3, 2015
7aa18f0
Add migrations
sburns Feb 26, 2016
9b99cf7
Remove import in __init__
sburns Feb 29, 2016
a4a868b
Merge pull request #5 from briandailey/master
sburns Mar 1, 2016
3f5ca38
Update README and bump version
sburns Mar 1, 2016
294e8c2
Merge remote-tracking branch 'stratasan/master' into fix-warnings
sburns Mar 1, 2016
79ebf08
Merge pull request #6 from sburns/fix-warnings
sburns Mar 1, 2016
b6f81ca
Fix bad merge
sburns Mar 1, 2016
4180ce0
Merge pull request #7 from sburns/fix-warnings
sburns Mar 1, 2016
0de4123
Fix GenericForeignKey import
sburns Mar 1, 2016
cf49cab
Ignore vim swp files
sburns Mar 1, 2016
3e51c80
Fix _Meta API usage
sburns Mar 1, 2016
041d05d
Use Django 1.9 in testproject
sburns Mar 1, 2016
97c1000
Register simple_audit in simple_app.apps
sburns Mar 1, 2016
ba39f8b
Add travis
sburns Mar 1, 2016
68b41c6
attempting to trigger travis
sburns Mar 1, 2016
a109b52
Remove implicit import
sburns Mar 1, 2016
463f0d2
Fix py3 exception syntax
sburns Mar 1, 2016
3031df1
Only test py2.7 for now'
sburns Mar 1, 2016
4266d2d
Merge pull request #8 from sburns/fix-tests
sburns Mar 2, 2016
2f3d4f0
Update README
Chris-Graffagnino Dec 28, 2016
9435ffc
Remove patterns func call for Django 1.10 compatibility
Chris-Graffagnino Dec 28, 2016
04793f2
Merge pull request #9 from Chris-Graffagnino/update1.10
briandailey Feb 2, 2017
a3f0222
Change how _get_all_field_names is called
Chris-Graffagnino Feb 11, 2017
293f827
Simplify implementation for get_field_names
Chris-Graffagnino Feb 17, 2017
88e4698
Merge pull request #10 from Chris-Graffagnino/get-field-names
briandailey Feb 21, 2017
2dbaed9
Update setup.py
Chris-Graffagnino Feb 22, 2017
8ad3fbc
Merge pull request #11 from Chris-Graffagnino/patch-1
sburns Feb 24, 2017
57fd47a
Remove deprecated patterns function
WTFox Jan 22, 2018
6cb2980
Add support for python 2/3 strings
WTFox Jan 22, 2018
2e7e5a6
Cast dict.keys()s to a list
WTFox Jan 22, 2018
a01730b
Add a utility method to maintain consistent ordering when comparing.
WTFox Jan 22, 2018
8ece1d7
Remove redundant quotes
WTFox Jan 22, 2018
c8ae971
Update project meta
WTFox Jan 22, 2018
2782e06
Update travis-ci to test against py3
WTFox Jan 22, 2018
4aa211b
Remove 3.3 test environment
WTFox Jan 22, 2018
542fc71
Update CI and README
WTFox Jan 22, 2018
cbe7995
Merge remote-tracking branch 'upstream/master' into support-django1.1…
WTFox Jan 23, 2018
1514c44
Verify that values are quoted consistently
WTFox Jan 29, 2018
2845ec1
Correct backwards compatibility
WTFox Jan 29, 2018
3ce6608
More six compatibility
WTFox Jan 29, 2018
6e731b0
Use six.string_type
WTFox Jan 29, 2018
a45f0e6
Merge branch 'support-django1.11-python2or3' into upstream-support-dj…
WTFox Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into support-django1.1… 
…1-python2or3
@WTFox
WTFox committed Jan 23, 2018
commit cbe7995cf6e32f38facd6ce4b3aeabc338b6ef8c
1 change: 1 addition & 0 deletions AUTHORS
View file
Original file line number Diff line number Diff line change
@@ -13,3 +13,4 @@ Contributors:
* Scott Burns
* Chris Graffagnino
* Anthony Fox
* Mauro Murari
2 changes: 2 additions & 0 deletions README.rst
View file
Original file line number Diff line number Diff line change
@@ -130,6 +130,8 @@ CHANGELOG
* 0.2
* Update with compatibility for Django 1.9
* Add Migrations
* 0.1.22
* Fixing admin display Current Content when audited model was deleted ( thanks otherpirate )
* 0.1.21
* Problems with upload to pypi ( the version was used ) - Sux

You are viewing a condensed version of this merge commit. You can view the full changes here.