ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2026-10-23 05:57:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
490 Commits 7 Branches 0 Tags
d9ee1cd921e14b5d9ccb2e2b574842fcaa579ee5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Milan Paunovic d9ee1cd921 Merge branch 'dev' 2025-02-15 21:08:30 +01:00
Milan Paunovic b804f37037 Merge branch 'dev' 
# Conflicts:
#	app/_layout.tsx
#	firebase/functions/index.js
 2025-02-15 16:44:45 +01:00
Milan Paunovic 718fd562ff cicd adjustment 2025-02-14 19:18:01 +01:00
Milan Paunovic a855e6d3bf cicd adjustment 2025-02-14 19:16:51 +01:00
Milan Paunovic e04441bd81 Calendar controls fix 2025-02-14 15:05:42 +01:00
Milan Paunovic f9a5e76162 Calendar controls fix 2025-02-12 01:11:28 +01:00
Milan Paunovic 479e7c5f56 Merge branch 'dev' 
# Conflicts:
#	firebase/functions/index.js
 2025-02-12 00:43:48 +01:00
Milan Paunovic 3d15d7bb74 Functions update 2025-02-07 14:12:23 +01:00
Milan Paunovic 300ce82a4d Functions update 2025-02-06 09:44:06 +01:00
Milan Paunovic 5ac4526baf Functions update 2025-02-06 01:03:34 +01:00
Milan Paunovic 5cfec1544a Calendar improvements 2025-02-02 22:28:40 +01:00
Milan Paunovic 0998dc29d0 Month fixes 2025-01-26 17:15:13 +01:00
Milan Paunovic dc7d59eecc Merge branch 'refs/heads/dev' 2025-01-26 16:07:21 +01:00
Milan Paunovic 14be80c6f0 Fixes 2025-01-24 01:12:18 +01:00
Milan Paunovic 580104d052 Month cal changes 2025-01-23 02:16:07 +01:00
Milan Paunovic 231e99ff8f Merge branch 'dev' 2025-01-19 15:28:00 +01:00
Milan Paunovic bc77c403f2 Month calendar fix 2025-01-17 00:39:20 +01:00
Milan Paunovic 1d4903b609 Merge branch 'dev' 
# Conflicts:
#	components/pages/calendar/MonthCalendar.tsx
 2025-01-17 00:26:36 +01:00
Milan Paunovic 60953c34bc Month calendar 2025-01-16 00:22:09 +01:00
Milan Paunovic adafaf1dfe Merge branch 'dev' 2025-01-15 17:39:07 +01:00
Milan Paunovic 49be903553 Patch fix 2024-12-30 11:39:48 +03:00
Milan Paunovic 8b6171a819 Merge remote-tracking branch 'origin/main' 2024-12-30 11:37:19 +03:00
Milan Paunovic 28110b88cc Merge branch 'dev' 2024-12-28 00:57:25 +01:00
Milan Paunovic 7d3e39b77d Deletion fix 2024-12-24 23:19:23 +01:00
Milan Paunovic 609d01b81c Merge branch 'dev' 2024-12-24 16:12:36 +01:00
Milan Paunovic 10f6616cd0 Deletion fix 2024-12-24 16:07:18 +01:00
Milan Paunovic c93d66d13d Phone header fix 2024-12-20 16:38:08 +01:00
Milan Paunovic 1c9f9f865c Phone header fix 2024-12-20 13:43:20 +01:00
Milan Paunovic 00092ae5f8 Merge branch 'dev' 2024-12-20 13:28:06 +01:00
Milan Paunovic 63699d53f4 Revert "Don't spin on scroll" 
This reverts commit 1903e4072c.
 2024-12-18 17:37:29 +01:00
Milan Paunovic e86b2a5950 Don't spin on scroll 2024-12-18 17:37:06 +01:00
Milan Paunovic 1903e4072c Don't spin on scroll 2024-12-18 17:37:00 +01:00
Milan Paunovic 8aca8e46db Deleting event fix 2024-12-18 17:28:47 +01:00
Milan Paunovic 003f3717e5 build fix 2024-12-16 20:19:44 +01:00
Milan Paunovic a4bd7920e4 Merge branch 'dev' 2024-12-15 22:24:06 +01:00
Milan Paunovic 72aa06ad22 Notifications sorting, modal fixes 2024-12-15 18:45:04 +01:00
Milan Paunovic 56f37cef94 Merge branch 'dev' 2024-12-15 18:25:03 +01:00
Milan Paunovic bb68a89cfb Fix stuff 2024-12-15 17:57:30 +01:00
Milan Paunovic 818107efe3 Fix stuff 2024-12-15 17:54:01 +01:00
Milan Paunovic c411990312 Fixes 2024-12-15 16:46:26 +01:00
Milan Paunovic 70db8bdc0b New calendar 2024-12-15 16:29:34 +01:00
Milan Paunovic a6009beb03 Merge branch 'refs/heads/dev' 2024-12-15 16:28:07 +01:00
Milan Paunovic 67c896b9c6 Merge branch 'refs/heads/dev' 
# Conflicts:
#	components/pages/calendar/ManuallyAddEventModal.tsx
 2024-12-15 14:34:49 +01:00
Milan Paunovic fe9ee5334d Fixes 2024-12-10 22:00:36 +01:00
Milan Paunovic 35608e350f Fixes 2024-12-10 20:05:15 +01:00
Milan Paunovic ee04ba7850 IOS updates 2024-12-08 19:09:45 +01:00
Milan Paunovic ffb0df6bac IOS updates 2024-12-08 18:07:28 +01:00
Milan Paunovic 33ada3505b bugfixes 2024-12-08 12:22:24 +01:00
Milan Paunovic 94784b3706 Merge branch 'refs/heads/dev' 2024-12-08 11:38:59 +01:00
Milan Paunovic 3880b0e1f4 bugfixes 2024-12-04 21:17:44 +01:00
Milan Paunovic 771dba9658 bugfixes 2024-12-04 21:17:23 +01:00
Milan Paunovic dfe7301f6d bugfixes 2024-11-28 08:38:52 +01:00
Milan Paunovic 3dff040cea Revert calendar 2024-11-27 09:49:41 +01:00
Milan Paunovic 95d5e74703 Calendar, syncing rework 2024-11-27 01:37:58 +01:00
Milan Paunovic f2af60111b Syncing rework 2024-11-26 21:13:54 +01:00
Milan Paunovic 5cfdc84055 Merge branch 'dev' 
# Conflicts:
#	app/(auth)/calendar/index.tsx
 2024-11-26 21:01:10 +01:00
Milan Paunovic ee749e1077 Notification batch updates and notifications page update 2024-11-23 16:39:56 +01:00
Milan Paunovic cd178b8a9d Merge branch 'dev' 
# Conflicts:
#	components/pages/calendar/EventCalendar.tsx
 2024-11-23 14:31:58 +01:00
Milan Paunovic d091aaa0ee Batch updates 2024-11-22 09:21:12 +01:00
Milan Paunovic 06a3a2dc8f Notification changes 2024-11-22 03:25:16 +01:00
Milan Paunovic f74a6390a2 Merge branch 'dev' 2024-11-21 19:22:28 +01:00
Milan Paunovic 9f32e81672 supportsTablet 2024-11-19 14:16:46 +01:00
Milan Paunovic bd890406b1 podfile update 2024-11-19 11:55:27 +01:00
Milan Paunovic 47f035708c notification update 2024-11-19 11:54:16 +01:00
Milan Paunovic 8ac7f8b2eb notification update 2024-11-05 13:46:29 +01:00
Milan Paunovic 4318f58e22 Merge branch 'dev' 
# Conflicts:
#	components/pages/calendar/EventCalendar.tsx
#	components/pages/settings/user_settings_views/MyProfile.tsx
 2024-11-05 13:44:42 +01:00
Milan Paunovic 84a974f3f7 Added notifciations 2024-11-04 01:01:59 +01:00
Milan Paunovic 848211c3c8 Merge branch 'dev' 
# Conflicts:
#	app/(auth)/_layout.tsx
#	components/pages/settings/user_settings_views/MyProfile.tsx
#	yarn.lock
 2024-11-04 00:26:18 +01:00
Milan Paunovic a577bfb23f cal sync improvements 2024-11-04 00:24:31 +01:00
Milan Paunovic f1b0bcd32d sync update 2024-11-02 22:27:17 +01:00
Milan Paunovic 8a0370933d sync update 2024-11-02 12:00:49 +01:00
Milan Paunovic a6b2c4b97f "supportsTablet": false, 2024-11-02 00:28:38 +01:00
Milan Paunovic e25a4f07ff "supportsTablet": false, 2024-11-02 00:02:54 +01:00
Milan Paunovic c4e4a4a798 Faimly 2024-11-01 23:45:05 +01:00
Milan Paunovic 18223c5f92 All day event package 2024-11-01 23:17:56 +01:00
Milan Paunovic 87137e7b15 All day event package 2024-11-01 22:02:36 +01:00
Milan Paunovic 61fff87975 Update fetching google calendar, fix babel config 2024-11-01 18:19:56 +01:00
Milan Paunovic e306f312f4 Update deps 2024-11-01 17:30:57 +01:00
Milan Paunovic 5e82fffa80 Update deps 2024-11-01 12:04:55 +01:00
Milan Paunovic 3e517e3a53 Update deps 2024-11-01 11:52:49 +01:00
Milan Paunovic a4a0a66a2a Reduce sync 2024-11-01 11:01:28 +01:00
Milan Paunovic 9f37d22d5a Build update 2024-11-01 10:32:56 +01:00
Milan Paunovic c1252cf092 Dont use enriched events 2024-11-01 10:29:23 +01:00
Milan Paunovic e965072186 CICD update 2024-11-01 10:06:23 +01:00
Milan Paunovic 0a54d1e576 Bundle update 2024-11-01 09:43:42 +01:00
Milan Paunovic 38586d34ff Legacy peer deps 2024-11-01 08:36:41 +01:00
Milan Paunovic 9ca96b2286 profile deletion added 2024-11-01 05:19:11 +01:00
Milan Paunovic 6e7a3475d1 PKG update 2024-11-01 05:00:54 +01:00
Milan Paunovic 0d2fe33caa PKG update 2024-11-01 04:58:55 +01:00
Milan Paunovic 4f1a96d0f1 PKG update 2024-11-01 04:47:58 +01:00
Milan Paunovic 2605f4622b Merge branch 'dev' 
# Conflicts:
#	yarn.lock
 2024-11-01 04:46:19 +01:00
Milan Paunovic cc2defe154 Minor changes 2024-11-01 04:45:43 +01:00
Milan Paunovic 37529c454e Added ask your family message 2024-11-01 04:38:42 +01:00
Milan Paunovic 909a4344dc Profile picture upload added, QR code scan fix 2024-11-01 04:34:59 +01:00
Milan Paunovic 0fbf89644f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	components/pages/settings/CalendarSettingsPage.tsx
 2024-11-01 03:20:51 +01:00
Milan Paunovic 7f68f3acf8 New onboarding flow, calendar sync logic refactor 2024-11-01 03:18:50 +01:00
Milan Paunovic 539cbd9f10 Minor fixes 2024-10-31 23:41:54 +01:00
Milan Paunovic ca5df87f3d Small fixes 2024-10-31 21:28:23 +01:00
Milan Paunovic fda1287011 Fix first day of week setting 2024-10-31 20:25:58 +01:00
Milan Paunovic 8edb8f47f2 Small fixes, calendar token refresh for google 2024-10-31 19:57:06 +01:00