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

IBX-6717: Recent activity #2161

Merged
merged 57 commits into from Apr 19, 2024
Merged

IBX-6717: Recent activity #2161

merged 57 commits into from Apr 19, 2024

Conversation

adriendupuis
Copy link
Contributor

@adriendupuis adriendupuis commented Oct 10, 2023 •
edited

Question Answer
JIRA Ticket IBX-6717
Versions 4.6
Edition All

Whole Recent Activity dev doc.

Were written directly in this PR:

  • intro
  • config
  • cronjob IBX-6962
  • role rights

Were written in other PRs:

Previews:

Checklist

  • Text renders correctly
  • Text has been checked with vale
  • Description metadata is up to date
  • Redirects cover removed/moved pages
  • Code samples are working
  • PHP code samples have been fixed with PHP CS fixer
  • Added link to this PR in relevant JIRA ticket or code PR

@adriendupuis adriendupuis added the Wait with merge PRs that shouldn't be merged instantly label Oct 10, 2023
@adriendupuis adriendupuis changed the title IBX-6717: Recent activity: TOC and skeleton IBX-6717: Recent activity: TOC, skeleton and intro Oct 10, 2023
adriendupuis
adriendupuis commented Feb 13, 2024
View reviewed changes
mkdocs.yml Outdated Show resolved Hide resolved
@adriendupuis adriendupuis marked this pull request as ready for review February 13, 2024 15:34
@adriendupuis adriendupuis requested a review from mnocon April 9, 2024 13:06
@adriendupuis adriendupuis mentioned this pull request Apr 11, 2024
Merged
5 tasks
@adriendupuis
Copy link
Contributor Author

adriendupuis commented Apr 16, 2024 •
edited

I really, really like it! I've learned a lot about Activity Log just by reading this 🤩

I think it's great that you attach both json and xml requests/responses to the REST Reference.

I made some suggestions in the comments, but I need to stress this: this PR is very, very good 💪

One question: I don't see a mention of logging the IP addresses anywhere (ibexa/activity-log#70), do we want to include this as well? (if yes then it could be a follow-up, this PR is big enough already 😅 )

@mnocon
Yes, IP was added afterward. This will be mentioned in a future PR.

dabrt
dabrt requested changes Apr 17, 2024
View reviewed changes
docs/administration/recent_activity/recent_activity.md Outdated Show resolved Hide resolved
docs/administration/recent_activity/recent_activity.md Outdated Show resolved Hide resolved
docs/administration/recent_activity/recent_activity.md Outdated Show resolved Hide resolved
docs/administration/recent_activity/recent_activity.md Outdated Show resolved Hide resolved
docs/administration/recent_activity/recent_activity.md Outdated Show resolved Hide resolved
docs/search/activity_log_search_reference/logged_at_criterion.md Outdated Show resolved Hide resolved
docs/search/activity_log_search_reference/object_criterion.md Outdated Show resolved Hide resolved
docs/search/activity_log_search_reference/object_name_criterion.md Outdated Show resolved Hide resolved
docs/search/activity_log_search_reference/user_criterion.md Outdated Show resolved Hide resolved
docs/search/activity_log_search_reference/user_criterion.md Outdated Show resolved Hide resolved
adriendupuis and others added 6 commits April 17, 2024 18:49
@adriendupuis @dabrt
Apply suggestions from code review
c300b0f 
Co-authored-by: Tomasz Dąbrowski <64841871+dabrt@users.noreply.github.com>
@adriendupuis @dabrt
Apply suggestions from code review
f4b25ab 
Co-authored-by: Tomasz Dąbrowski <64841871+dabrt@users.noreply.github.com>
@adriendupuis @dabrt
Format policies (suggestions from code review)
0727b5d 
Co-authored-by: Tomasz Dąbrowski <64841871+dabrt@users.noreply.github.com>
@adriendupuis
Rename ez*.raml to ibexa*.raml (#2360)
6f33bd8 
(cherry picked from commit 7384530)
@adriendupuis
Merge branch 'master' into activity-log_toc
da07318 
# Conflicts:
#	docs/api/rest_api/rest_api_reference/input/ibexa.raml
#	docs/api/rest_api/rest_api_reference/input/ibexa_original.raml
@adriendupuis
Rebuild rest_api_reference.html
d534f7b
@adriendupuis adriendupuis requested a review from dabrt April 18, 2024 07:14
adriendupuis and others added 2 commits April 18, 2024 10:13
@adriendupuis @dabrt
Fix activity_log_criteria.md table
76b8b05 
Co-authored-by: Tomasz Dąbrowski <64841871+dabrt@users.noreply.github.com>
@adriendupuis
Merge branch 'master' into activity-log_toc
600bc31 
# Conflicts:
#	mkdocs.yml
adriendupuis
adriendupuis commented Apr 19, 2024
View reviewed changes
mkdocs.yml Outdated Show resolved Hide resolved
@adriendupuis
Copy link
Contributor Author

Side change in the ToC:

Before
2024-04-19_13-10-50

After
2024-04-19_13-11-23

mnocon
mnocon approved these changes Apr 19, 2024
View reviewed changes
Copy link
Contributor

@mnocon mnocon left a comment

Choose a reason for hiding this comment

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

Thank you! 🙇

docs/administration/recent_activity/recent_activity.md Outdated Show resolved Hide resolved
docs/administration/recent_activity/recent_activity.md Outdated Show resolved Hide resolved
@adriendupuis @mnocon
Apply suggestions from code review
1dd5e69 
Co-authored-by: Marek Nocoń <mnocon@users.noreply.github.com>
@adriendupuis adriendupuis merged commit 6cbbb5f into master Apr 19, 2024
4 checks passed
@adriendupuis adriendupuis deleted the activity-log_toc branch April 19, 2024 12:21
adriendupuis added a commit that referenced this pull request Apr 19, 2024
@adriendupuis
IBX-6717: Recent activity (#2161)
31f931d 
---------

Co-authored-by: Adrien Dupuis <adrien.dupuis@ibexa.co>
Co-authored-by: Paweł Niedzielski <pawel.niedzielski@ibexa.co>
Co-authored-by: Bertrand Dunogier <bertrand.dunogier@gmail.com>
Co-authored-by: Tomasz Dąbrowski <64841871+dabrt@users.noreply.github.com>
Co-authored-by: julitafalcondusza <117284672+julitafalcondusza@users.noreply.github.com>
Co-authored-by: Marek Nocoń <mnocon@users.noreply.github.com>
(cherry picked from commit 6cbbb5f)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dabrt dabrt dabrt approved these changes

@mnocon mnocon mnocon approved these changes

@julitafalcondusza julitafalcondusza julitafalcondusza approved these changes

@Steveb-p Steveb-p Awaiting requested review from Steveb-p

@bdunogier bdunogier Awaiting requested review from bdunogier

Assignees
No one assigned
Labels
Ready for MERGE
Projects
None yet
Milestone
No milestone
5 participants
@adriendupuis @bdunogier @mnocon @dabrt @julitafalcondusza