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
|
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 |