 Sebastian Davaris
|
3d9cc63241
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-25 13:20:59 +02:00 |
|
Sebastian Davaris
|
3f9eaa7f8d
|
Working on calendar.js again
|
2020-06-25 13:20:47 +02:00 |
Anders
|
1105233f7c
|
Edited BookingController.php
|
2020-06-25 13:14:08 +02:00 |
|
Anders
|
db3620763f
|
Merge remote-tracking branch 'origin/master'
|
2020-06-25 13:02:58 +02:00 |
|
Anders
|
103dfa6830
|
(Maybe) Fixed Menuplans
|
2020-06-25 13:01:53 +02:00 |
frederikpyt
|
49d6853170
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-25 12:50:23 +02:00 |
|
frederikpyt
|
635d91915a
|
Fixes
|
2020-06-25 12:50:09 +02:00 |
|
Anders
|
5b85da54f2
|
Merge remote-tracking branch 'origin/master'
|
2020-06-25 12:48:50 +02:00 |
|
Anders
|
f3956e1e9b
|
Added Booking to base.blade.php
|
2020-06-25 12:48:44 +02:00 |
 Neerholt
|
9a2cb7a98a
|
idk kev
|
2020-06-25 12:44:06 +02:00 |
|
frederikpyt
|
41db59333b
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-25 12:40:34 +02:00 |
|
frederikpyt
|
b54bffb7a8
|
Updated Controllers
|
2020-06-25 12:40:26 +02:00 |
Vedde
|
c51f5812e6
|
Merge remote-tracking branch 'origin/master'
|
2020-06-25 12:37:41 +02:00 |
|
Vedde
|
80bf962f38
|
Le fix is not fix le
|
2020-06-25 12:37:17 +02:00 |
|
Anders
|
2349b52100
|
Added Booking Model
|
2020-06-25 12:32:16 +02:00 |
|
Neerholt
|
6447d9274f
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-25 12:22:43 +02:00 |
|
Neerholt
|
9a3d16bc61
|
Add some routes to menuplan
|
2020-06-25 12:22:22 +02:00 |
|
Anders
|
233a1e6add
|
Added BookingController.php, uncommented routed code in admin/layout/base.blade.php,
|
2020-06-25 11:56:38 +02:00 |
|
frederikpyt
|
d73e540d09
|
Merge remote-tracking branch 'origin/master'
|
2020-06-25 11:20:04 +02:00 |
|
frederikpyt
|
b16bb134da
|
Updated Controllers
|
2020-06-25 11:19:51 +02:00 |
|
Vedde
|
10dc32c701
|
updated menuplan controller
|
2020-06-25 10:34:10 +02:00 |
|
Vedde
|
00f798b940
|
Merge remote-tracking branch 'origin/master'
|
2020-06-25 09:15:30 +02:00 |
|
Vedde
|
27b4f48af2
|
updated controller
|
2020-06-25 09:15:21 +02:00 |
|
Anders
|
c627e4e1af
|
Added text in external-links. Added admin->menuplans->index Added foreach in admin->washing-machines->index, fixed title in app->vagttelefons->index
|
2020-06-25 09:04:23 +02:00 |
|
Sebastian Davaris
|
32da29dd49
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-25 08:28:48 +02:00 |
|
Sebastian Davaris
|
47161e2615
|
Working on calendar.js
|
2020-06-25 08:28:36 +02:00 |
|
Anders
|
bf57ec9d99
|
Added 2 more pages to Menuplans - Edited Href in Menuplans, Users & Washing-Machines
|
2020-06-25 08:12:53 +02:00 |
|
Anders
|
4ed33e4f99
|
Edited washing-machines, app\root\index & admin\layout\base
|
2020-06-24 14:19:55 +02:00 |
|
Anders
|
d7d33d1696
|
Added Bookings to admin panel - Fixed app->root->index.blade.php
|
2020-06-24 11:21:16 +02:00 |
|
Sebastian Davaris
|
ef58701a6e
|
Fixed "Le Fix" Error 0x01
|
2020-06-24 10:33:43 +02:00 |
|
Sebastian Davaris
|
730e77b0e0
|
Fixed detector.php
|
2020-06-24 10:32:07 +02:00 |
|
Sebastian Davaris
|
e8d44d7852
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-24 10:15:49 +02:00 |
|
frederikpyt
|
d4d0615a4e
|
Merge remote-tracking branch 'origin/master'
|
2020-06-24 09:26:53 +02:00 |
|
frederikpyt
|
7cb1fe6ed6
|
Moved files
|
2020-06-24 09:25:59 +02:00 |
|
Sebastian Davaris
|
9690a30437
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-24 08:55:07 +02:00 |
|
Sebastian Davaris
|
39ecd64d04
|
Calendar stuff.
|
2020-06-24 08:54:56 +02:00 |
|
Vedde
|
ccddf4d2f3
|
fixed wrong migration name of external link
fixed wrong path on controller view
|
2020-06-24 08:53:07 +02:00 |
|
Vedde
|
6a0a46453f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# skolehjem/app/Http/Controllers/EventController.php
|
2020-06-24 08:25:00 +02:00 |
|
Vedde
|
e2ab661dc2
|
fixed path
|
2020-06-24 08:24:45 +02:00 |
|
Sebastian Davaris
|
79af2dee20
|
Fixed Controller dependencies.
|
2020-06-24 08:23:15 +02:00 |
|
Sebastian Davaris
|
e6244027bd
|
Fixed ViewDetector.
|
2020-06-24 08:21:00 +02:00 |
|
Vedde
|
fb90868be6
|
Merge remote-tracking branch 'origin/master'
|
2020-06-24 07:40:33 +02:00 |
|
Sebastian Davaris
|
dd5a9fdbc6
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/resources/js/navmenu/menu.js
|
2020-06-23 15:34:12 +02:00 |
|
Sebastian Davaris
|
8ac68ef7b9
|
Added FontAwesome
|
2020-06-23 15:32:42 +02:00 |
|
Vedde
|
a6c20f8ee8
|
Merge remote-tracking branch 'origin/master'
|
2020-06-23 12:01:45 +02:00 |
|
frederikpyt
|
d5ddc0901c
|
Created Calender
|
2020-06-23 12:01:27 +02:00 |
|
Vedde
|
85989f5b04
|
added crud external-link blade and added menu plan
|
2020-06-23 11:59:26 +02:00 |
|
frederikpyt
|
2aaa8edd1b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# skolehjem/public/css/admin.css
|
2020-06-23 09:26:41 +02:00 |
|
frederikpyt
|
49ac76cfa6
|
Updated
|
2020-06-23 09:26:11 +02:00 |
|
Vedde
|
dbe6a4dcfe
|
changed return view to Response::detect on controllers
|
2020-06-23 08:15:44 +02:00 |