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

Jump to bottom

Updated code on existing branch #543

Merged
merged 105 commits into from
Sep 5, 2024
Merged

Updated code on existing branch #543

merged 105 commits into from
Sep 5, 2024

Conversation

auvipy
Copy link
Collaborator

@auvipy auvipy commented Sep 5, 2024

No description provided.

justquick and others added 30 commits February 20, 2022 16:02
@justquick
use python base image for simplicity
28485e0
@justquick
updating dev env w/ helpers
22ebf59
@justquick
wip: actstream/registered models as factories for DRF
27eeff1
@justquick
DRF testing and updates
5a3832b
@justquick
drf extras for package
ccff3c6
@justquick
default permissions, custom viewsets
53a9e7e
@justquick
allow a 'my actions' view as viewset action
253b93a
@justquick
settings refactor
4fc902e
@justquick
testing fix, user serializer to hide password
5bb3c7b
@justquick
dont require drf for testing app
803ada1
@justquick
install drf for actions
99a4a40
@justquick
install drf generics for actions
9ede96d
@justquick
Merge branch 'main' into drf
fc55be7
@justquick
action posting and model/object drf feeds
322d27c
@justquick
weird ordering issues in tests
72f386f
@justquick
viewset ordering, test debugging for gh actions
ea9701a
@justquick
weird db auto id bug? hope this works
954181a
@justquick
drf following
0500bf9
@justquick
add drf urlconf to actstream.urls
908c58d
@justquick
Merge branch 'main' into drf
1c3e46f
@justquick
drf-spectacular in runtests
ea5ad39
@justquick
weird recursion error on urls
05aa909
@justquick
use expand fields as default behavior
704f1f3
@justquick
use pytest finally
9e427a3
@justquick
set sane ordering in qs, not on drf ordering fields
ca45077
@justquick
runtest project changes, more granular custom permissions/viewsets
2d0391d
@justquick
dont load test data 2x
31e5913
@justquick
Merge branch 'drf' of github.com:justquick/django-activity-stream int…
8048985 
…o drf
@justquick
fugly settings remvoed
1ded0cf
@justquick
Merge branch 'drf' of github.com:justquick/django-activity-stream int…
1594566 
…o drf
justquick and others added 27 commits October 15, 2022 04:34
@justquick
Merge branch 'drf' of github.com:justquick/django-activity-stream int…
4fa7754 
…o drf
@justquick
separate django from drf tests
93940ba
@khialb32 @auvipy
fix typo in installation docs.
b0affd7
@justquick
strip out drf spectacular for now
848d46d
@lociii @auvipy
remove json field compatibility, force django 3.2, refs justquick#480
1995c65
@justquick
start of drf docs
75e2310
@justquick
1.4.2 prep
7927e97
@justquick
updating authors and changelog ln
890d13f
@justquick
Merge branch 'main' into drf
299dc37
@justquick
updating drf docs
1d7b225
@auvipy
Create SECURITY.md
c58a281
@justquick
fix for justquick#524 datetime_safe removal
2561372
@justquick
Merge tag '1.4.3'
b894d76
@David-Guillot @auvipy
feat(follows): delete object-orphaned Follows...
d06e7e2 
... based on Django pre_delete signal
@auvipy
Update codeql-analysis.yml
58aa178
@justquick
Create dependabot.yml
ca77897
@dependabot @auvipy
Bump actions/checkout from 2 to 3
3898576 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @auvipy
Bump actions/upload-artifact from 2 to 3
b86fa91 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @auvipy
Bump actions/checkout from 3 to 4
6f9d634 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@auvipy
changelog entry for v2.0.0 release
cacfd7b
@auvipy
Bump version to v2.0.0
a7df85e
@artushghazaryan
Merge remote-tracking branch 'origin/add-swappable-models'
1814460 
# Conflicts:
#	actstream/managers.py
#	actstream/settings.py
#	actstream/tests/test_activity.py
#	runtests/settings.py
#	runtests/testapp/tests/test_django.py
@artushghazaryan
remove unused imports
370037c
@artushghazaryan
add swappable models for drf part
04aeac1
@artushghazaryan
add swappable models for drf part
3a93700
@artushghazaryan
Merge remote-tracking branch 'origin/main'
c0f3547
@artushghazaryan
release 2.0.1
96cac83
auvipy
auvipy commented Sep 5, 2024
View reviewed changes
docs/drf.rst
Django ReST Framework Integration
=================================

As of version 2.0.1, django-activity-stream now supports integration with `Django ReST Framework <https://www.django-rest-framework.org/>`_.
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
As of version 2.0.1, django-activity-stream now supports integration with `Django ReST Framework <https://www.django-rest-framework.org/>`_.
As of version 2.1.0, django-activity-stream now supports integration with `Django ReST Framework <https://www.django-rest-framework.org/>`_.

@auvipy auvipy marked this pull request as ready for review September 5, 2024 10:07
@auvipy auvipy merged commit 30ee631 into justquick:add-swappable-models Sep 5, 2024
16 of 18 checks passed
Sign up for free to 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.
9 participants
@auvipy @justquick @cb109 @timgates42 @marcusaram @khialb32 @lociii @David-Guillot @artushghazaryan