fff03fd131
v0.9.2 - Added send notifications
2020-08-12 15:26:32 +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
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
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
fb88bfa4c8
v0.8.0 - Fixed ResourceController.php
2020-08-12 10:44:54 +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
b1b96ad080
v0.7.6 - Added snackbar
2020-08-11 15:08:09 +02:00
80ec936a0c
v0.7.2 - Remember Me
2020-08-11 13:05:30 +02:00
c2ae6e08c3
v0.7.0 - Settings tab
2020-08-11 12:37:31 +02:00
Neerholt
76e0d7997a
v0.6.2e - Made setting controller. Made on resource controller
2020-08-11 12:26:52 +02:00
Neerholt
511b4a288b
v0.5.17a - Made darkmode
2020-08-10 14:49:00 +02:00
534fbe2efd
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-10 12:44:45 +02:00
79d09464f2
v0.5.17 - Fixed bugs
2020-08-10 12:44:20 +02:00
2cc78c5d7c
Merge remote-tracking branch 'origin/master'
2020-08-10 12:29:44 +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
50b495ee01
v0.5.15i - Fixed bugs
2020-08-10 12:14:09 +02:00
bb1aade947
v0.5.15h - Fixed bugs
2020-08-10 12:07:41 +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
1d8d89d299
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-10 11:06:41 +02:00
Neerholt
9a11e4b52c
v0.5.15b - optimized user search, so it now works like a charm :)
2020-08-10 11:06:27 +02:00
c077b0e55f
v0.5.15c - Fixed bug
2020-08-10 10:28:40 +02:00
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
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
bd7800f5a0
v0.5.15 - Added subname to news
2020-08-10 09:37:19 +02:00
Neerholt
a011df41ee
v0.5.14c - Fixed middelware typo
2020-08-10 09:18:00 +02:00
Neerholt
2db8032635
v0.5.14c - Fixed route error when you clicked on participate
2020-08-10 09:17:21 +02:00
Neerholt
9841cbd24e
v0.5.14a -Made cookies more oo oriented
2020-08-08 23:51:24 +02:00
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
d921803dfd
v0.5.12a - Fixed store of event
2020-08-07 12:59:21 +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
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
c268440021
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-08-07 10:59:02 +02:00
b0eda7f8e7
v0.5.10 - Added support for menuplan as news creation
2020-08-07 10:58:50 +02:00
e0b998dec0
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/app/Http/Controllers/UserEventController.php
2020-08-07 10:52:25 +02:00
a23337b9d4
v0.5.9 - Fixed en/dk messages + added backend en/dk messages
2020-08-07 10:51:10 +02:00
c02c1aacd3
v0.5.8b - Fix
2020-08-07 10:36:08 +02:00
f7941841fe
v0.5.8a - Fix
2020-08-07 10:25:46 +02:00
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
246004ebfd
v0.5.8 - Added create news option on guide and event create/edit
2020-08-07 09:47:23 +02:00
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
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
7cc871ae90
v0.5.7 - Made multi language option
2020-08-06 15:31:38 +02:00
1b7738fd09
Merge remote-tracking branch 'origin/master'
2020-08-06 14:47:28 +02:00
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
4c2fc5f5f0
v0.5.5A - Small fixes
2020-08-06 13:35:07 +02:00
3e4e6e71ab
v0.5.5 - Added news on the admin panel
2020-08-06 12:21:19 +02:00
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
358e47b703
v0.5.3A - Added permission requirements to GuideController.php
2020-08-06 08:44:21 +02:00
f4a277185d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-08-06 08:37:28 +02:00
5452711665
v0.5.3 - Added Locations and a location_id to washing machines
2020-08-06 08:37:16 +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
76bea82eea
v0.5.1 - Made contact phone number optional and updated data in seeders.
2020-08-05 13:29:45 +02:00
02b6684030
Added - Deleting Washing Reservations when deleting a washing machine
2020-08-05 10:11:28 +02:00
f988967c22
Guides - Fixed
...
Contact - Added phonetimes
2020-08-05 09:43:53 +02:00
91f7a4aa05
Merge remote-tracking branch 'origin/master'
2020-08-05 09:24:08 +02:00
a78e7d90f6
Fixed - Guides
...
Added - contacts visual (controller coming soon)
2020-08-05 09:23:57 +02:00
ee3caae76a
Fixes
2020-08-05 09:15:50 +02:00
072c5c65ab
Fixes and todo's
2020-08-05 08:10:38 +02:00
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
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
0e72166ac4
Removed External Links
2020-08-04 15:20:56 +02:00
d15f406059
Fail message when making a reservation with taken machine and time
2020-08-04 15:09:10 +02:00
5973b94247
Merge remote-tracking branch 'origin/master'
2020-08-04 14:11:33 +02:00
66f7e3b86b
fixes
2020-08-04 14:11:05 +02:00
c8b85a6c9b
fixed guide_article
2020-08-04 13:37:06 +02:00
f5a0174939
Merge remote-tracking branch 'origin/master'
2020-08-04 13:23:42 +02:00
694bd35b33
Implemented forgot password
2020-08-04 13:21:56 +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
d818d15b85
Implemented forgot password
2020-08-04 10:59:45 +02:00
9d44432fc2
Session message on fail - Menuplans
2020-08-04 10:11:18 +02:00
2edfd71de9
Session message on fail - Users / Roles / Events
2020-08-04 09:34:56 +02:00
b59189eac0
Session message on fail - Washing machine
2020-08-04 08:31:14 +02:00
f551d4c59f
Changed session messages on fail or success
2020-08-04 08:04:54 +02:00
0e9c054a12
Fix
2020-08-03 14:27:40 +02:00
898228637c
Fix
2020-08-03 14:26:58 +02:00
ae14081221
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-08-03 13:50:34 +02:00
093a944980
Fix
2020-08-03 13:50:27 +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
Neerholt
679de4872d
fixed
2020-08-03 13:14:58 +02:00
a66b7aad92
Fixes
2020-08-03 12:57:14 +02:00
11e3958f0a
Added - orderBy to own events & own reservations
...
Fixed - confirm message when deleting events
2020-08-03 11:17:36 +02:00
90b58a8586
Fixed - Redirect in Event controler
...
Fixed - orderBy function when searching, in Event & Feedback
2020-08-03 10:46:48 +02:00
ffb347b51d
Merge remote-tracking branch 'origin/master'
2020-08-03 10:37:04 +02:00
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
09fa8ce007
Fixed permissions
2020-08-03 09:39:32 +02:00
5f6546e399
Merge remote-tracking branch 'origin/master'
2020-08-03 08:54:35 +02:00
1d63879117
Added "orderBy" function to event and feedback.
2020-08-03 08:46:38 +02:00
f14dc22d92
Fixed permissions, seeders and security
2020-08-03 08:35:20 +02:00
27fd564e9f
Fixed permissions, seeders and security
2020-08-03 08:33:11 +02:00
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
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
38f8bfa0c9
Fixed bugs
2020-07-30 15:25:37 +02:00
ab12a46943
Fixed bugs
2020-07-30 14:52:40 +02:00
264c44529a
Updated Seeders
2020-07-30 14:38:32 +02:00
Neerholt
7830e31b21
Roles are now searchable
2020-07-30 11:02:41 +02:00
cf4559874a
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-30 10:12:00 +02:00
Neerholt
62d73d0894
Vaskemaskine search er kogt
2020-07-30 09:17:27 +02:00
9a6e1c4c4c
Fixed bug
2020-07-30 08:20:30 +02:00
7f8b6a3222
Merge remote-tracking branch 'origin/master'
2020-07-29 15:28:28 +02:00
d0c8adf7f4
Added store, update, edit to UserEventController.php
2020-07-29 15:28:21 +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
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
d6fc1b63b0
Fixed bug
2020-07-29 14:50:09 +02:00
30fb3b3cc0
Fixed bug
2020-07-29 14:36:11 +02:00
victor
a779b7325d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-29 13:33:20 +02:00
victor
7da57d5e18
Search
2020-07-29 13:33:11 +02:00
9a1ca59e5b
Permission fixes
2020-07-29 12:30:05 +02:00
a5cb2e2cde
Permission fixes
2020-07-29 12:18:08 +02:00
faec1f66c5
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-29 11:53:46 +02:00
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
fc0f97b04e
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 15:13:43 +02:00
fd3f2de668
Merge remote-tracking branch 'origin/master'
2020-07-28 14:54:26 +02:00
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
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
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
cf533bb69f
Merge remote-tracking branch 'origin/master'
2020-07-28 10:31:49 +02:00
f9c11e67db
Error and succes messages when you change password as user
2020-07-28 10:31:44 +02:00
Sebastian Davaris
22615b5f7d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 10:22:56 +02:00
Sebastian Davaris
fbe72420dc
Added RoleSeeder.php
2020-07-28 10:22:45 +02:00
4d994d704b
Merge remote-tracking branch 'origin/master'
2020-07-28 10:13:52 +02:00
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
8cfca540f4
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 09:23:37 +02:00
victor
9a5be4e280
Name fix for contact
2020-07-28 09:23:28 +02:00
e5e937b76c
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 09:23:17 +02:00
282ac8e735
Fixed washing reservation bugs
2020-07-28 09:21:41 +02:00
dcc93ae40c
Merge remote-tracking branch 'origin/master'
2020-07-28 08:44:32 +02:00
a679abea52
Route to UserEventController
2020-07-28 08:44:25 +02:00
67ae7746a3
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 08:34:58 +02:00
Sebastian Davaris
fb65c1b9fc
Added UserEvent.php
2020-07-28 08:18:45 +02:00
a51517036d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-27 14:37:59 +02:00
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
222a255fe7
Merge remote-tracking branch 'origin/master'
2020-07-27 14:01:12 +02:00
42449ae091
Comments Added
2020-07-27 14:01:04 +02:00
4eaf3de6d5
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-27 13:35:15 +02:00
0c8cad9668
Fixed contacts
2020-07-27 13:34:45 +02:00
d99892613b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-27 13:25:57 +02:00
715b188ecd
removed useless comment
2020-07-27 13:24:35 +02:00
39af9758ee
User can now change password
2020-07-27 13:22:45 +02:00
52a9c6ba1a
User can now change password
2020-07-27 13:09:51 +02:00
victor
2dd20ac85a
Semi fix live search
2020-07-27 13:07:19 +02:00
Sebastian Davaris
cbb01782fa
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-27 10:20:49 +02:00
ce3c8e6459
added comment
2020-07-27 09:35:36 +02:00
Sebastian Davaris
79e5e95695
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
...
Conflicts:
skolehjem/public/css/admin.css
2020-07-27 08:25:42 +02:00
Sebastian Davaris
a755fd9680
Working on ResourceController.php again..
2020-07-27 08:24:16 +02:00
Neerholt
9c17623518
Live search
2020-07-07 19:29:21 +02:00
6eb198011f
Fixed redirect
2020-07-02 10:06:17 +02:00
330b895a35
Fixed redirect
2020-07-01 11:56:44 +02:00
cd828725b6
Fixed redirect
2020-07-01 11:54:33 +02:00
Neerholt
4e69768ae8
Lavet controller og et forsøg på GUI
2020-07-01 11:46:29 +02:00
b84b9dbe04
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 11:41:08 +02:00
9d757dc536
Fixed washing machine reservation, creation, edit and deletion
2020-07-01 11:38:09 +02:00
32a7e3d3d0
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 11:29:58 +02:00
9f48d2372f
added a few comments
2020-07-01 11:29:45 +02:00
9870556c5a
Now able to delete washing machines
2020-07-01 10:56:04 +02:00
432d9042fd
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 10:32:52 +02:00
2846dac2dc
Fixed Washing machine creation and editing
2020-07-01 10:30:28 +02:00
Neerholt
32b7b3c925
Test commit
2020-07-01 10:29:47 +02:00
b4f79c6f5e
Merge remote-tracking branch 'origin/master'
2020-07-01 10:13:57 +02:00
03b7f4236a
Users able to change password
2020-07-01 10:13:49 +02:00
Neerholt
eb48514545
Made it so you get send to index after you make,edit and update user information
2020-07-01 09:50:37 +02:00
Neerholt
7b4610f02f
Fix
2020-07-01 09:43:11 +02:00
Neerholt
b929aa2bdb
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 09:17:14 +02:00
Neerholt
016613b469
Fix
2020-07-01 09:16:53 +02:00
cb927b9637
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
...
Conflicts:
skolehjem/routes/web.php
2020-07-01 09:13:43 +02:00
54a0fd0997
Added resource category migration and empty blade files
2020-07-01 09:08:33 +02:00
Sebastian Davaris
903341c1ec
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 08:14:34 +02:00
faa865c50f
fixed
2020-06-30 14:40:46 +02:00
5e60794c1a
Added account edit and route to it
2020-06-30 14:05:40 +02:00
8d7a684b93
Merge remote-tracking branch 'origin/master'
2020-06-30 14:04:41 +02:00
709be5ea87
Added account edit and route to it
2020-06-30 14:04:34 +02:00
9f8cf52008
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 13:22:10 +02:00
9425f5e067
Fixed role implementation on user index
2020-06-30 13:22:02 +02:00
frederikpyt
Neerholt
Anders
Neerholt
Sebastian Davaris
Vedran Zelen