Anders
|
246ae2235d
|
Removed Fredag-Søndag on menuplan
|
2020-06-29 10:46:28 +02:00 |
 Neerholt
|
419672a302
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 10:41:38 +02:00 |
|
Neerholt
|
f952ad33aa
|
Added s til controller
|
2020-06-29 10:41:27 +02:00 |
frederikpyt
|
e8f13d81ec
|
Contact frontend
|
2020-06-29 10:40:34 +02:00 |
|
frederikpyt
|
4feb85f91c
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 10:37:49 +02:00 |
|
frederikpyt
|
86bf8cbc6e
|
Contact frontend
|
2020-06-29 10:37:42 +02:00 |
|
Neerholt
|
bb307df506
|
ikd kev
|
2020-06-29 10:37:37 +02:00 |
|
frederikpyt
|
94b0d73cc4
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 10:31:31 +02:00 |
|
frederikpyt
|
488995ca37
|
Contact frontend
|
2020-06-29 10:31:24 +02:00 |
|
Neerholt
|
b555af06c7
|
Lavet contact create controller
|
2020-06-29 10:30:09 +02:00 |
Vedde
|
3f3984ddab
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 10:28:45 +02:00 |
|
Vedde
|
62d6fe62e3
|
added temporary trial event fetcher
|
2020-06-29 10:28:35 +02:00 |
 Sebastian Davaris
|
03c609175d
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/resources/views/admin/layout/base.blade.php
skolehjem/resources/views/app/layout/base.blade.php
skolehjem/routes/web.php
|
2020-06-29 10:15:56 +02:00 |
|
Sebastian Davaris
|
c823bdd963
|
Added button to calendar.js
|
2020-06-29 10:14:47 +02:00 |
|
frederikpyt
|
d4abbfc189
|
Fixes
|
2020-06-29 10:12:58 +02:00 |
|
Neerholt
|
3115b337cd
|
jeg er ikke sikker på hvad der der sket :)
|
2020-06-29 10:07:42 +02:00 |
|
frederikpyt
|
6bdf7d3447
|
Fixes
|
2020-06-29 09:57:21 +02:00 |
|
frederikpyt
|
2726ccadbf
|
Fixes
|
2020-06-29 09:28:57 +02:00 |
|
frederikpyt
|
fc1d7c5a5b
|
Fixes
|
2020-06-29 09:26:07 +02:00 |
|
frederikpyt
|
ac74aa3f82
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 09:22:01 +02:00 |
|
frederikpyt
|
b8f2c57fc0
|
Created konto entry in hamburger menu
|
2020-06-29 09:21:54 +02:00 |
|
Sebastian Davaris
|
0afa8a7aa3
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 09:21:29 +02:00 |
|
Sebastian Davaris
|
1eaa34516b
|
Fixed PhoneController.php
|
2020-06-29 09:21:17 +02:00 |
|
Vedde
|
874f0064a1
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 09:19:57 +02:00 |
|
Vedde
|
354a5952a7
|
updated Externallink. Should be able to do crud
|
2020-06-29 09:19:43 +02:00 |
|
Sebastian Davaris
|
0683b122fe
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 09:08:58 +02:00 |
|
Sebastian Davaris
|
c1877cd180
|
DO NOT TOUCH MENUPLAN-STUFF!!!
|
2020-06-29 09:08:49 +02:00 |
|
frederikpyt
|
a98b259b9b
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 09:03:31 +02:00 |
|
frederikpyt
|
42e3ece4aa
|
Updated Contact
|
2020-06-29 09:03:24 +02:00 |
|
Sebastian Davaris
|
0adc1ebf02
|
Added Contact-stuff
|
2020-06-29 08:50:50 +02:00 |
|
Anders
|
4eb2a29af9
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:47:09 +02:00 |
|
Sebastian Davaris
|
72a23933a8
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 08:43:46 +02:00 |
|
Sebastian Davaris
|
5be4b752d7
|
Finished Menuplan;)
|
2020-06-29 08:43:35 +02:00 |
|
frederikpyt
|
2e948b29e8
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 08:35:16 +02:00 |
|
frederikpyt
|
8001c46a1e
|
Fixed hamburger menu
|
2020-06-29 08:35:08 +02:00 |
|
Anders
|
0c3d6dab25
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:34:49 +02:00 |
|
Sebastian Davaris
|
4061b590cb
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/resources/views/admin/menuplans/edit.blade.php
skolehjem/resources/views/admin/menuplans/index.blade.php
skolehjem/resources/views/admin/menuplans/update.blade.php
|
2020-06-29 08:32:52 +02:00 |
|
Sebastian Davaris
|
66ddd32944
|
Working on MenuPlanController.php
|
2020-06-29 08:31:36 +02:00 |
|
Vedde
|
4576140d2f
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:31:27 +02:00 |
|
Neerholt
|
a7c3a54778
|
Data bliver nu vist på edit siden
|
2020-06-29 08:31:26 +02:00 |
|
Vedde
|
d33a89757d
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:30:48 +02:00 |
|
Vedde
|
b46f8f7b0a
|
changed route name and table data to show correct info
|
2020-06-29 08:30:31 +02:00 |
|
Neerholt
|
7588e05299
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:22:15 +02:00 |
|
Neerholt
|
b1ae0f0964
|
Fix edit siden
|
2020-06-29 08:22:07 +02:00 |
|
Anders
|
8987db9d31
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# skolehjem/resources/views/admin/washing-reservations/index.blade.php
|
2020-06-29 08:19:55 +02:00 |
|
frederikpyt
|
b790d2cf65
|
Fixes
|
2020-06-29 08:15:11 +02:00 |
|
frederikpyt
|
09040f0a36
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 08:14:01 +02:00 |
|
frederikpyt
|
0ba866ec29
|
Fixes
|
2020-06-29 08:13:53 +02:00 |
|
Neerholt
|
7d13933ea7
|
Fix route link til edit på menuplan
|
2020-06-29 08:02:42 +02:00 |
|
Anders
|
f517e53557
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 07:54:41 +02:00 |