193 Commits

Author SHA1 Message Date
45f3974514 fixed yassins wrongdoing 2024-03-05 10:05:38 +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
Verox001
f1c4d26b0a Merge remote-tracking branch 'origin/master' 2024-03-05 09:47:41 +01:00
Verox001
2a249a32e5 Fixed user None Check 2024-03-05 09:47:23 +01:00
bb1cfe77f2 Merge remote-tracking branch 'origin/master' 2024-03-05 09:45:57 +01:00
3c388b03a7 Merge remote-tracking branch 'origin/master' 2024-03-05 09:45:23 +01:00
1777ee28af 120 Flammen 2024-03-05 09:45:14 +01:00
Verox001
6337eaff81 Removed habittracker content when not logged in 2024-03-05 09:44:54 +01:00
3427e8f271 Merge remote-tracking branch 'origin/master' 2024-03-05 09:44:12 +01:00
Verox001
9fdbef1b7d Verify email is not used already on signup 2024-03-05 09:43:13 +01:00
5bc8b1dc26 uniform design (card) + names + deleted Home 2024-03-01 10:31:24 +01:00
0b927009b5 uniform design (card) + names + deleted Home 2024-03-01 10:30:41 +01:00
7ac9168147 Merge remote-tracking branch 'origin/master' 2024-03-01 09:26:54 +01:00
4bce1aab30 uniform design (card) 2024-03-01 09:26:45 +01:00
Verox001
c2c38f55c4 Remove plus icon from not primary users 2024-03-01 09:25:36 +01:00
f7967c2dfd many 2024-03-01 09:25:27 +01:00
Verox001
2dc3cbf047 Implemented User Display on Habitlist 2024-03-01 09:17:52 +01:00
Verox001
b6a9bf5520 Implemented User-Invite Page 2024-03-01 08:50:33 +01:00
7771c1eea2 edit page 2024-03-01 08:19:53 +01:00
Yapollon
e20defa4e1 Merge branch 'master' of https://repo.cimeyclust.com/CimeyClust/HabitTracker 2024-03-01 08:14:20 +01:00
Yapollon
1b665b8be0 Improved user addition 2024-03-01 08:13:58 +01:00
Verox001
afb57ef077 Fixed minor bugs 2024-03-01 08:06:00 +01:00
Yapollon
a8a3382f15 Habit Streak Update++ 2024-03-01 07:53:47 +01:00
Yapollon
fc570208bf Habit Streak Update (2/2)+
Minor change
2024-02-28 14:28:31 +01:00
Yapollon
8f57c2d9e3 Merge branch 'master' of https://repo.cimeyclust.com/CimeyClust/HabitTracker 2024-02-28 14:14:20 +01:00
Yapollon
e2f1402d50 Habit Streak Update (2/2)
Yeah reworked the entire thing so that the checked, count and streak value is stored in the Habit Table
2024-02-28 14:14:10 +01:00
Verox001
2a6aa0b04f Added list_attribute addition 2024-02-28 11:18:14 +01:00
Verox001
7e9d445051 Fixed multiple list sorting 2024-02-28 10:57:48 +01:00
d0c5127c92 Merge remote-tracking branch 'origin/master' 2024-02-28 10:48:29 +01:00
ba8bc06d89 inprovements 2024-02-28 10:46:26 +01:00
Yapollon
2f7541aa55 Habit Streak Update (1/2)
first part works autonomous except the uncheck
2024-02-28 10:36:04 +01:00
9e1bd7b65e better looking html code and fixed a bug 2024-02-20 20:55:06 +01:00
0f35a67391 tabs layouts 2024-02-20 11:17:06 +01:00
Yapollon
bcfb7aaec6 Update Habit.py
Streak for Daylies was added.
2024-02-20 10:57:45 +01:00
Verox001
5138e6d25f Fixed some imports 2024-02-20 10:13:42 +01:00
Verox001
4711106653 Added get streak method again 2024-02-20 10:13:00 +01:00
Verox001
6a46104efa Fixed merge error 2024-02-20 10:12:20 +01:00
cb1991e2cc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	models/Habit.py
2024-02-20 10:05:07 +01:00
7ed5dfbf58 Flammen und Namen 2024-02-20 10:02:52 +01:00
0e798adb89 Flammen und Namen 2024-02-20 10:02:26 +01:00
bbd6f27af1 Flammen und Namen 2024-02-20 10:01:36 +01:00
Verox001
f07456a95b Reduced weekday count by one 2024-02-20 10:01:08 +01:00
08ff2cfc16 Fixed bug 2024-02-20 10:00:31 +01:00
Verox001
94fa2f567f Reverted merge commit from model 2024-02-20 09:58:34 +01:00
Yapollon
f0275108a5 Merge branch 'model' 2024-02-20 09:52:31 +01:00
92b099b112 card Tabs
(cherry picked from commit 5c0a2b588644b4d8ad6148c2582a551d770f4261)
2024-02-20 09:49:12 +01:00
d3013a5982 card Tabs
# Conflicts:
#	templates/index.html
2024-02-20 09:48:14 +01:00
Yapollon
684beb372f Profil upgrade and MORE
Very cool isn't it, totally didn't take a lot of time
2024-02-20 04:16:28 +01:00