ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2026-10-23 10:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
87 Commits 7 Branches 0 Tags
2c099740a2126b5b88c21b8df3c16098305ea67d
Commit Graph
55 Commits
Author SHA1 Message Date
Milan Paunovic 2c099740a2 Merge branch 'main' into dev 
# Conflicts:
#	app/(auth)/_layout.tsx
 2024-10-09 17:34:15 +02:00
ivic00 fb3859e69b Merge branch 'dev' of https://github.com/urosran/cally into dev 2024-10-07 00:11:34 +02:00
ivic00 2b55c5db0c grocery changes 2024-10-07 00:10:51 +02:00
Milan Paunovic b74887cf3c Fix fetching events 2024-10-06 16:08:35 +02:00
Milan Paunovic 10565ceb39 Merge branch 'dp/calendar-sync' into dev 
# Conflicts:
#	components/pages/settings/CalendarSettingsPage.tsx
#	yarn.lock
 2024-10-06 00:07:24 +02:00
ivic00 fe6e0365a4 changes to calendar and UI 2024-10-05 23:41:44 +02:00
Milan Paunovic aed2333404 Microsoft sync added 2024-10-05 22:22:29 +02:00
Dejan 2234fac075 - Fixed wrong method being called when fetching microsoft events 2024-10-05 22:11:22 +02:00
Dejan d1d3fd0ca1 - Introduced attribute id in the eventData type 
- INtroduced new method to save the event data from the google and microsoft providers only if there isn't already an event with the same id
 2024-10-05 21:59:59 +02:00
Dejan 6ad587ef31 - Fixed an issue with the required date format for the start and end date when fetching the google events 2024-10-05 21:41:40 +02:00
Dejan d9853481de - Fixed label 2024-10-05 21:08:41 +02:00
Dejan 977bf45fb2 - Additional comment 2024-10-05 16:20:15 +02:00
Dejan b5a8712af8 - Prepared methods for microsoft authorization and added a button to handle microsoft auth 
- Saved the microsoft token to the profile of the current user
 2024-10-05 16:17:55 +02:00
Dejan 7eb040a8a9 - Implemented google sign in and saved the id token in db for the current user 
- Used the id token for the current user for fetching the google calendar events
 2024-10-05 15:53:20 +02:00
Dejan 8161accdb6 - Introduced a button for syncing Microsoft calendar 
- Implemented saving of the microsoft event data in db
 2024-10-05 00:32:57 +02:00
Dejan 59efcc16c5 - Implementation of a google authentication with a react-native library 2024-10-04 01:37:36 +02:00
Dejan ba74025589 - Introduced a button for syncing Google calendar 
- Implemented saving of the google event data in db
- Added start date to the google calendar fetch api endpoint
 2024-10-04 01:04:11 +02:00
Milan Paunovic c726081b96 Merge branch 'dev' 
# Conflicts:
#	app/(auth)/calendar/index.tsx
#	yarn.lock
 2024-09-29 23:04:17 +02:00
Milan Paunovic 5922179584 LOgging in with qr code added 2024-09-29 23:03:21 +02:00
ivic00 e17dabe801 calendar changes, fixes 2024-09-29 22:24:37 +02:00
ivic00 908eeab607 ui tweaks 2024-09-28 20:38:20 +02:00
Milan Paunovic 92f335543f Adding and displaying family members 2024-09-28 19:08:09 +02:00
Milan Paunovic 594e54b11b start on 0 seconds 2024-09-28 13:23:53 +02:00
Milan Paunovic 91717c699d ver bump 2024-09-28 08:59:05 +02:00
Milan Paunovic 7ab2fe7906 Init date fix 2024-09-27 19:45:32 +02:00
Milan Paunovic 92f72b4483 fix build 2024-09-27 12:13:39 +02:00
Milan Paunovic 78a73b18ef Merge branch 'dev' 
# Conflicts:
#	app/(auth)/calendar/index.tsx
#	components/pages/calendar/ManuallyAddEventModal.tsx
#	components/pages/main/SignUpPage.tsx
#	package.json
 2024-09-27 10:35:21 +02:00
ivic00 7fa5a17e0b bug fixes and new screens 2024-09-26 23:10:35 +02:00
ivic00 857e60a3d3 fix groceries, todo, calendar 2024-09-25 20:45:14 +02:00
Milan Paunovic 926af6212b Remove dark theme 2024-09-23 20:58:48 +02:00
Milan Paunovic e5540c15e3 Test adding events by clicking on calendar cells 2024-09-22 13:14:26 +02:00
Milan Paunovic 1533ec525b CICD test 2024-09-21 21:29:55 +02:00
ivic00 b46fb1b2a8 user settings, points slider 2024-09-20 19:47:21 +02:00
ivic00 39ef35022c added settings pages 2024-09-19 21:38:37 +02:00
ivic00 ac7e839273 brain_dump and settings 2024-09-18 16:41:23 +02:00
ivic00 f291f985a3 changes to groceries, todos 2024-09-12 23:04:41 +02:00
ivic00 53f7118656 changes to grocery, todos 2024-09-12 15:39:20 +02:00
ivic00 8d85cbdaad edit todos 2024-09-05 22:09:28 +02:00
ivic00 f08b6ea997 changes to todo 2024-09-05 19:27:44 +02:00
ivic00 ee72c9c56a main menu change 2024-09-03 20:46:14 +02:00
ivic00 80a553695b add To Dos 2024-09-02 22:47:15 +02:00
ivic00 ff9e94e392 fix Grocery page, add Reminders context 2024-08-31 18:19:51 +02:00
ivic00 f8dd152eeb add groceryContext and manipulation 2024-08-31 15:52:45 +02:00
ivic00 5a5215aeb4 reorganized and fixed groceries 2024-08-30 21:16:06 +02:00
ivic00 ca631319ad addGrocery dialog 2024-08-27 14:21:05 +02:00
ivic00 c6985ef8f2 grocery icon changes 2024-08-26 23:20:54 +02:00
ivic00 f440261447 started groceries page 2024-08-26 23:04:36 +02:00
Milan Paunovic 96168316b5 Event creation 2024-08-26 13:42:28 +02:00
ivic00 0a862e7a8c additional hooks 2024-08-22 22:02:43 +02:00
ivic00 807f37fa0c mock add new reminder 2024-08-05 22:00:40 +02:00