239 Commits

Author SHA1 Message Date
Yapollon
8094bd7865 Merge remote-tracking branch 'origin/master' 2024-03-07 18:48:30 +01:00
Yapollon
1d8dd83086 MIGRATE: Implemented user color setting. 2024-03-07 18:48:19 +01:00
Luis
e86c7ac941 Merge remote-tracking branch 'origin/master' 2024-03-07 18:46:14 +01:00
Luis
5f75997617 moved accept_list from habitListe to User 2024-03-07 18:44:13 +01:00
412666705c Liste verlassen feature 2024-03-07 18:39:15 +01:00
Luis
69b3c257d1 Merge remote-tracking branch 'origin/master' 2024-03-07 18:28:39 +01:00
Luis
db45e7f059 added a way to accept shared habit_lists instead of directly accepting. accepted via habit_list.accept_List(habit_List.id, user.id) 2024-03-07 18:28:06 +01:00
Yapollon
45f23c88e2 MIGRATE: Implemented user color setting. 2024-03-07 17:54:49 +01:00
164534ada1 Merge remote-tracking branch 'origin/master' 2024-03-07 17:54:11 +01:00
20f9800203 edit users 2024-03-07 17:54:06 +01:00
Luis
0dbac5afd5 added accepted column. 2024-03-07 17:47:09 +01:00
Luis
817ef7f683 Merge remote-tracking branch 'origin/master' 2024-03-07 17:09:22 +01:00
Luis
6e84e6aeaf Added Button for Habit suggestions. 2024-03-07 17:05:18 +01:00
Yapollon
66aabf697c Colorpicker Update 1
we live, we love, we want the colorpicker
2024-03-07 16:26:56 +01:00
Yapollon
5a68a2ef39 Update app.py 2024-03-07 16:00:04 +01:00
d340a1e19f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	templates/components/habit_lists.html
2024-03-07 15:57:10 +01:00
0312bc10dc heatmap current day marked 2024-03-07 15:56:33 +01:00
Yapollon
11104fe96b cleaned code
yippie
2024-03-07 15:56:06 +01:00
Yapollon
ca9168cff4 better design 2024-03-07 15:48:39 +01:00
Yapollon
e3ea8d7b17 Update get_heatmap 2024-03-07 15:07:26 +01:00
Yapollon
82b36bcd0b Heatmap fix 2024-03-07 15:04:29 +01:00
Yapollon
56af47bda3 Merge branch 'master' of https://repo.cimeyclust.com/CimeyClust/HabitTracker 2024-03-07 14:28:25 +01:00
Yapollon
5e71260dbe Responsive Heatmap!
- Deleted the shitty spline model
2024-03-07 14:28:20 +01:00
32cec2e731 times errors and cards 2024-03-07 14:20:45 +01:00
Yapollon
22ecf59c62 Gif Update
We going to Fazbears Pizza with this one
2024-03-07 10:38:53 +01:00
Yapollon
def7e1845e very important fix 2024-03-06 13:07:49 +01:00
Yapollon
67ef6296c9 Update SQLiteClient.py 2024-03-06 11:14:40 +01:00
Yapollon
17a3f7bacc Merge branch 'master' of https://repo.cimeyclust.com/CimeyClust/HabitTracker 2024-03-06 11:14:27 +01:00
Yapollon
adeab273a6 Update User.py 2024-03-06 11:14:15 +01:00
Verox001
66d8eb8f78 Improved responsive design 2024-03-06 11:09:59 +01:00
Yapollon
776eaec21b Merge remote-tracking branch 'origin/master' 2024-03-06 11:05:16 +01:00
Verox001
4dc494e67a Implemented habit list deletion 2024-03-06 11:04:32 +01:00
Yapollon
e9368f567e HabitList fix 2024-03-06 11:04:15 +01:00
Verox001
b04068da4e Improved layouting 2024-03-06 10:52:47 +01:00
af86caa196 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	templates/index.html
2024-03-06 10:33:04 +01:00
30edcec39c Merge remote-tracking branch 'origin/master' 2024-03-05 11:16:03 +01:00
424a423f7c delete list 2024-03-05 11:15:43 +01:00
Verox001
785edd1f88 Fixed SQL operational error 2024-03-05 10:54:26 +01:00
ec82160214 Merge remote-tracking branch 'origin/master' 2024-03-05 10:53:46 +01:00
Verox001
51742411ca Fixed day count 2024-03-05 10:49:29 +01:00
Verox001
295f02509c Started app at 0.0.0.0 host 2024-03-05 10:37:18 +01:00
Verox001
7aec15c4cd Updated requirements.txt 2024-03-05 10:33:28 +01:00
d26b1a4ff8 Merge remote-tracking branch 'origin/master' 2024-03-05 10:27:33 +01:00
Verox001
8814a6a834 Added requirements.txt 2024-03-05 10:13:50 +01:00
c258dec2bd Spline Integration 2024-03-05 10:13:02 +01:00
45f3974514 fixed yassins wrongdoing 2024-03-05 10:05:38 +01:00
Verox001
6282c374f7 Fixed habit times check 2024-03-05 09:59:09 +01:00
4e996180fe Merge remote-tracking branch 'origin/master' 2024-03-05 09:50:13 +01:00
Verox001
53a884d23e Fixed user None Check 2024-03-05 09:49:38 +01:00
0208ef5f47 Merge remote-tracking branch 'origin/master' 2024-03-05 09:48:28 +01:00