Neerholt
f5e3e0c6e0
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-25 14:07:29 +02:00
Neerholt
e758a3ddac
v0.10.15a - Added hide Menu on Scroll
2020-08-25 14:07:20 +02:00
5a1c1ee6fd
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-25 12:28:39 +02:00
725b34f6bf
v0.10.15 - Fixed EventController.php deletion of old events
2020-08-25 12:28:28 +02:00
bc847b38b0
v0.14.15 - Removed the first foreach in location show, and made an inner join instead, so it comes in correct order (by time), instead of by time and by machine id.
...
Added: The Reservations now gets deleted when time is past their washing time, as soon as you go onto your own reservations, the admin page for reservations or when the location show page reloads (every 1 minut)
2020-08-25 12:26:48 +02:00
Neerholt
0c8791683f
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-25 12:00:33 +02:00
Neerholt
fa606bd89f
v0.10.14h - Added tooltips to navbar
2020-08-25 12:00:10 +02:00
e1a2fd87f7
v0.14.14g - Fixed mails
2020-08-25 09:49:45 +02:00
Neerholt
f33b2bb45c
v0.10.14g - Fixed images error on washing machines
2020-08-25 09:25:42 +02:00
6569255d32
v0.14.14f - Fixed text in about.index
2020-08-25 08:15:25 +02:00
7cb88d8b58
Merge remote-tracking branch 'origin/master'
2020-08-24 14:25:56 +02:00
3e18809584
v0.10.14e - Location site now reloads with the div instead of the whole page
2020-08-24 14:25:50 +02:00
Neerholt
abcc484e7c
v0.10.14d - No can now see the users images on user admin
2020-08-24 14:09:03 +02:00
Neerholt
fa5cd1c3e2
v0.10.14c - Various fixes
2020-08-24 11:27:17 +02:00
Neerholt
6b3af7e667
v0.10.14b - We now delete events from the database if the event passes the event data
2020-08-24 10:43:24 +02:00
Neerholt
5c087c9b11
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-24 10:20:43 +02:00
Neerholt
5ebb8bc5a2
v0.10.14a - small css fix on event
2020-08-24 10:20:34 +02:00
9a1b6873d2
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-24 10:17:15 +02:00
7a02f4a48f
v0.10.14 - Fixed localstorage saving for the admin menu and added ResourceCategorySeeder.php
2020-08-24 10:17:08 +02:00
Neerholt
e60c386b0e
v0.10.13c - Small css fix made to user search filter
2020-08-24 10:08:19 +02:00
Neerholt
137d878748
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-24 10:01:26 +02:00
Neerholt
c2ddfcf346
v0.10.13b - Fixed images error after you had searched
2020-08-24 10:01:18 +02:00
0655611a77
v0.10.13a - Fixed feedback so date can be seen - Fixed about page
2020-08-24 09:55:20 +02:00
Neerholt
7719b4b77b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-24 09:05:25 +02:00
556821ec8f
Merge remote-tracking branch 'origin/master'
2020-08-24 09:00:27 +02:00
43893ab8ed
v0.10.13 - Fixed: You can't see an event, if it's one day over time
...
Removed search bar from events
Added: You can't click on sites you're already on at the admin panel
2020-08-24 09:00:21 +02:00
Neerholt
679d5a0c3e
v0.10.12a - Feedback fix
2020-08-24 09:00:15 +02:00
d280f6c7bc
v0.10.12b - Fixed localstorage saving for the admin menu
2020-08-24 08:59:50 +02:00
ba94e32ce2
Merge remote-tracking branch 'refs/remotes/origin/master'
2020-08-21 14:19:47 +02:00
0c39a9e485
updated app
2020-08-21 14:19:27 +02:00
4dc26fd229
Added iOS app
2020-08-21 14:18:39 +02:00
6d551b42d0
Update base.blade.php
2020-08-21 13:44:33 +02:00
6e277e9e79
Update base.blade.php
2020-08-21 13:41:06 +02:00
78f97cbe9f
Create normalize.css
2020-08-21 13:39:45 +02:00
Neerholt
814695b720
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-21 10:54:09 +02:00
Neerholt
522cf9cdf7
v0.10.12a - Made filter for washing machines done
2020-08-21 10:54:00 +02:00
3d61c20a5a
v0.10.12 - Localstorage saving for the admin menu
2020-08-21 08:45:39 +02:00
a0566360e0
v0.10.11d - Small optimizations
2020-08-21 07:59:14 +02:00
27e3eed6f4
v0.10.11c - Removed <br>
2020-08-21 07:57:48 +02:00
e35c8ae491
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-20 15:12:12 +02:00
2b1c284b6a
v0.10.11b - Added active site
2020-08-20 15:12:06 +02:00
Neerholt
f403c464c7
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-20 14:59:31 +02:00
Neerholt
89276c5af1
v0.10.11a - Made hide filter, filter washing machine search semi done, and texts fixs
2020-08-20 14:59:22 +02:00
ab5a6206ce
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-20 14:56:18 +02:00
c0d336a8e0
v0.10.11 - Collapse-able admin menu
2020-08-20 14:56:11 +02:00
a145c88e2c
v0.10.10f - You can no longer see your own reservations if they're an hour past due (Samt with admin)
2020-08-20 12:18:30 +02:00
Neerholt
4f9cf41656
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-19 15:30:47 +02:00
Neerholt
0516acba78
v0.10.10e - Made a hide show filter button, not done but works, css fix tomorrow
2020-08-19 15:30:39 +02:00
b47c06372b
v0.10.10d - Fixed quill asset mistake
2020-08-19 15:09:54 +02:00
cca543bf4a
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-19 14:59:20 +02:00
Neerholt
frederikpyt
Anders
macuser
macuser
Frederik Milling Pytlick
Sebastian D