2f5a03343a
Merge remote-tracking branch 'origin/master'
2020-09-02 12:32:36 +02:00
ff7cb033d5
v0.11.1c - Fixed CSS & HTML
2020-09-02 12:32:30 +02:00
211a68c81b
v0.11.1b - Fixed
2020-09-02 12:31:44 +02:00
f2500730ec
v0.11.1a - Maybe fix?
2020-09-02 12:20:49 +02:00
4a64d49902
v0.11.1 - Fixed roles and permissions
2020-09-02 11:40:36 +02:00
d7bfdaebf6
v0.11.0 - You can now edit roles
...
Fixed minor details
2020-09-02 08:56:02 +02:00
25c279653b
v0.10.20c - Changed type_id to type on news.index, so it's no longer a number
2020-08-31 14:54:25 +02:00
101be37dfe
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/resources/views/app/news/index.blade.php
2020-08-31 14:44:15 +02:00
34b078b21a
v0.10.20b - Darkmode fixes
2020-08-31 14:41:44 +02:00
9b26e5f1af
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/app/Http/Controllers/RootController.php
# skolehjem/resources/views/app/news/index.blade.php
2020-08-31 14:35:03 +02:00
cf1baac983
v0.10.20a - Changed type_id to type on news.index, so it's no longer a number
2020-08-31 14:31:56 +02:00
Neerholt
efb2840ff0
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/app/Http/Controllers/RootController.php
2020-08-31 14:29:24 +02:00
Neerholt
20aa9c52af
v0.10.20 - Made some small design changes to home pages
2020-08-31 14:28:15 +02:00
bccd00683f
v0.10.19 - Added building name to reservation site
...
Fixed $eventsToDelete in EventController.php
2020-08-31 14:04:02 +02:00
56cdd63fbb
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-31 11:56:17 +02:00
34e123ee19
v0.10.17a - Various fixes
2020-08-31 11:56:05 +02:00
10bd0c021c
Merge remote-tracking branch 'origin/master'
2020-08-31 10:57:31 +02:00
7b157fcd90
v0.10.17 - Added permission check (create/edit/delete) on all admin sites
2020-08-31 10:57:26 +02:00
59bd705d89
v0.10.16a - Various fixes
2020-08-31 10:15:12 +02:00
c6c54996b5
v0.10.16 - Various fixes
2020-08-31 09:36:10 +02:00
d8a754d398
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-31 08:16:36 +02:00
08362b24cb
v0.10.15q - Various fixes
2020-08-31 08:16:26 +02:00
Neerholt
7d4bd47ab8
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-28 08:28:44 +02:00
Neerholt
3235cea505
v0.10.15o - Permissions semi works
2020-08-28 08:28:32 +02:00
e0af87ba97
v0.10.15n - Added a functional Full Control button to roles.create
2020-08-28 08:26:32 +02:00
Neerholt
b6d819e5f8
v0.10.15m - added the last value to roles permissions
2020-08-27 16:40:46 +02:00
Neerholt
4beadfb223
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-27 15:30:26 +02:00
Neerholt
a766bfea95
v0.10.15l - Made role permissions semi done, sometimes it works sometimes it doesn't, it needs some touch up
2020-08-27 15:29:59 +02:00
fc91a2f06b
v0.10.15i - Fixed admin access
2020-08-27 11:12:43 +02:00
Neerholt
5766770a4b
v0.10.15g - Added roles permissions selection, semi done
2020-08-27 10:20:48 +02:00
7b2d6fcf60
Merge remote-tracking branch 'origin/master'
2020-08-26 10:49:19 +02:00
b72ca3fbde
v0.10.15f - Added video to guides (Still in need of <iframe></iframe> to be removed on news site)
2020-08-26 10:49:11 +02:00
Neerholt
a9608bdf3a
v0.10.15e - Administration can now changes a users profile images
2020-08-26 08:56:18 +02:00
f33cf609da
v0.10.15d - Changed remember password to remember me
...
Added pattern to user edit on admin site
2020-08-25 15:08:54 +02:00
0bd324e996
Merge remote-tracking branch 'origin/master'
2020-08-25 14:48:58 +02:00
3b6b20f934
v0.10.15c - Changed error message when changing password (removed quotes). Added placeholder to email & phone number + added pattern to phone number
2020-08-25 14:48:52 +02:00
c1972e70c8
v0.10.15b - Fixed scroll
2020-08-25 14:16:47 +02:00
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
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
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
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
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
cca543bf4a
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-19 14:59:20 +02:00
41af387399
v0.10.10c - Not done
2020-08-19 14:59:13 +02:00
Neerholt
ec4fdca414
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-19 10:44:07 +02:00
Neerholt
a8fc584304
v0.10.10b - Added small fixs to pagination
2020-08-19 10:43:59 +02:00
ae306c8f1b
Merge remote-tracking branch 'origin/master'
2020-08-19 10:35:51 +02:00
3f2dcf1a0c
v0.10.10a - Added Quill.js & Quill.snow.css to our own files, instead of calling it. - Removed uneccesary quill.snow.css in menuplan
2020-08-19 10:35:44 +02:00
5aebe1328d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-19 10:01:38 +02:00
7e9277bd21
v0.10.10 - Fixed it so you can only upload image resources when uploading your profile picture
2020-08-19 10:01:22 +02:00
Neerholt
2f003600c5
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-19 09:54:31 +02:00
Neerholt
6934c2d992
v0.10.9 - Added pagination onto guides, washing-reservations, events and news
2020-08-19 09:54:26 +02:00
82ac44133b
v0.10.8 - Added - You can only see washingreservations for the day, and are maximum an hour after 'time' in column - Reloads the page after every 5 minutes (This needs a fix)
2020-08-19 09:01:21 +02:00
2430a6a381
v0.10.7b - Fixed washing_reservation creation on app, hopefully forever
2020-08-18 22:55:50 +02:00
abd9ebbe3e
v0.10.7 - Fixed washing_reservation creation on app, hopefully forever
2020-08-18 22:47:39 +02:00
52b42124a1
v0.10.6 - Uniformily changed the event name
2020-08-18 19:09:40 +02:00
Neerholt
d2441250fb
v0.10.5c - Made menuplan pdf better
2020-08-18 15:27:58 +02:00
19b1176718
v0.10.5b - Added Date to feedbacks.index
2020-08-18 13:01:39 +02:00
ddbc3b8b60
v0.10.5 - Fixed vagttelefon
...
Added: Washing Machines & their reservations now delete when the location gets removed
2020-08-18 12:25:32 +02:00
d49a896fc0
v0.10.4 - Downloaded moment-js
2020-08-18 11:54:26 +02:00
088fcd7f39
v0.10.3c - Fixed dark mode css
2020-08-18 09:02:03 +02:00
1e405d9f3c
v0.10.3 - Added user "X X" to seeder, and fixed analytics
2020-08-18 08:35:53 +02:00
55153521b4
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-18 08:19:20 +02:00
44ade93240
v0.10.3 - Fixed darkmode css on app/washing-reservations/create.blade.php. Fixed frontend file upload valdiation. Fixed analytics
2020-08-18 08:19:14 +02:00
e6e0e3c95d
v0.10.2 - Full functioning AJAX check submit code on User controller create & edit
...
- Plus all other pages where you create or update something of an unique value
2020-08-18 08:16:25 +02:00
c08933ba9b
v0.10.1b - Added error message when creating a user with a difference in `Adgangskode` & `Bekræft Adgangskode`
...
Removed old error messages
2020-08-17 15:25:26 +02:00
Anders
frederikpyt
Neerholt
Frederik Milling Pytlick
Sebastian D