Commit Graph

36 Commits

Author SHA1 Message Date
Giulia
07604bddaa notes 2023-09-29 15:16:30 +02:00
Giulia
2b18144691 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	lib/database/database.dart
#	lib/main.dart
#	lib/model/note.dart
#	lib/model/promemoria.dart
#	lib/navigation.dart
2023-09-29 15:15:04 +02:00
e07fd0d191 fix init database 2023-09-29 15:12:55 +02:00
grata
de4769cbb8 removed controller on dev 2023-09-29 15:05:22 +02:00
Giulia
e4cf349cbb Merge remote-tracking branch 'origin/Zina' into dev 2023-09-29 14:54:38 +02:00
grata
93b54f357b Merge remote-tracking branch 'origin/firebase' into dev 2023-09-29 14:50:49 +02:00
Tito Arrigo
0628fcbbdb bo non lo so 2023-09-29 14:44:12 +02:00
grata
5b02be9ae7 removed controller 2023-09-29 14:26:09 +02:00
grata
8049165f44 collegato lightsql e firebase 2023-09-29 13:39:03 +02:00
Tito Arrigo
a4a13cc2ea Merge remote-tracking branch 'origin/firebase' into dev
# Conflicts:
#	lib/model/promemoria.dart
2023-09-29 11:57:24 +02:00
Tito Arrigo
67dd09b2dd new ui model integration 2023-09-29 11:49:31 +02:00
grata
34a73c62f7 database work in progress 2023-09-29 11:49:21 +02:00
b75903e3cb work in progress database 2023-09-29 11:38:06 +02:00
Giulia
ccb56ffa9c fix notes 2023-09-29 09:52:26 +02:00
simonmaggini
5c68d85b98 listViw builder 2023-09-29 09:50:48 +02:00
Giulia
bf3a9c552d fix 2023-09-29 09:09:26 +02:00
Giulia
c2196663ae Merge remote-tracking branch 'origin/dev' into Zina
# Conflicts:
#	lib/navigation.dart
#	lib/pages/InboxView.dart
#	lib/pages/TodayView.dart
2023-09-29 08:43:10 +02:00
Tito Arrigo
7d1bec6b0c grafica quasi finita 2023-09-29 08:28:08 +02:00
Giulia
6d9eb5f4db fixed style 2023-09-28 14:45:00 +02:00
lama137
b284a3d6d6 TITOOOOOOOOOOOOO 2023-09-28 14:26:17 +02:00
lama137
d69c7ab525 Merge remote-tracking branch 'origin/Tito' into Zina
# Conflicts:
#	lib/database/database.dart
#	lib/model/note.dart
#	lib/model/promemoria.dart
#	lib/navigation.dart
2023-09-28 14:12:20 +02:00
Giulia
c0c090085f create note 2023-09-28 13:57:51 +02:00
Giulia
4121239e36 create note 2023-09-28 13:56:54 +02:00
Giulia
abc0926f49 create note 2023-09-28 13:55:49 +02:00
Giulia
b81cfc70fb fix 2023-09-28 13:21:02 +02:00
Tito Arrigo
c2824c99a4 merge 2023-09-28 13:04:42 +02:00
Tito Arrigo
e061871c4f grafica pagina TodayView.dart 2023-09-28 11:46:08 +02:00
782bbebce9 database init 2023-09-28 11:38:19 +02:00
lama137
0fb537d24e Aggiornamento note e pulsanti. 2023-09-28 11:04:46 +02:00
lama137
06a3712d0a Aggiornamento note e pulsanti. 2023-09-28 11:03:54 +02:00
Giulia
65ed67b8f6 fixed navigation and added create new note page 2023-09-28 10:40:01 +02:00
Tito Arrigo
29a54bbcbc grafica pagina TodayView.dart 2023-09-28 09:49:09 +02:00
Giulia
bf7981671d add note button 2023-09-28 09:07:00 +02:00
lama137
2f851bc630 IDK 2023-09-28 09:02:52 +02:00
Tito Arrigo
c35684c8f1 inizzializazione pagine 2023-09-27 14:17:52 +02:00
Tito Arrigo
6a05861341 inizzializazione pagine 2023-09-27 14:02:53 +02:00