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.

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

feat: Enhanced activity & notifications #2330

Draft
wants to merge 52 commits into
base: main
Choose a base branch
from

Conversation

JanCizmar
Copy link
Contributor

No description provided.

…-core

# Conflicts:
#	backend/data/src/main/resources/db/changelog/schema.xml
The amount of time spent solving made up problems instead of working on real problems...
…-core

# Conflicts:
#	backend/api/src/main/kotlin/io/tolgee/hateoas/InitialDataModel.kt
#	backend/app/src/main/resources/application.yaml
#	backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/v2ImageUploadController/V2ImageUploadControllerTest.kt
#	backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/v2ProjectsController/V2ProjectsControllerTest.kt
#	backend/app/src/test/kotlin/io/tolgee/api/v2/controllers/v2ScreenshotController/KeyScreenshotControllerTest.kt
#	backend/app/src/test/kotlin/io/tolgee/initialUserCreation/LegacyMigrationTest.kt
#	backend/data/src/main/kotlin/io/tolgee/activity/ActivityService.kt
#	backend/data/src/main/kotlin/io/tolgee/activity/views/ActivityViewByRevisionsProvider.kt
#	backend/data/src/main/kotlin/io/tolgee/activity/views/ProjectActivityViewByPageableProvider.kt
#	backend/data/src/main/kotlin/io/tolgee/batch/BatchJobActionService.kt
#	backend/data/src/main/kotlin/io/tolgee/batch/BatchJobConcurrentLauncher.kt
#	backend/data/src/main/kotlin/io/tolgee/batch/ProgressManager.kt
#	backend/data/src/main/kotlin/io/tolgee/batch/events/OnBatchJobStatusUpdated.kt
#	backend/data/src/main/kotlin/io/tolgee/dialects/postgres/CustomPostgreSQLDialect.kt
#	backend/data/src/main/kotlin/io/tolgee/dtos/ComputedPermissionDto.kt
#	backend/data/src/main/kotlin/io/tolgee/dtos/request/key/KeyScreenshotDto.kt
#	backend/data/src/main/kotlin/io/tolgee/model/DismissedAnnouncement.kt
#	backend/data/src/main/kotlin/io/tolgee/model/UserAccount.kt
#	backend/data/src/main/kotlin/io/tolgee/repository/LanguageRepository.kt
#	backend/data/src/main/kotlin/io/tolgee/repository/UserAccountRepository.kt
#	backend/data/src/main/kotlin/io/tolgee/service/LanguageService.kt
#	backend/data/src/main/kotlin/io/tolgee/service/project/ProjectService.kt
#	backend/data/src/main/kotlin/io/tolgee/service/security/UserAccountService.kt
#	backend/data/src/main/resources/db/changelog/schema.xml
#	backend/development/src/main/kotlin/io/tolgee/controllers/internal/e2eData/NotificationsE2eDataController.kt
#	backend/testing/src/main/kotlin/io/tolgee/fixtures/scopeAssert.kt
#	backend/testing/src/main/kotlin/io/tolgee/fixtures/statusExpectations.kt
…-core

# Conflicts:
#	backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/InitialDataController.kt
#	backend/data/src/main/kotlin/io/tolgee/repository/LanguageRepository.kt
#	backend/data/src/main/resources/db/changelog/schema.xml
…-core

# Conflicts:
#	backend/data/src/main/kotlin/io/tolgee/model/UserAccount.kt
cyyynthia and others added 16 commits January 27, 2024 15:07
… cynthia/notifications-core

# Conflicts:
#	webapp/src/custom.d.ts
#	webapp/src/views/notifications/NotificationsRouter.tsx
# Conflicts:
#	backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/InitialDataController.kt
#	backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/keys/KeyController.kt
#	backend/api/src/main/kotlin/io/tolgee/hateoas/project/ProjectModelAssembler.kt
#	backend/data/src/main/kotlin/io/tolgee/activity/ActivityService.kt
#	backend/data/src/main/kotlin/io/tolgee/activity/views/ActivityViewByRevisionsProvider.kt
#	backend/data/src/main/resources/db/changelog/schema.xml
#	settings.gradle
#	webapp/package-lock.json
#	webapp/package.json
#	webapp/src/component/layout/TopBar/TopBar.tsx
#	webapp/src/store/index.ts
Hibernate once again complaining!
@github-actions github-actions bot added the stale label Jul 9, 2024
@tolgee tolgee deleted a comment from github-actions bot Jul 22, 2024
@JanCizmar JanCizmar added enhancement New feature or request roadmap item Items that are automatically added to the Roadmap and removed stale labels Jul 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request roadmap item Items that are automatically added to the Roadmap
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants