This repository was archived by the owner on Dec 18, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 34
Add papertrail gem #587
Open
Drinion
wants to merge
94
commits into
master
Choose a base branch
from
564-LOG_encryptable_read_access
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add papertrail gem #587
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 tasks
Drinion
commented
Apr 3, 2022
…puzzle/cryptopus into 564-LOG_encryptable_read_access
…puzzle/cryptopus into 564-LOG_encryptable_read_access
# Conflicts: # app/controllers/api/encryptables_controller.rb # config/routes/api.rb # frontend/app/components/encryptable/show.js # frontend/app/models/encryptable.js # frontend/app/templates/components/encryptable/show.hbs # frontend/app/templates/encryptables/show.hbs # frontend/tests/integration/components/account/show-test.js # frontend/tests/integration/components/encryptable/show-test.js
Contributor
Robin481
suggested changes
May 24, 2022
Member
Robin481
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Eyy, sorry a bit late on that one 🕐
I think this should be good now, only the mentioned thread is not resolved yet, any updates there?
| has_paper_trail on: [:touch, :update], ignore: [:tag, :type, :encrypted_data] | ||
| has_paper_trail on: [:touch, :update], ignore: [:tag, :type, :encrypted_data], dependent: :destroy | ||
|
|
||
| before_destroy :destroy_versions |
Member
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update on this front?
* add translation for Log * add translation * Started frontend implementation of Log butten/page not working atm. * Continued frontend implementation for personal log. Refresh on /log doesnt work and paper trail feature aren't included yet. * removed nav side bar from log page and fixed prettier/prettier error * Changed icon for Log in nav bar drop down menu, took the closest one available. * Fixed refresh bug when on /log page. (the bug mentioned in earlier commit) * shows encryptables on dashboard loads all encryptables of user * Added basic frontend test for nav bar * deleted unused code * Revert "deleted unused code" Not smart to do this in this branch This reverts commit 7c435b2. * Add spec Test file for the Personal log * change name and add testes * change a 'not' mistake * Adds system specs for encryptables on dashboard * Fixes frontend spec for dashboard-card * Updated table in personal log. Added personal log controller and other stuff. * Added missing files from last commit * Renamed all files for personal log to personal_logs (was log before) * Fixed prettier/prettier errors and renamed one more file to personal_logs that i forgot before * Fixed one more file with prettier/prettier errors * personal log now loads logs from backend, first working version * some minor improvements, but personal log only works if you access it after opening an encryptable * Loads recent credentials from encryptables controller * cleanup encryptables_controller.rb * Revert "some minor improvements, but personal log only works if you access it after opening an encryptable" This reverts commit 00f99a8. * Revert "personal log now loads logs from backend, first working version" This reverts commit 516c69b. * Revert "Fixed one more file with prettier/prettier errors" This reverts commit 6003693. * Revert "Fixed prettier/prettier errors and renamed one more file to personal_logs that i forgot before" This reverts commit 032c002. * Revert "Renamed all files for personal log to personal_logs (was log before)" This reverts commit 682f3e0. * Revert "Added missing files from last commit" This reverts commit b71a8ad. * Revert "Updated table in personal log." This reverts commit bd243a2. * Revert " change a 'not' mistake" This reverts commit 81548f8. * Revert " change name and add testes" This reverts commit 0eb1257. * Revert " Add spec Test file for the Personal log" This reverts commit 08b59b3. * Revert "Revert "deleted unused code"" This reverts commit 4d42a80. * Revert "deleted unused code" This reverts commit 7c435b2. * Revert "Added basic frontend test for nav bar" This reverts commit f52c87a. * Revert "Fixed refresh bug when on /log page. (the bug mentioned in earlier commit)" This reverts commit 24dd076. * Revert "Changed icon for Log in nav bar drop down menu, took the closest one available." This reverts commit 4bcdc37. * Revert "removed nav side bar from log page and fixed prettier/prettier error" This reverts commit fc1cb07. * Revert "Continued frontend implementation for personal log. Refresh on /log doesnt work and paper trail feature aren't included yet." This reverts commit 903cecd. * Revert "Started frontend implementation of Log butten/page" This reverts commit 208e9af. * Revert " add translation" This reverts commit 992980a. * Revert " add translation for Log" This reverts commit 5f57938. * Creates encryptables filtered_list presenter to handle parameters passed with requests * fixes rubocop warnings * Adds versions and corresponding encryptable fixtures to test database. Fixes specs * Adds system/controller specs for recent Credentials * starts implementing filter_by_query functionality for encryptables * completes filter_by_query functionality and specs for encryptables * fixes specs and fixtures * Recent credential requests now only return valid encryptables * fixes encryptables_controller_system_spec.rb * Fixes specs * Cleanup recent credentials fetching * Fix rubocop complaint * Changes the handling of request parameters * Removes some fixtures and fixes related specs * fixes recent Credentials specs by creating encryptables/logs during testing * code cleanup * extends controller specs for recent credentials functionality * fixes system specs * fixes rubocop errors * removes remains from merge conflict * pressed backspace once * change spelling in specs * add method true? to evaluate params * rewrite variable in camel_case * move method true? to base class filtered_list * include encryptables when loading logs * extend includes to also include folders * change fabricated credentials * fix error from merge conflict * fix rubocop errors * fix encryptables controller spec * change method fetch_entries to work with encryptable_file lookup * create method log_read_access to create logs instead of touch * fix rubocop errors * correct spelling and fill in mariana trench * rework fetch_entries method * fix fetch_entries method Co-authored-by: MuStAgEDelta <[email protected]> Co-authored-by: Julien Gaumez <[email protected]> Co-authored-by: Robin Steiner <[email protected]>
Member
|
Make sure to resolve conflicts :) |
…_read_access # Conflicts: # frontend/app/templates/components/dashboard-card.hbs
Contributor
|
done 🎉 |
# Conflicts: # frontend/app/templates/components/encryptable/show.hbs # frontend/translations/ch_be.yml # frontend/translations/de.yml # frontend/translations/en.yml
# Conflicts: # spec/controllers/api/encryptables_controller_spec.rb # spec/system/dashboard_system_spec.rb
ecd3f3e to
d610931
Compare
520ebe8 to
151e944
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.