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
|
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 |
Sebastian D
|
68e6ba177f
|
Update main.yml
|
2020-08-05 14:11:15 +02:00 |
|
Sebastian D
|
1dc1ecba2e
|
Create main.yml
|
2020-08-05 14:08:59 +02:00 |
|
Sebastian D
|
a032ea9bdf
|
Create server_deploy.sh
|
2020-08-05 14:01:48 +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
|
121476de60
|
Fixed title
|
2020-08-05 11:14:30 +02:00 |
|
Anders
|
21f3832564
|
Fixed title
|
2020-08-05 11:11:45 +02:00 |
|
Anders
|
7d5273be8d
|
Fixed Images
|
2020-08-05 10:34:21 +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 |
|
Neerholt
|
5fa22d748a
|
phone number and admin name
|
2020-08-05 10:22:10 +02:00 |
|
frederikpyt
|
5f08267ec5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-08-05 10:12:12 +02:00 |
|
frederikpyt
|
5f7c91a507
|
Added error msg
|
2020-08-05 10:12:05 +02:00 |
|
Anders
|
02b6684030
|
Added - Deleting Washing Reservations when deleting a washing machine
|
2020-08-05 10:11:28 +02:00 |
|
Anders
|
d43ccb2a78
|
Merge remote-tracking branch 'origin/master'
|
2020-08-05 09:43:59 +02:00 |
|
Anders
|
f988967c22
|
Guides - Fixed
Contact - Added phonetimes
|
2020-08-05 09:43:53 +02:00 |
|
frederikpyt
|
0539e5c666
|
Created seeder for contacts
|
2020-08-05 09:43:39 +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 |
|
frederikpyt
|
ee3caae76a
|
Fixes
|
2020-08-05 09:15:50 +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 |
|
frederikpyt
|
2a3a728fa3
|
fixes
|
2020-08-04 14:27:11 +02:00 |
|
frederikpyt
|
9d52e2e621
|
fixes
|
2020-08-04 14:23:07 +02:00 |
|
frederikpyt
|
5973b94247
|
Merge remote-tracking branch 'origin/master'
|
2020-08-04 14:11:33 +02:00 |