Commit Graph

5767 Commits

Author SHA1 Message Date
Eudes Inácio 05bbbd0242 recurence text added 2024-06-10 10:56:11 +01:00
Eudes Inácio 0ac0db980f Merge branch 'feature/agenda-new-api-eudes' into feature/agenda-new-api-eudes-backup 2024-06-10 10:18:33 +01:00
Eudes Inácio 931859d271 uncomment calandar official and personal in web html 2024-06-10 10:17:50 +01:00
Eudes Inácio 84e1828c79 Merge branch 'feature/agenda-new-api-eudes' into feature/agenda-new-api-eudes-backup 2024-06-10 09:58:33 +01:00
Eudes Inácio c28d17fa64 recurence added 2024-06-10 09:55:23 +01:00
Peter Maquiran a78fa25d65 fix agenda saying 2024-06-10 09:08:58 +01:00
Peter Maquiran 07d224c857 add themes 2024-06-10 08:59:19 +01:00
Peter Maquiran cca859b6c4 remove unused files 2024-06-08 17:18:38 +01:00
Peter Maquiran ef30adcf46 Merge branch 'feature/agenda-new-api-eudes' of bitbucket.org:equilibriumito/gabinete-digital-fo into feature/agenda-new-api-eudes 2024-06-08 16:30:16 +01:00
Peter Maquiran 1316d9280e Merge branch 'feature/agenda-new-api-peter' into feature/agenda-new-api-eudes 2024-06-08 16:30:04 +01:00
Peter Maquiran 22a834f4b6 fix calendar name 2024-06-08 15:08:28 +01:00
Eudes Inácio e0a7323bb0 owner type bug solved 2024-06-08 00:47:52 +01:00
Eudes Inácio 0a898538a4 Merge branch 'feature/agenda-new-api-eudes' of https://bitbucket.org/equilibriumito/gabinete-digital-fo into feature/agenda-new-api-eudes 2024-06-07 16:05:21 +01:00
Eudes Inácio 5cac864294 recurece added to new event web 2024-06-07 16:05:13 +01:00
Peter Maquiran ae2ddc5e24 add calendar list on creating event 2024-06-07 16:00:45 +01:00
Eudes Inácio 4c51188c66 Merge branch 'feature/agenda-new-api-peter' into feature/agenda-new-api-eudes 2024-06-07 14:11:42 +01:00
Eudes Inácio 4be9c6562e add recurence to agenda web 2024-06-07 14:10:17 +01:00
Peter Maquiran 41cabb76ac show two calendar at time 2024-06-07 13:37:06 +01:00
Peter Maquiran 0d415679ea default calendar 2024-06-07 13:16:19 +01:00
Peter Maquiran 95bb69be99 fix calendar name 2024-06-07 10:54:11 +01:00
Peter Maquiran 59d0881669 remove calendar id 2024-06-07 10:26:26 +01:00
Peter Maquiran 07c0223ed2 fix forech wrong data 2024-06-06 15:42:58 +01:00
Peter Maquiran 14976cc159 list shared calendar from new api 2024-06-06 15:13:03 +01:00
Peter Maquiran 74a365b3cf add endpoint to get sharedCalendar 2024-06-06 10:26:34 +01:00
Eudes Inácio b041ae73f5 agenda search back to default 2024-06-04 15:31:12 +01:00
Eudes Inácio 96ead04066 some fix 2024-06-04 13:18:00 +01:00
Eudes Inácio ed9ea95292 Merge branch 'feature/agenda-new-api-peter' into feature/agenda-new-api-eudes 2024-06-04 11:58:21 +01:00
Eudes Inácio 87ba7a6cd9 web new api done 2024-06-04 11:56:56 +01:00
Peter Maquiran 21d9f6ef0a Merge branch 'feature/agenda-new-api-peter' into feature/agenda-new-api-eudes 2024-06-04 11:12:38 +01:00
Peter Maquiran a9525cbd02 fix duplication 2024-06-04 11:01:38 +01:00
Eudes Inácio 399700c67c Merge branch 'feature/agenda-new-api-peter' into feature/agenda-new-api-eudes 2024-06-04 10:23:01 +01:00
Eudes Inácio bf5b62fe60 bug solve 2024-06-04 10:21:40 +01:00
Peter Maquiran 6bbc66fea0 fix agenda duplication 2024-06-04 10:20:55 +01:00
Eudes Inácio 9fcf116102 teste mobile done! 2024-06-04 09:38:11 +01:00
Peter Maquiran 320e7c41b3 fix duplication events 2024-06-03 13:28:18 +01:00
Eudes Inácio 9265622e65 Merge branch 'feature/agenda-new-api-peter' into feature/agenda-new-api-eudes 2024-06-02 13:55:04 +01:00
Eudes Inácio e9c8e0fbd9 lot of changes 2024-06-02 13:53:46 +01:00
Peter Maquiran f38b445bd4 change api source for mobile 2024-06-02 13:48:01 +01:00
Peter Maquiran c372f7b2b9 Merge branch 'feature/agenda-new-api-eudes' of bitbucket.org:equilibriumito/gabinete-digital-fo into feature/agenda-new-api-peter 2024-05-31 15:50:00 +01:00
Eudes Inácio 599d278e57 message add to delete 2024-05-31 15:49:36 +01:00
Peter Maquiran b29eeaf18a Merge branch 'feature/agenda-new-api-eudes' of bitbucket.org:equilibriumito/gabinete-digital-fo into feature/agenda-new-api-peter 2024-05-31 15:48:29 +01:00
Peter Maquiran 4f4cc95ceb change calendarid by userid 2024-05-31 15:47:09 +01:00
Peter Maquiran a89b9dd4b6 fix view event in some component 2024-05-31 13:59:51 +01:00
Peter Maquiran 2159692018 add event to approve options 2024-05-31 13:33:10 +01:00
Eudes Inácio 74c1df7a5c Merge branch 'feature/agenda-new-api-peter' into feature/agenda-new-api-eudes 2024-05-31 13:19:39 +01:00
Eudes Inácio 19df167f74 some changes 2024-05-31 13:18:25 +01:00
Peter Maquiran 3b91d41b3b change to dynamic values 2024-05-31 13:05:53 +01:00
Peter Maquiran d87a01e517 merge with eudes branch 2024-05-31 12:54:07 +01:00
Eudes Inácio 68379b8ecf edit event to aprove done 2024-05-31 12:50:25 +01:00
Peter Maquiran c982708972 fix loader 2024-05-31 12:49:49 +01:00