269 Commits

Author SHA1 Message Date
Yapollon
5251a80d02 Merge branch 'master' of https://repo.cimeyclust.com/CimeyClust/HabitTracker 2024-03-25 12:41:12 +01:00
Yapollon
f53b3c4059 Fix Ups
some changes i had on my local folder
2024-03-25 12:41:01 +01:00
Verox
ff670abc1d Fixed redirect after use removal from habit list 2024-03-14 20:09:29 +01:00
Verox
fce1593e32 Fixed user ownership check if habit_lists 2024-03-14 19:50:50 +01:00
Yapollon
e57cc58b3e new icon! 2024-03-13 12:04:00 +01:00
Yapollon
94a84ecfe4 Merge branch 'master' of https://repo.cimeyclust.com/CimeyClust/HabitTracker 2024-03-12 11:14:44 +01:00
Yapollon
d2730a58fe insane fix 2024-03-12 11:14:28 +01:00
Verox001
2b8dba9c0b Finished and beautified ER diagram 2024-03-12 10:11:01 +01:00
Yapollon
273eca9da2 fixed heatmap 2024-03-12 07:54:00 +01:00
Verox
88fc1ef573 Added habit list being fixed at one after page reload 2024-03-11 19:07:50 +01:00
Yapollon
1317161ae9 HabitList Drag and Drop
It works now, yay!
2024-03-10 22:02:57 +01:00
Yapollon
03e1f22a87 Cleanup 2024-03-10 21:02:33 +01:00
Yapollon
fdc90fe118 Slot System for HabitLists 2024-03-10 13:10:54 +01:00
Yapollon
f81ec8368c Progessbar Update
If the Time selected by the unit is over the count will drop to 0
2024-03-09 15:15:07 +01:00
Yapollon
fe91faf5b1 dynamic Time 2024-03-09 14:48:07 +01:00
Yapollon
9d945f5edc Profile Image Optimizations
made it as fast as i could, maybe there are faster solutions but I'm fine with this
2024-03-09 14:24:02 +01:00
Yapollon
be16821be2 Delete Account
You can now delete the account in the profile settings
Also profile images associated with the user will be removed from the file system

+ fixed that HabitList deletion doesn't cause Habit Deletion
2024-03-08 15:49:46 +01:00
Yapollon
0d2baf6325 heatmap.css 2024-03-08 14:05:22 +01:00
Yapollon
1d88041023 Reformating 2 2024-03-08 12:51:24 +01:00
Yapollon
51509bb04f Reformating
Nothing got changed
2024-03-08 12:48:19 +01:00
Yapollon
07a204a3ed Optimized Heatmap Color 2024-03-08 12:35:46 +01:00
Yapollon
09a2a6ac5f Merge remote-tracking branch 'origin/master' 2024-03-07 20:43:15 +01:00
Yapollon
8947c6d54c MIGRATE: Implemented user color setting. 2024-03-07 20:43:04 +01:00
Verox001
d465287316 Finished habit_list invitation 2024-03-07 20:34:30 +01:00
Yapollon
ce68bc9786 Merge branch 'master' of https://repo.cimeyclust.com/CimeyClust/HabitTracker 2024-03-07 20:07:15 +01:00
Yapollon
383db050c2 Color Picker Update 2 2024-03-07 20:07:05 +01:00
343bb26536 favicon.ico 2024-03-07 19:58:05 +01:00
a46b464ca6 Merge remote-tracking branch 'origin/master' 2024-03-07 19:22:48 +01:00
b02458d96c User Stack bei beigetretner Liste 2024-03-07 19:22:32 +01:00
Verox001
ece973ad28 Fixed checked habit sorting 2024-03-07 19:01:00 +01:00
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