makiolaj
|
43e5e67752
|
Merge feat/481-settings-backup into release/2.25.0
# Conflicts:
# app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/CalendarPrefs.kt
# app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/ReminderStatePrefs.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/BackupScreen.kt
# floret-kit
|
2026-11-18 16:22:23 +01:00 |
|
makiolaj
|
ab88112915
|
Merge feat/464-notification-map into release/2.25.0
# Conflicts:
# app/src/main/AndroidManifest.xml
# app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderNotifier.kt
# floret-kit
|
2026-11-18 16:21:23 +01:00 |
|
makiolaj
|
71764ef0b8
|
Merge feat/429-default-calendar into release/2.25.0
# Conflicts:
# app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefs.kt
# app/src/main/java/de/jeanlucmakiola/calendula/domain/EventForm.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/common/EventActionsViewModel.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/detail/EventDetailViewModel.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsUiState.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsViewModel.kt
# app/src/test/java/de/jeanlucmakiola/calendula/ui/edit/EventEditViewModelTest.kt
|
2026-11-18 16:19:23 +01:00 |
|
makiolaj
|
c9ee36cec5
|
Merge feat/143-group-toggle into release/2.25.0
# Conflicts:
# app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/CalendarFilterList.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/filter/FilterViewModel.kt
|
2026-11-18 16:18:21 +01:00 |
|
makiolaj
|
23adec2122
|
Merge feat/270-per-view-hide into release/2.25.0
# Conflicts:
# app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefs.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/CalendarHost.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/calendars/CalendarsScreen.kt
# floret-kit
|
2026-11-18 16:17:35 +01:00 |
|
makiolaj
|
e22befd4c2
|
Merge feat/240-manual-sync into release/2.25.0
# Conflicts:
# app/src/main/AndroidManifest.xml
# app/src/main/java/de/jeanlucmakiola/calendula/data/calendar/CalendarRepositoryImpl.kt
# docs/PRIVACY.md
|
2026-11-18 16:17:04 +01:00 |
|
makiolaj
|
55dfb08aa3
|
Merge feat/516-backup-on-change into release/2.25.0
# Conflicts:
# app/src/main/java/de/jeanlucmakiola/calendula/data/backup/AutoBackup.kt
|
2026-11-18 16:16:18 +01:00 |
|
makiolaj
|
3bc2240407
|
Merge feat/325-copy-events into release/2.25.0
# Conflicts:
# floret-kit
|
2026-11-18 16:15:43 +01:00 |
|
makiolaj
|
e46891ae87
|
Merge feat/147-backup-caldav-per-calendar into release/2.25.0
# Conflicts:
# app/src/test/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefsTest.kt
# floret-kit
|
2026-11-18 16:15:43 +01:00 |
|
makiolaj
|
a110e84119
|
Merge feat/518-ringtone-picker into release/2.25.0
# Conflicts:
# app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderChannels.kt
# app/src/main/java/de/jeanlucmakiola/calendula/data/reminders/ReminderNotifier.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/CalendarReminderSettings.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/NotificationSettings.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsUiState.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsViewModel.kt
# app/src/main/res/values/strings.xml
# app/src/test/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefsTest.kt
# app/src/test/java/de/jeanlucmakiola/calendula/data/reminders/ReminderChannelPlanTest.kt
# floret-kit
|
2026-11-18 16:15:28 +01:00 |
|
makiolaj
|
c2a667725b
|
Merge feat/459-fixed-time-reminders into release/2.25.0
# Conflicts:
# app/src/main/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefs.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/CalendarReminderSettings.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsUiState.kt
# app/src/main/java/de/jeanlucmakiola/calendula/ui/settings/SettingsViewModel.kt
# app/src/test/java/de/jeanlucmakiola/calendula/data/prefs/SettingsPrefsTest.kt
# docs/ARCHITECTURE.md
|
2026-11-18 16:11:26 +01:00 |
|
makiolaj
|
ce31e506f8
|
Merge feat/145-per-calendar-notifications into feat/518-ringtone-picker
|
2026-11-16 21:39:21 +01:00 |
|
makiolaj
|
e5a5c10dea
|
fix(#464): an Open link button for reminders whose location is a web link
|
2026-11-16 20:43:43 +01:00 |
|
makiolaj
|
1bd055a0b7
|
fix(#240): Sync now shows the real sync state in the drawer, chip only when closed
|
2026-11-16 20:20:30 +01:00 |
|
makiolaj
|
ec060056dd
|
fix(#325): copy events as a full-screen two-step flow with a route card
|
2026-11-16 20:01:01 +01:00 |
|
makiolaj
|
e23a87c672
|
Merge feat/145-per-calendar-notifications into feat/459-fixed-time-reminders
|
2026-11-16 19:52:31 +01:00 |
|
makiolaj
|
84acc33bd6
|
Merge feat/145-per-calendar-notifications into feat/171-fullscreen-alerts
|
2026-11-16 19:21:54 +01:00 |
|
makiolaj
|
14f2dfe158
|
fix(#145): per-calendar reminders on their own grouped subpage
|
2026-11-16 18:52:19 +01:00 |
|
makiolaj
|
1aa66ffc99
|
feat(#517): move the per-view hide entry from the top bar into the drawer
|
2026-11-14 11:52:48 +01:00 |
|
makiolaj
|
d39ceb9ee0
|
fix(#518): review round 4 — silent channels read as silent, honest pick results, clearer failures
|
2026-11-14 04:21:27 +01:00 |
|
makiolaj
|
661300728a
|
fix(#518): review round 2 — late channel resolve, failure feedback, no sound flash, safer picks
|
2026-11-14 04:06:32 +01:00 |
|
makiolaj
|
18b9f19a61
|
fix(#518): review round 1 — current version from existing channels, batched picks, silent vs unset
|
2026-11-14 03:57:51 +01:00 |
|
makiolaj
|
6b108fb585
|
feat(#518): pick the reminder sound in the app via versioned channels
|
2026-11-14 03:48:53 +01:00 |
|
makiolaj
|
b2498d362b
|
feat(#516): back up after changes, refreshing the stable copies
|
2026-11-14 03:39:16 +01:00 |
|
makiolaj
|
dda0164c9f
|
fix(#517): review round 2 - close picker for every external request, clearer title, provider write first
|
2026-11-14 03:31:43 +01:00 |
|
makiolaj
|
bbcb8e00ed
|
fix(#517): review round 1 - close picker on external navigation, proper load/failure states, wait for stored hidden views
|
2026-11-14 03:22:35 +01:00 |
|
makiolaj
|
d943937b3a
|
feat(#517): quick per-view calendar toggle in the top bar
|
2026-11-14 03:14:47 +01:00 |
|
makiolaj
|
f181ae7ac9
|
fix(#171): merge review - ring channel up front, held-back status in the calendar header, silenced calendars stop a live ring
|
2026-11-14 03:10:20 +01:00 |
|
makiolaj
|
04f3b7ec8f
|
Merge feat/145-per-calendar-notifications into feat/171-fullscreen-alerts
|
2026-11-14 03:04:24 +01:00 |
|
makiolaj
|
028d8d0e1e
|
fix(#515, #325): review round 1 - multi-line RDATE, accepted occurrences of declined series copied, partial copies say so
|
2026-11-14 03:01:37 +01:00 |
|
makiolaj
|
d1880d04b2
|
fix(#459): post-merge review — summary channel under #145's blocked status, deep-link and Samsung hint
|
2026-11-14 03:00:14 +01:00 |
|
makiolaj
|
05ac15f63c
|
Merge feat/145-per-calendar-notifications into feat/459-fixed-time-reminders
|
2026-11-14 02:54:28 +01:00 |
|
makiolaj
|
955dccff2b
|
feat(#145): show calendars blocked in system settings, one-time Samsung category hint
|
2026-11-14 02:25:34 +01:00 |
|
makiolaj
|
10208a332e
|
fix(#147, #325): review round 3 - a failed moved occurrence stays at its old time, declined occurrences not copied, unlinked rows kept
|
2026-11-14 01:41:31 +01:00 |
|
makiolaj
|
34e8e8571c
|
fix(#240): list only dismissals that still apply, keep the access sheet across recreation
|
2026-11-14 00:56:47 +01:00 |
|
makiolaj
|
a026f24bed
|
feat(#240): per-account Don't ask for sync access, undone from the calendar manager
|
2026-11-14 00:51:00 +01:00 |
|
makiolaj
|
026970501e
|
fix(#325): review round 2 - cancelled and orphaned rows left out, re-runs add no duplicate overrides, stopped copies say so
|
2026-11-13 22:28:12 +01:00 |
|
makiolaj
|
e5d9b4965b
|
feat(#325): copy events from one calendar into another
|
2026-11-13 22:28:12 +01:00 |
|
makiolaj
|
14a0725b21
|
refactor(#240): grant-flow state in its own helper, clearer receipt when accounts need access
|
2026-11-13 22:18:09 +01:00 |
|
makiolaj
|
bb075d052e
|
fix(#147, #411): review round 6 - ledger reset per folder, atomic ledger updates, stable copies replaced only once the new one landed
|
2026-11-13 22:14:34 +01:00 |
|
makiolaj
|
e88ad7f533
|
fix(#240): guard double picker launch, flag skipped accounts in the receipt, translatable grant summary
|
2026-11-13 22:10:04 +01:00 |
|
makiolaj
|
67052352ac
|
fix(#240): access re-read on resume, needs-access receipt, drawer stays open for the next grant
|
2026-11-13 22:04:44 +01:00 |
|
makiolaj
|
88de8f42b0
|
feat(#240, #303): grant account access for sync requests instead of an account-less fallback
|
2026-11-13 21:57:55 +01:00 |
|
makiolaj
|
88c64d5786
|
feat(#147, #411): stable undated latest copy per backup series
|
2026-11-13 21:56:54 +01:00 |
|
makiolaj
|
5ee25c2115
|
fix(#481): keep per-calendar settings when calendars can't be read, re-apply mirror reminders
|
2026-11-13 19:46:32 +01:00 |
|
makiolaj
|
38e7910d3c
|
fix(#429): duplicates keep only target calendars, re-picking the shown calendar is no change
|
2026-11-13 19:41:11 +01:00 |
|
makiolaj
|
90b640054a
|
feat(#481): export and import settings in Backup & restore
|
2026-11-13 19:39:47 +01:00 |
|
makiolaj
|
aa1ce0405a
|
fix(#429): keep the default across renames and restores, drop a duplicate's colour off its calendar
|
2026-11-13 19:34:27 +01:00 |
|
makiolaj
|
6a9274402a
|
fix(#429): only preselect target calendars, key the default by account and name
|
2026-11-13 19:26:47 +01:00 |
|
makiolaj
|
9577e6c0c8
|
feat(#429): default calendar for new events
|
2026-11-13 19:20:07 +01:00 |
|