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
58c6d08ca2
Merge remote-tracking branch 'origin/master'
2020-08-17 15:10:52 +02:00
d19b9c1d1a
v0.10.1a - Added AJAX check on update WashingMachine
...
Added AJAX check on create (missing on update) UserController - Only checks when submitting
2020-08-17 15:10:44 +02:00
4a72493f9b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-17 15:06:55 +02:00
983b02e00e
v0.10.1 - Added location on washing_reservations and created a WashingMachineSeeder.php
2020-08-17 15:06:48 +02:00
Neerholt
e6fbafb011
v0.10.0i - :(
2020-08-17 15:06:35 +02:00
Neerholt
d4bc3f5520
v0.10.0g - Fixed stuff :)
2020-08-17 14:24:27 +02:00
Neerholt
25f1dc80d4
v0.10.0f - Fixed a route error on main index pages, when you clicked on see participants
2020-08-17 13:52:51 +02:00
Neerholt
7f42423599
v0.10.0e - Made some css fix to the main index dashboard pages
2020-08-17 13:22:08 +02:00
Neerholt
8bba60fa5a
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-17 12:24:49 +02:00
Neerholt
9db169aadb
v0.10.0d - Rolled back menuplan to old system layout and functionality
2020-08-17 12:24:43 +02:00
5ac480454a
v0.10.0c - Fixed WashingMachine create & update AJAX
2020-08-17 11:07:26 +02:00
3bde377caa
v0.10.0b - Fixed Location update AJAX
...
Added - You are now able to delete a location
2020-08-17 10:43:52 +02:00
Neerholt
773655c294
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-17 10:31:41 +02:00
Neerholt
fe9eb4fd4d
v0.10.0a - Added last support for NameCheck
2020-08-17 10:31:33 +02:00
e82c793820
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-17 10:29:02 +02:00
9596a426fa
v0.10.0 - Added admin dashboard
2020-08-17 10:28:54 +02:00
e6f03ad72b
v0.9.15h - NameCheck - Fixed Updates
2020-08-17 10:21:02 +02:00
Neerholt
ea623a72ca
v0.9.15g - NameCheck
2020-08-17 09:21:47 +02:00
Neerholt
fce970de65
v0.9.15e - made nameCheck for guides
2020-08-17 08:23:48 +02:00
Neerholt
a4509fa412
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-14 11:22:59 +02:00
Neerholt
8a71d1d5ae
v0.9.15a - optimized nameCheck
2020-08-14 11:22:51 +02:00
45d1906497
v0.9.14 - Made an `Do you want email` slider on settings site
2020-08-14 10:17:52 +02:00
Neerholt
c37645fe85
v0.9.13b - Made your event taben look better
2020-08-14 09:03:15 +02:00
55eed84b86
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/app/Http/Controllers/EventController.php
2020-08-14 07:39:27 +02:00
9e0f449bd3
v0.9.13 - Added notifications in events, when an event you're signed up to gets canceled.
2020-08-14 07:36:42 +02:00
9232ed99a1
v0.9.12 - Fixed CSS - Started working on wants_email button in account
2020-08-13 15:28:20 +02:00
victor
3a78734b7f
v0.9.11 - Check if event name already exist.
2020-08-13 14:41:10 +02:00
d64e8fc4b8
v0.9.9 - Added custom 404 page
2020-08-13 12:06:28 +02:00
0e266c2583
v0.9.8 - Fixed participate/stop participating, so that you no longer hard refresh
2020-08-13 11:39:10 +02:00
1f1ea3c832
v0.9.7 - Edited about
2020-08-13 10:26:43 +02:00
d969c76dcf
v0.9.6 - Added print icons
2020-08-13 09:35:53 +02:00
0300a6a76b
v0.9.4 - Added remove function to feedback admin page
...
Added - You can now see if you're participating an event on event.index and yourevents.blade.php
Fixed `Tilbage` buttons
2020-08-13 09:08:34 +02:00
Neerholt
0886c8f583
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-12 15:25:36 +02:00
Neerholt
c84d2a3d73
v0.9.1 - You can now convert menuplan to pdf
2020-08-12 15:25:29 +02:00
2cbb517ef1
v0.9.0 - Added individual `Read more` buttons on news.index
...
Added NewsType - To see if it's a news, menu, guide or event
Added type column to News type_id & arrangement_id (Both needed to see what type (menu,guide,news,event) and arrangement(The individual types ID))
Added NewsTypeSeeder.php
Fixed CSS
Added & Fixed messages en/dk
Fixed Editors
Added routing when removing yourself from an event, on events.index
2020-08-12 15:17:48 +02:00
e06504b5fb
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/resources/lang/dk/msg.php
skolehjem/resources/lang/en/msg.php
2020-08-12 13:10:37 +02:00
4a8b22d6dd
v0.8.5 - Fixed lang and css
2020-08-12 13:09:47 +02:00
Neerholt
6671cd6aa8
v0.8.4b - Made about pages
2020-08-12 13:08:47 +02:00
Neerholt
d016ea6c4c
v0.8.4a - Added last support for images uploade
2020-08-12 12:49:05 +02:00
Neerholt
d0b286c714
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-12 12:28:13 +02:00
Neerholt
e080b69d98
v0.8.3 - Added uploade images function
2020-08-12 12:28:05 +02:00
Neerholt
9c26526740
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-12 11:15:49 +02:00
Neerholt
1c6aa5c398
v0.8.1 - Added uploade images function to menuplan
2020-08-12 11:15:41 +02:00
edbdd7a292
v0.8.2 - Fixed user profile pic upload
2020-08-12 11:15:08 +02:00
37d915a37f
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-12 10:46:45 +02:00
55ab591b4e
v0.8.1 - Started adding user profile pic
2020-08-12 10:46:36 +02:00
746926d439
v0.7.8 - Added Quill Editor to all sites - Fixed Event name/subname showance in news.index
2020-08-12 08:42:58 +02:00
511e0b783f
v0.7.7 - Various fixes
2020-08-11 18:21:51 +02:00
2aaadd00b0
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-11 15:08:36 +02:00
Neerholt
ed568d12a8
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-11 15:09:19 +02:00
Neerholt
fc631ef66e
v0.7.5 - Added substr to guide and event
2020-08-11 15:09:11 +02:00
b1b96ad080
v0.7.6 - Added snackbar
2020-08-11 15:08:09 +02:00
1e4d55ef26
v0.7.4 - removed redundant code
2020-08-11 13:45:34 +02:00
e8278b7125
v0.7.3 - It now extends the layout
2020-08-11 13:44:18 +02:00
a9a9d42fb8
v0.7.3 - Major Fixes
2020-08-11 13:16:54 +02:00
b51704cc26
v0.7.1 - Major css fixes
2020-08-11 12:54:28 +02:00
c2ae6e08c3
v0.7.0 - Settings tab
2020-08-11 12:37:31 +02:00
Neerholt
2ae0c1661c
v0.6.2d - Added are you sure you want to leave alert if you have unsaved data on a pages
2020-08-11 10:54:01 +02:00
Neerholt
a223d5484e
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-11 10:40:08 +02:00
Neerholt
37b53a5480
v0.6.2c
2020-08-11 10:39:22 +02:00
14fb54c5df
v0.6.2b - Are you sure
2020-08-11 10:38:49 +02:00
366f66215e
v0.6.2a - Fixed css
2020-08-11 10:16:07 +02:00
6e7cc443b8
v0.6.2a - Fixed css
2020-08-11 10:03:27 +02:00
81af08ef24
v0.6.2 - Fixed various bugs
2020-08-11 09:55:01 +02:00
e391acf261
v0.6.1 - Added jquery
2020-08-11 09:27:07 +02:00
64c260a63f
v0.6.0 - Darkmode
2020-08-11 09:13:48 +02:00
1428d88716
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-10 15:20:01 +02:00
3d0afb2d6a
v0.5.18 - Darkmode
2020-08-10 15:19:53 +02:00
Neerholt
ea0d544509
v0.5.17c - Fix small bugs on darkmode
2020-08-10 14:59:22 +02:00
72824d87f2
v0.5.17b - Darkmode
2020-08-10 14:53:49 +02:00
Neerholt
511b4a288b
v0.5.17a - Made darkmode
2020-08-10 14:49:00 +02:00
Neerholt
86536ba978
v0.5.17 - Made some small css changes to guides layout
2020-08-10 13:26:48 +02:00
2e187524bf
v0.5.16 - Fixed Cookie Problem on controllers. Added quill editor on event. Added message in msg.php en/dk
2020-08-10 12:29:38 +02:00
6cabc6250c
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-10 11:47:07 +02:00
d1a2ec8210
v0.5.15f - Fixed small visual bug
2020-08-10 11:46:08 +02:00
Neerholt
332fdc3347
v0.5.15e - Removed search function from menuplan and fix some css on event search
2020-08-10 11:45:58 +02:00
Neerholt
frederikpyt
Anders
Frederik Milling Pytlick
Sebastian D