Neerholt
|
ea0d544509
|
v0.5.17c - Fix small bugs on darkmode
|
2020-08-10 14:59:22 +02:00 |
frederikpyt
|
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 |
Anders
|
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 |
frederikpyt
|
6cabc6250c
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-10 11:47:07 +02:00 |
frederikpyt
|
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 |
frederikpyt
|
bc6626f997
|
v0.5.15d - Fixed bug
|
2020-08-10 10:29:52 +02:00 |
frederikpyt
|
c077b0e55f
|
v0.5.15c - Fixed bug
|
2020-08-10 10:28:40 +02:00 |
frederikpyt
|
1bea8401b4
|
v0.5.15b - Fixed bug
|
2020-08-10 10:21:09 +02:00 |
Neerholt
|
3263663f3d
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
Conflicts:
skolehjem/app/Http/Controllers/EventController.php
|
2020-08-10 10:17:41 +02:00 |
Neerholt
|
b27d05e55c
|
v0.5.15a - Made read more
|
2020-08-10 10:16:05 +02:00 |
frederikpyt
|
fead36dd52
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
Conflicts:
skolehjem/resources/views/app/news/index.blade.php
|
2020-08-10 09:39:12 +02:00 |
frederikpyt
|
bd7800f5a0
|
v0.5.15 - Added subname to news
|
2020-08-10 09:37:19 +02:00 |
Neerholt
|
9c0f46e665
|
v0.5.14b - index event fix
|
2020-08-10 09:08:48 +02:00 |
Neerholt
|
15962e4114
|
v0.5.14b -Added Css
|
2020-08-10 09:05:53 +02:00 |
Neerholt
|
a97cd7cda5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-07 14:25:08 +02:00 |
Anders
|
726cb52aee
|
v0.5.14 - Fixed signups on event. Added en/dk versions. Added TinyMCEditor on events create/edit. Removed menuplans monday-thursday
|
2020-08-07 14:11:13 +02:00 |
Neerholt
|
0cea9e50c1
|
v0.5.14 -Added see participant to events taben it self
|
2020-08-07 13:50:26 +02:00 |
Anders
|
9d6fc22b0f
|
v0.5.13 - Added signups.blade.php to see who have joined an event + en/dk versions
|
2020-08-07 13:31:09 +02:00 |
Neerholt
|
376f37da8c
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-07 12:48:15 +02:00 |
Neerholt
|
04c280e602
|
v0.5.12 - Add read more to guides, and made specific pages to read a specific guide
|
2020-08-07 12:48:08 +02:00 |
Anders
|
9a6d1b64c1
|
v0.5.11 - Changed CKEditor to TinyMCEditor / Removed Monday-Thursday in menu_plans and added a TinyMCEditor instead.
|
2020-08-07 12:20:15 +02:00 |
frederikpyt
|
c268440021
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-08-07 10:59:02 +02:00 |
frederikpyt
|
b0eda7f8e7
|
v0.5.10 - Added support for menuplan as news creation
|
2020-08-07 10:58:50 +02:00 |
Anders
|
e0b998dec0
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# skolehjem/app/Http/Controllers/UserEventController.php
|
2020-08-07 10:52:25 +02:00 |
Anders
|
a23337b9d4
|
v0.5.9 - Fixed en/dk messages + added backend en/dk messages
|
2020-08-07 10:51:10 +02:00 |
frederikpyt
|
f7941841fe
|
v0.5.8a - Fix
|
2020-08-07 10:25:46 +02:00 |
frederikpyt
|
4c2b58f33b
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/resources/views/admin/events/create.blade.php
|
2020-08-07 09:49:31 +02:00 |
frederikpyt
|
246004ebfd
|
v0.5.8 - Added create news option on guide and event create/edit
|
2020-08-07 09:47:23 +02:00 |
Neerholt
|
b5fb505eaa
|
Merge pull request #3 from sebathefox/Multi-language
v.0.5.8 - Multi language
|
2020-08-07 08:53:29 +02:00 |
Neerholt
|
e5e057a51a
|
v0.5.7a - Added middelware
|
2020-08-07 08:51:05 +02:00 |
Anders
|
76e3638706
|
v0.5.6b - Added error messages when loggin in with wrong credentials, when changing password and when logging out - Admin & User
|
2020-08-07 08:35:23 +02:00 |
Neerholt
|
23929310f7
|
v0.5.7 - Add the last support for english
|
2020-08-06 20:33:46 +02:00 |
Neerholt
|
7cc871ae90
|
v0.5.7 - Made multi language option
|
2020-08-06 15:31:38 +02:00 |
Anders
|
6e2ffa8de4
|
v0.5.6a - Fixed description when seeing your events
|
2020-08-06 14:50:07 +02:00 |
Anders
|
1b7738fd09
|
Merge remote-tracking branch 'origin/master'
|
2020-08-06 14:47:28 +02:00 |
Anders
|
708313a4b3
|
v0.5.6 - Fixed Guide when destroying.
Added accountable in Event table to see who is the accountable for the event. Changed description field to CKEditor
|
2020-08-06 14:47:22 +02:00 |
frederikpyt
|
c472ae80fa
|
v0.5.5B - Change app home page to news page
|
2020-08-06 14:30:18 +02:00 |
frederikpyt
|
3e4e6e71ab
|
v0.5.5 - Added news on the admin panel
|
2020-08-06 12:21:19 +02:00 |
frederikpyt
|
ab4275dc33
|
v0.5.4C - Added a back button on forgot password
|
2020-08-06 11:17:55 +02:00 |
frederikpyt
|
c56fb6a96d
|
v0.5.4B - Fixed some css
|
2020-08-06 10:57:18 +02:00 |
frederikpyt
|
2d9bd2e11c
|
v0.5.4A - Added a no reservations message on "reservations in location" page
|
2020-08-06 10:49:16 +02:00 |
frederikpyt
|
4b0ad949ba
|
v0.5.4 - Created the "reservations in location" screen and added a location option when creating reservations.
|
2020-08-06 10:32:34 +02:00 |
frederikpyt
|
f4a277185d
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-08-06 08:37:28 +02:00 |
frederikpyt
|
5452711665
|
v0.5.3 - Added Locations and a location_id to washing machines
|
2020-08-06 08:37:16 +02:00 |
Neerholt
|
7ea2208b4a
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-05 14:59:59 +02:00 |
Neerholt
|
a04c38636b
|
v0.5.2 - Made the new menuplan, so you now can use CKeditor.
|
2020-08-05 14:59:41 +02:00 |
frederikpyt
|
9b631843b0
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/database/seeds/ContactSeeder.php
|
2020-08-05 13:30:32 +02:00 |
frederikpyt
|
76bea82eea
|
v0.5.1 - Made contact phone number optional and updated data in seeders.
|
2020-08-05 13:29:45 +02:00 |
Anders
|
eab59b8ff3
|
Merge remote-tracking branch 'origin/master'
|
2020-08-05 10:27:31 +02:00 |
Anders
|
c347e618fa
|
Fixed Layout
|
2020-08-05 10:27:07 +02:00 |
frederikpyt
|
5f7c91a507
|
Added error msg
|
2020-08-05 10:12:05 +02:00 |
Anders
|
f988967c22
|
Guides - Fixed
Contact - Added phonetimes
|
2020-08-05 09:43:53 +02:00 |
Anders
|
91f7a4aa05
|
Merge remote-tracking branch 'origin/master'
|
2020-08-05 09:24:08 +02:00 |
Anders
|
a78e7d90f6
|
Fixed - Guides
Added - contacts visual (controller coming soon)
|
2020-08-05 09:23:57 +02:00 |
frederikpyt
|
07fa636a2e
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/resources/views/app/layout/base.blade.php
|
2020-08-05 09:17:44 +02:00 |
Neerholt
|
90a36d85b9
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
Conflicts:
skolehjem/resources/views/app/users/index.blade.php
|
2020-08-05 09:14:28 +02:00 |
Neerholt
|
fbaed9bedd
|
Deleted media links on home pages
|
2020-08-05 09:12:58 +02:00 |
frederikpyt
|
d4e439a39b
|
Fixed css
|
2020-08-05 08:45:29 +02:00 |
frederikpyt
|
d5004405bc
|
Fixed href
|
2020-08-05 08:40:19 +02:00 |
Anders
|
b4634d4933
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# skolehjem/resources/views/app/layout/base.blade.php
|
2020-08-05 08:34:23 +02:00 |
Anders
|
5120adebc0
|
Fixed links CSS
|
2020-08-05 08:32:27 +02:00 |
frederikpyt
|
4ed1d18392
|
Fixed month
|
2020-08-05 08:27:33 +02:00 |
frederikpyt
|
182b33fbaf
|
Added href
|
2020-08-05 08:14:03 +02:00 |
frederikpyt
|
072c5c65ab
|
Fixes and todo's
|
2020-08-05 08:10:38 +02:00 |
frederikpyt
|
286b78865b
|
Fixed css and added no guides text
|
2020-08-05 07:51:30 +02:00 |
frederikpyt
|
c04f26eaa7
|
fixes
|
2020-08-04 17:45:10 +02:00 |
frederikpyt
|
4d7acfa6bd
|
fixes
|
2020-08-04 17:06:46 +02:00 |
frederikpyt
|
64d1f785f9
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/app/Http/Controllers/WashingReservationController.php
|
2020-08-04 16:52:42 +02:00 |
frederikpyt
|
1011165ca0
|
fixes
|
2020-08-04 16:50:08 +02:00 |
frederikpyt
|
5aa1995cb8
|
fixes
|
2020-08-04 16:35:38 +02:00 |
frederikpyt
|
50d8079da2
|
fixes
|
2020-08-04 15:29:21 +02:00 |
Neerholt
|
4f1ff3a823
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-04 15:29:18 +02:00 |
Neerholt
|
9dd09f2205
|
Made it so they can now make there own dynamic guide
|
2020-08-04 15:29:08 +02:00 |
Anders
|
0e72166ac4
|
Removed External Links
|
2020-08-04 15:20:56 +02:00 |
Anders
|
d15f406059
|
Fail message when making a reservation with taken machine and time
|
2020-08-04 15:09:10 +02:00 |
Anders
|
c8b85a6c9b
|
fixed guide_article
|
2020-08-04 13:37:06 +02:00 |
frederikpyt
|
f5a0174939
|
Merge remote-tracking branch 'origin/master'
|
2020-08-04 13:23:42 +02:00 |
Neerholt
|
210aa00fc6
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-04 13:21:39 +02:00 |
Neerholt
|
c223cb967c
|
Made it so they can now make there own dynamic guide
|
2020-08-04 13:21:23 +02:00 |
frederikpyt
|
d818d15b85
|
Implemented forgot password
|
2020-08-04 10:59:45 +02:00 |
Anders
|
408eb7090b
|
Fixed CSS
|
2020-08-04 10:40:01 +02:00 |
Anders
|
9d44432fc2
|
Session message on fail - Menuplans
|
2020-08-04 10:11:18 +02:00 |
Anders
|
2edfd71de9
|
Session message on fail - Users / Roles / Events
|
2020-08-04 09:34:56 +02:00 |
Anders
|
b59189eac0
|
Session message on fail - Washing machine
|
2020-08-04 08:31:14 +02:00 |
Anders
|
e8de894ae7
|
Merge remote-tracking branch 'origin/master'
|
2020-08-04 08:05:07 +02:00 |
Anders
|
f551d4c59f
|
Changed session messages on fail or success
|
2020-08-04 08:04:54 +02:00 |
frederikpyt
|
84a1045747
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-08-03 15:02:36 +02:00 |
frederikpyt
|
4fe015a74c
|
Fix
|
2020-08-03 15:02:26 +02:00 |
Anders
|
20d73c047f
|
Fixed date and stuff
|
2020-08-03 14:47:06 +02:00 |
frederikpyt
|
ae14081221
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-08-03 13:50:34 +02:00 |
frederikpyt
|
093a944980
|
Fix
|
2020-08-03 13:50:27 +02:00 |
Anders
|
01f9502653
|
Removes - Console.log in feedback(s)
|
2020-08-03 13:44:53 +02:00 |
Neerholt
|
e8f6c2242a
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-03 13:21:56 +02:00 |
Neerholt
|
e2847e9959
|
Fixed PageNation
|
2020-08-03 13:21:47 +02:00 |
frederikpyt
|
a66b7aad92
|
Fixes
|
2020-08-03 12:57:14 +02:00 |
Anders
|
11e3958f0a
|
Added - orderBy to own events & own reservations
Fixed - confirm message when deleting events
|
2020-08-03 11:17:36 +02:00 |
Anders
|
ffb347b51d
|
Merge remote-tracking branch 'origin/master'
|
2020-08-03 10:37:04 +02:00 |
Anders
|
b4263d8891
|
Fixed - Password & Confirm Password in create user now need to be the same.
Added new "see password" function on all password sites.
Fixed bugs
|
2020-08-03 10:36:57 +02:00 |
Neerholt
|
d7c4f2052b
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
Conflicts:
skolehjem/routes/web.php
|
2020-08-03 10:09:54 +02:00 |
Neerholt
|
84cd760b0f
|
Made ris ros filter
|
2020-08-03 10:08:03 +02:00 |
frederikpyt
|
93198e5a54
|
Fixed css
|
2020-08-03 09:53:57 +02:00 |
Anders
|
c2a90c69f9
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# skolehjem/resources/views/app/users/editpass.blade.php
|
2020-08-03 09:43:51 +02:00 |
Anders
|
f2895a00e3
|
Started working on a better see password button
|
2020-08-03 09:42:17 +02:00 |
frederikpyt
|
09fa8ce007
|
Fixed permissions
|
2020-08-03 09:39:32 +02:00 |
Anders
|
1f5660001e
|
Fixed - Being able to change credentials without removing password
Added - Checking if the password is the same to confirm password in admin
|
2020-07-31 11:14:24 +02:00 |
Anders
|
d8ff713b90
|
Added "see password" button in admin - With CSS & Script (Script in file) - Edited form style and input styles
|
2020-07-31 10:38:10 +02:00 |
Anders
|
56cbe7ad41
|
Added success message when you change credentials
Added "see password" button - With CSS & Script (Script in file)
|
2020-07-31 09:28:58 +02:00 |
frederikpyt
|
38f8bfa0c9
|
Fixed bugs
|
2020-07-30 15:25:37 +02:00 |
frederikpyt
|
0e77da93b2
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-30 14:51:50 +02:00 |
frederikpyt
|
991db2bab0
|
Fixed bugs
|
2020-07-30 14:51:23 +02:00 |
Anders
|
e599d09aa7
|
Correct route to feedbacks x2
|
2020-07-30 14:51:03 +02:00 |
Anders
|
986a62009d
|
Correct route to feedbacks
|
2020-07-30 14:47:22 +02:00 |
Anders
|
f4ba4f6c45
|
Edited text
|
2020-07-30 12:20:52 +02:00 |
Anders
|
f36f460b14
|
Front Page now has all useable buttons and links.
Added "Are you sure" when you unsubscribe from an event
|
2020-07-30 10:31:04 +02:00 |
frederikpyt
|
cf4559874a
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-30 10:12:00 +02:00 |
frederikpyt
|
06346d9675
|
Fixed css and created the washing reservation index for app
|
2020-07-30 10:11:52 +02:00 |
Anders
|
0ab41524c6
|
Added an account page for admin site
|
2020-07-30 08:42:01 +02:00 |
frederikpyt
|
4a1002edf3
|
Added more svg icons to the hamburger menu
|
2020-07-30 08:41:09 +02:00 |
victor
|
d5ee1a2146
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-29 15:27:18 +02:00 |
victor
|
4826725e07
|
Made washing-reservations search
|
2020-07-29 15:27:07 +02:00 |
Anders
|
0c5cb360f2
|
User can now remove themselves from an event - And get a success message after they've done so.
Removed user_id from washingReservation
|
2020-07-29 14:59:35 +02:00 |
frederikpyt
|
13c2e56e34
|
Filter search css
|
2020-07-29 13:58:19 +02:00 |
frederikpyt
|
657acbd6eb
|
Added User on washing reservation show
|
2020-07-29 13:43:18 +02:00 |
Anders
|
bc2323b915
|
Removed @extends("app.layout.header") from a few blade.php files in app
|
2020-07-29 12:25:36 +02:00 |
frederikpyt
|
faec1f66c5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-29 11:53:46 +02:00 |
frederikpyt
|
569ace008a
|
Permission fixes and washing reservation fixes
|
2020-07-29 11:53:37 +02:00 |
victor
|
6a4cdbfb17
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-29 09:50:04 +02:00 |
victor
|
26c28d8e54
|
Made filter search
|
2020-07-29 09:49:54 +02:00 |
frederikpyt
|
fc0f97b04e
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-28 15:13:43 +02:00 |
frederikpyt
|
b4f9065d79
|
Fixes
|
2020-07-28 15:13:33 +02:00 |
frederikpyt
|
606e13560b
|
Washing Reservation create
|
2020-07-28 15:03:17 +02:00 |
Anders
|
fd3f2de668
|
Merge remote-tracking branch 'origin/master'
|
2020-07-28 14:54:26 +02:00 |
Anders
|
556e6cf25a
|
You are now able to remove people who have signed up for events - With routing etc.
|
2020-07-28 14:54:19 +02:00 |
frederikpyt
|
fd2184c654
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/resources/views/app/layout/base.blade.php
|
2020-07-28 14:30:37 +02:00 |
frederikpyt
|
c4e4d64014
|
Washing Reservation dynamic content
|
2020-07-28 14:26:32 +02:00 |
victor
|
63f2cc31d9
|
Fix live search again
|
2020-07-28 14:23:54 +02:00 |
victor
|
f6d762ba46
|
Revert "Added no match found on live search"
This reverts commit 47a07c61
|
2020-07-28 13:21:22 +02:00 |
victor
|
a90c9aa8cd
|
big smoke
|
2020-07-28 13:21:02 +02:00 |
victor
|
47a07c6174
|
Added no match found on live search
|
2020-07-28 11:31:39 +02:00 |
victor
|
2dba1fd8f7
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-28 11:07:41 +02:00 |
victor
|
c9cb3e99cd
|
Jeg er ikke sikker
|
2020-07-28 11:07:33 +02:00 |
Anders
|
f9c11e67db
|
Error and succes messages when you change password as user
|
2020-07-28 10:31:44 +02:00 |
Anders
|
8d8b5491c9
|
Removed unused/commented code
|
2020-07-28 10:17:00 +02:00 |
Anders
|
4d994d704b
|
Merge remote-tracking branch 'origin/master'
|
2020-07-28 10:13:52 +02:00 |
Anders
|
80725dee12
|
Made it possible to sign up for events.
Added fail and success messages when signing up.
Fixed unique keys in migrate
|
2020-07-28 10:13:44 +02:00 |
victor
|
9a5be4e280
|
Name fix for contact
|
2020-07-28 09:23:28 +02:00 |
frederikpyt
|
e5e937b76c
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-28 09:23:17 +02:00 |
frederikpyt
|
282ac8e735
|
Fixed washing reservation bugs
|
2020-07-28 09:21:41 +02:00 |
Anders
|
a679abea52
|
Route to UserEventController
|
2020-07-28 08:44:25 +02:00 |
Anders
|
0d221c8439
|
Merge remote-tracking branch 'origin/master'
|
2020-07-27 14:59:03 +02:00 |
Anders
|
ca3e2689ea
|
Frontpage fixed
|
2020-07-27 14:58:56 +02:00 |
Neerholt
|
519bd70ace
|
Merge branch 'master' into LiveSearch
|
2020-07-27 14:23:13 +02:00 |
victor
|
b9633d36a9
|
Made Live search is done
|
2020-07-27 16:03:49 +02:00 |
victor
|
f1fb73beec
|
Fix css on live search, live search now works
|
2020-07-27 14:03:57 +02:00 |
frederikpyt
|
4eaf3de6d5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-27 13:35:15 +02:00 |
frederikpyt
|
661d8a0f69
|
Fixed users and role implementation
|
2020-07-27 13:35:00 +02:00 |
frederikpyt
|
0c8cad9668
|
Fixed contacts
|
2020-07-27 13:34:45 +02:00 |
victor
|
2dd20ac85a
|
Semi fix live search
|
2020-07-27 13:07:19 +02:00 |
Anders
|
4b571781a5
|
Worked on base.blade.php
|
2020-07-27 10:31:57 +02:00 |
Sebastian Davaris
|
010322b605
|
Fixed frontend fuckup #3
|
2020-07-27 10:20:29 +02:00 |
Neerholt
|
9c17623518
|
Live search
|
2020-07-07 19:29:21 +02:00 |
frederikpyt
|
471a2897a5
|
Fixed redirect
|
2020-07-01 11:59:48 +02:00 |
Neerholt
|
4e69768ae8
|
Lavet controller og et forsøg på GUI
|
2020-07-01 11:46:29 +02:00 |
Anders
|
2368573ee7
|
Merge remote-tracking branch 'origin/master'
|
2020-07-01 11:44:20 +02:00 |
Anders
|
a174b47258
|
Fail message when there is no activity.
You can now use the button "Kontoret" in the menu navbar
|
2020-07-01 11:44:14 +02:00 |
frederikpyt
|
9d757dc536
|
Fixed washing machine reservation, creation, edit and deletion
|
2020-07-01 11:38:09 +02:00 |
frederikpyt
|
432d9042fd
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 10:32:52 +02:00 |
frederikpyt
|
2846dac2dc
|
Fixed Washing machine creation and editing
|
2020-07-01 10:30:28 +02:00 |
Anders
|
b4f79c6f5e
|
Merge remote-tracking branch 'origin/master'
|
2020-07-01 10:13:57 +02:00 |
Anders
|
03b7f4236a
|
Users able to change password
|
2020-07-01 10:13:49 +02:00 |
frederikpyt
|
6ecc96ef55
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:50:36 +02:00 |
frederikpyt
|
ca744a33e9
|
Removed feedback create button from admin dashboard
|
2020-07-01 09:50:29 +02:00 |
Neerholt
|
2b69938251
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:43:24 +02:00 |
Neerholt
|
7b4610f02f
|
Fix
|
2020-07-01 09:43:11 +02:00 |
frederikpyt
|
6b294972e4
|
Fixed admin dashboard current user label
|
2020-07-01 09:39:10 +02:00 |
frederikpyt
|
ff54108201
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:28:03 +02:00 |
frederikpyt
|
47daff173c
|
Added "no role" option when updating and creating a user
|
2020-07-01 09:27:54 +02:00 |
frederikpyt
|
f0a203fbb2
|
Rearranged admin panel site navigation
|
2020-07-01 09:27:18 +02:00 |
Vedde
|
cb927b9637
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/routes/web.php
|
2020-07-01 09:13:43 +02:00 |
Vedde
|
54a0fd0997
|
Added resource category migration and empty blade files
|
2020-07-01 09:08:33 +02:00 |
Anders
|
ec2479f0b4
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 14:40:54 +02:00 |
Anders
|
faa865c50f
|
fixed
|
2020-06-30 14:40:46 +02:00 |
frederikpyt
|
c505738592
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 14:09:19 +02:00 |
frederikpyt
|
3aee5515b1
|
Added confirmation to row deletion
|
2020-06-30 14:09:11 +02:00 |
Anders
|
8d7a684b93
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 14:04:41 +02:00 |
Anders
|
709be5ea87
|
Added account edit and route to it
|
2020-06-30 14:04:34 +02:00 |
frederikpyt
|
9f8cf52008
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 13:22:10 +02:00 |
frederikpyt
|
9425f5e067
|
Fixed role implementation on user index
|
2020-06-30 13:22:02 +02:00 |
Anders
|
56880d31be
|
Log out button for users added
|
2020-06-30 13:03:41 +02:00 |
Anders
|
dfd8420270
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# skolehjem/app/MenuPlan.php
|
2020-06-30 12:40:02 +02:00 |
Anders
|
394b8551c8
|
Edited menuplan - Can now be seen by users
|
2020-06-30 12:38:02 +02:00 |
frederikpyt
|
2ab54da383
|
Fix
|
2020-06-30 12:13:49 +02:00 |
frederikpyt
|
c49080f366
|
Dynamic roles in user create/edit frontend
|
2020-06-30 12:07:38 +02:00 |
frederikpyt
|
b586eceea9
|
Fix
|
2020-06-30 12:01:25 +02:00 |
frederikpyt
|
cab97f1c0a
|
Fix
|
2020-06-30 11:58:00 +02:00 |
frederikpyt
|
778315ff0b
|
Fix
|
2020-06-30 11:56:31 +02:00 |
frederikpyt
|
4b4b2b68de
|
Fix
|
2020-06-30 11:54:17 +02:00 |