 Neerholt
|
76e0d7997a
|
v0.6.2e - Made setting controller. Made on resource controller
|
2020-08-11 12:26:52 +02:00 |
frederikpyt
|
64c260a63f
|
v0.6.0 - Darkmode
|
2020-08-11 09:13:48 +02:00 |
|
Neerholt
|
511b4a288b
|
v0.5.17a - Made darkmode
|
2020-08-10 14:49:00 +02:00 |
|
frederikpyt
|
534fbe2efd
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-10 12:44:45 +02:00 |
|
frederikpyt
|
79d09464f2
|
v0.5.17 - Fixed bugs
|
2020-08-10 12:44:20 +02:00 |
Anders
|
2cc78c5d7c
|
Merge remote-tracking branch 'origin/master'
|
2020-08-10 12:29:44 +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
|
50b495ee01
|
v0.5.15i - Fixed bugs
|
2020-08-10 12:14:09 +02:00 |
|
frederikpyt
|
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 |
|
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
|
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 |
|
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 |
|
Anders
|
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 |
|
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
|
c02c1aacd3
|
v0.5.8b - Fix
|
2020-08-07 10:36:08 +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
|
60391793fc
|
v0.5.7b - Added middelware
|
2020-08-07 08:52:01 +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
|
7cc871ae90
|
v0.5.7 - Made multi language option
|
2020-08-06 15:31:38 +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
|
4c2fc5f5f0
|
v0.5.5A - Small fixes
|
2020-08-06 13:35:07 +02:00 |
|
frederikpyt
|
3e4e6e71ab
|
v0.5.5 - Added news on the admin panel
|
2020-08-06 12:21:19 +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
|
358e47b703
|
v0.5.3A - Added permission requirements to GuideController.php
|
2020-08-06 08:44:21 +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
|
a04c38636b
|
v0.5.2 - Made the new menuplan, so you now can use CKeditor.
|
2020-08-05 14:59:41 +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
|
02b6684030
|
Added - Deleting Washing Reservations when deleting a washing machine
|
2020-08-05 10:11:28 +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
|
ee3caae76a
|
Fixes
|
2020-08-05 09:15:50 +02:00 |
|
frederikpyt
|
072c5c65ab
|
Fixes and todo's
|
2020-08-05 08:10:38 +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
|
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 |
|
frederikpyt
|
5973b94247
|
Merge remote-tracking branch 'origin/master'
|
2020-08-04 14:11:33 +02:00 |
|
frederikpyt
|
66f7e3b86b
|
fixes
|
2020-08-04 14:11:05 +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 |
|
frederikpyt
|
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 |
|
frederikpyt
|
d818d15b85
|
Implemented forgot password
|
2020-08-04 10:59:45 +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
|
f551d4c59f
|
Changed session messages on fail or success
|
2020-08-04 08:04:54 +02:00 |
|
frederikpyt
|
0e9c054a12
|
Fix
|
2020-08-03 14:27:40 +02:00 |
|
frederikpyt
|
898228637c
|
Fix
|
2020-08-03 14:26:58 +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 |
|
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 |
|
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
|
90b58a8586
|
Fixed - Redirect in Event controler
Fixed - orderBy function when searching, in Event & Feedback
|
2020-08-03 10:46:48 +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
|
09fa8ce007
|
Fixed permissions
|
2020-08-03 09:39:32 +02:00 |
|
Anders
|
5f6546e399
|
Merge remote-tracking branch 'origin/master'
|
2020-08-03 08:54:35 +02:00 |
|
Anders
|
1d63879117
|
Added "orderBy" function to event and feedback.
|
2020-08-03 08:46:38 +02:00 |
|
frederikpyt
|
f14dc22d92
|
Fixed permissions, seeders and security
|
2020-08-03 08:35:20 +02:00 |
|
frederikpyt
|
27fd564e9f
|
Fixed permissions, seeders and security
|
2020-08-03 08:33:11 +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
|
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
|
ab12a46943
|
Fixed bugs
|
2020-07-30 14:52:40 +02:00 |
|
frederikpyt
|
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 |
|
frederikpyt
|
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 |