davide
|
b12a9b90e0
|
Merge branch 'master' of git.elab.kth.se:davide/KUKapp
|
2018-11-30 22:42:37 +01:00 |
|
marek
|
839942e9d7
|
Merge branch 'master' of https://git.elab.kth.se/davide/KUKapp
|
2018-11-30 22:42:27 +01:00 |
|
marek
|
af1b289710
|
login stuff and also a bit of addme stuff but not working yet
|
2018-11-30 22:42:08 +01:00 |
|
davide
|
59b6785121
|
Fixed some visuals
|
2018-11-30 22:42:05 +01:00 |
|
davide
|
049b0e66ba
|
Correctly displaying stuff
|
2018-11-30 22:37:04 +01:00 |
|
davide
|
17428dffdf
|
Merge branch 'master' of git.elab.kth.se:davide/KUKapp
|
2018-11-30 22:11:13 +01:00 |
|
davide
|
2cefc5e5fd
|
Fixed date format. Added time. Corrected template
|
2018-11-30 22:11:00 +01:00 |
|
marek
|
d0cc5984eb
|
added a git ignore
|
2018-11-30 22:05:28 +01:00 |
|
marek
|
caf35bb6cd
|
added a pawel
|
2018-11-30 22:02:19 +01:00 |
|
marek
|
566d03096a
|
better scoreboard
|
2018-11-30 21:58:38 +01:00 |
|
davide
|
a24d793287
|
Some fixes and additions
|
2018-11-30 21:54:49 +01:00 |
|
davide
|
50c01cdf9d
|
Merge branch 'master' of git.elab.kth.se:davide/KUKapp
# Conflicts:
# kukv1.py
|
2018-11-30 20:57:11 +01:00 |
|
davide
|
0f6b449bf0
|
Calculating friendly timedelta string
|
2018-11-30 20:55:33 +01:00 |
|
marek
|
35e577424a
|
leaderboard but not good yet
|
2018-11-30 20:47:54 +01:00 |
|
marek
|
0cd0265599
|
fixed database connection
|
2018-11-30 20:47:43 +01:00 |
|
davide
|
056de43a91
|
Querying upcoming meals
|
2018-11-30 20:18:03 +01:00 |
|
davide
|
f91baa7d93
|
Minor style adjustments
|
2018-11-30 18:44:45 +01:00 |
|
davide
|
e44d43af0e
|
Major restyling. Now with better HTML and CSS practices!
|
2018-11-29 00:07:30 +01:00 |
|
davide
|
6c5b5e3432
|
Started meal list template
|
2018-11-28 21:34:36 +01:00 |
|
davide
|
ff15cb81c1
|
Added test data
|
2018-11-28 21:34:09 +01:00 |
|
davide
|
8fc7a954ab
|
Merge branch 'master' of git.elab.kth.se:davide/KUKapp
|
2018-11-28 21:19:25 +01:00 |
|
davide
|
cdc6284d5c
|
Fixed some styling
|
2018-11-28 21:18:28 +01:00 |
|
marek
|
6087c35ee6
|
Made kuk app great again
|
2018-11-28 21:07:50 +01:00 |
|
marek
|
26ab5705ad
|
added a nose
|
2018-11-28 17:32:10 +01:00 |
|
davide
|
60ae824f2a
|
Converted to python 3
|
2018-11-20 14:09:53 +01:00 |
|
Marek Baczynski
|
15579393ad
|
space for the "date" of the next meal
|
2017-11-12 20:43:48 +01:00 |
|
Marek Baczynski
|
736d90a5db
|
stuff
|
2017-11-12 20:34:28 +01:00 |
|
Marek Baczynski
|
54bea5c85c
|
re-ballanced the meal points
|
2017-11-12 20:34:17 +01:00 |
|
Marek Baczynski
|
fbf7e83b49
|
reseted the test setup for now
|
2017-11-12 20:33:43 +01:00 |
|
Marek Baczynski
|
62f944e097
|
pauls amazing photo
|
2017-11-12 20:31:49 +01:00 |
|
Marek Baczynski
|
8d939497e9
|
reset test files
|
2017-11-12 20:31:34 +01:00 |
|
Marek Baczynski
|
c60fbfc67c
|
tiebreaker
|
2017-10-22 22:10:14 +02:00 |
|
Marek Baczynski
|
9c69460261
|
faster
|
2017-10-22 22:10:02 +02:00 |
|
Marek Baczynski
|
62548188bc
|
I can has profile picture
|
2017-10-22 21:45:04 +02:00 |
|
Marek Baczynski
|
0f177b816c
|
Merge branch 'master' of https://github.com/exclamationMark/KUKapp
|
2017-10-22 21:37:17 +02:00 |
|
Marek Baczynski
|
240a2e3b08
|
picking the kuk for real this time
|
2017-10-22 21:37:09 +02:00 |
|
davide
|
eb7b29f221
|
Messages now redirect after 3 seconds
|
2017-10-22 21:25:39 +02:00 |
|
davide
|
59e71e9e8b
|
Added background color
|
2017-10-22 21:16:02 +02:00 |
|
Marek Baczynski
|
92d45841f3
|
meal finilising and planing
|
2017-10-22 21:03:36 +02:00 |
|
Marek Baczynski
|
c7b6abccb6
|
Merge branch 'master' of https://github.com/exclamationMark/KUKapp
|
2017-10-22 20:22:59 +02:00 |
|
Marek Baczynski
|
2359769b50
|
adding and removing oneself
|
2017-10-22 20:22:48 +02:00 |
|
davide
|
362ec8a147
|
Fixed cook picture
|
2017-10-22 20:21:42 +02:00 |
|
Marek Baczynski
|
e8d8bdb530
|
status of current meal is read from database
|
2017-10-22 18:45:21 +02:00 |
|
Marek Baczynski
|
a8666c1212
|
question mark ?
|
2017-10-22 18:44:30 +02:00 |
|
|
778652aca8
|
Fixed javascript
|
2017-10-22 01:10:42 +02:00 |
|
|
8f98579345
|
Added cards and other style and shit
|
2017-10-22 00:55:30 +02:00 |
|
Marek Baczynski
|
66032efdc9
|
pictures of people
|
2017-10-21 23:39:00 +02:00 |
|
Marek Baczynski
|
fcb9d067bf
|
"confirmed" button in template
|
2017-10-21 23:38:49 +02:00 |
|
davide
|
ecf2c9aadd
|
Merged frontend
|
2017-10-08 18:35:38 +02:00 |
|
davide
|
8a9ab2bf99
|
Removed unnecessary parts
|
2017-10-08 18:01:19 +02:00 |
|