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 |
|
Vedde
|
dbe6a4dcfe
|
changed return view to Response::detect on controllers
|
2020-06-23 08:15:44 +02:00 |
Sebastian
|
4ddc765082
|
Got the mobile route to work
|
2020-06-23 06:42:43 +02:00 |
|
Sebastian
|
070ff2e3c6
|
Implemented first mobile detected route:)
|
2020-06-22 21:08:09 +02:00 |
|
Sebastian
|
f5fd0eb5bd
|
Added Mobile Detection.
|
2020-06-22 20:55:40 +02:00 |
|
Vedde
|
8ac8930844
|
Merge remote-tracking branch 'origin/master'
|
2020-06-22 15:28:32 +02:00 |
|
Vedde
|
c31a3e2c11
|
updated controller and layout blade
|
2020-06-22 15:28:20 +02:00 |
|
Sebastian Davaris
|
fed853093b
|
Last 22-06
|
2020-06-22 15:25:39 +02:00 |
|
Vedde
|
4a8336e677
|
Merge remote-tracking branch 'origin/master'
|
2020-06-22 14:57:21 +02:00 |
|
Vedde
|
5dcae7895a
|
updated controller
|
2020-06-22 14:57:11 +02:00 |
|
Sebastian Davaris
|
3a345b1417
|
Fixed Routes and blades.
|
2020-06-22 14:53:00 +02:00 |
|
Sebastian Davaris
|
9c3796220f
|
Fixed blade references.
|
2020-06-22 10:08:18 +02:00 |
|
Sebastian Davaris
|
e056567f57
|
Fixed UserController.php
|
2020-06-19 08:15:24 +02:00 |
|
Sebastian Davaris
|
ca4bcbd5be
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-18 08:01:53 +02:00 |
|
Sebastian Davaris
|
06bab0a120
|
Working on controllers
|
2020-06-18 08:01:42 +02:00 |
|
frederikpyt
|
fe9a97656f
|
Updated hrefs
|
2020-06-17 11:28:48 +02:00 |
|
frederikpyt
|
99c2b16752
|
Changed create.blade.php
|
2020-06-17 09:08:26 +02:00 |
|
Frederikmillingpytlick
|
7478766927
|
Created views
|
2020-06-16 09:06:45 +02:00 |
|
Frederikmillingpytlick
|
60bd31e54b
|
Created, moved and renamed views
|
2020-06-16 09:04:25 +02:00 |
|
Sebastian Davaris
|
a2c7d619b1
|
Added docs.xlsx
|
2020-06-16 08:28:37 +02:00 |
|
Sebastian Davaris
|
9212a543f8
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-16 08:13:36 +02:00 |
|
Sebastian Davaris
|
6106f67fe7
|
Began updating the View-routes.
|
2020-06-16 08:13:24 +02:00 |
|
Frederikmillingpytlick
|
5ce1e69d65
|
Fixes
|
2020-06-15 15:09:13 +02:00 |
|
Frederikmillingpytlick
|
eb2ce43928
|
Fixes on Menuplan sites
|
2020-06-15 12:42:09 +02:00 |
|
Frederikmillingpytlick
|
390969cf96
|
Added Menuplan sites
|
2020-06-15 12:29:03 +02:00 |
|
Frederikmillingpytlick
|
563f5ac694
|
Edited read.blade.php
|
2020-06-15 11:29:38 +02:00 |
|
Frederikmillingpytlick
|
a840a4b2f0
|
Fixes
|
2020-06-15 11:28:37 +02:00 |
|
Sebastian Davaris
|
aa2380023b
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-15 08:59:26 +02:00 |
|
Sebastian Davaris
|
07405d575d
|
Added more routes.
|
2020-06-15 08:59:15 +02:00 |
|
Frederikmillingpytlick
|
e73e2aacdc
|
Added admin sites
|
2020-06-15 08:56:21 +02:00 |
|
Frederikmillingpytlick
|
88b7012f69
|
Merge remote-tracking branch 'origin/master'
|
2020-06-11 14:54:05 +02:00 |
|
Frederikmillingpytlick
|
a341e61bad
|
Added Images, fonts, vagttelefon and menuplan
|
2020-06-11 14:52:15 +02:00 |
|
Sebastian Davaris
|
2f0ec75278
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/routes/web.php
|
2020-06-10 12:31:11 +02:00 |
|
Sebastian Davaris
|
3c02963c24
|
Began working on more controllers
|
2020-06-10 12:30:44 +02:00 |
|
Vedde
|
643ac9e3de
|
added values to migrations.
|
2020-06-10 12:29:18 +02:00 |
|
Vedde
|
2febf83348
|
Merge remote-tracking branch 'origin/master'
|
2020-06-10 08:33:15 +02:00 |
|
Vedde
|
2cbc1ddaf9
|
added user folder/view
updated EventController.php & web.php
|
2020-06-10 08:33:06 +02:00 |
|
Sebastian Davaris
|
9c6d8c04cd
|
Merge remote-tracking branch 'origin/master'
|
2020-06-10 08:25:57 +02:00 |
|
Sebastian Davaris
|
af76cbca87
|
Added Swagger
|
2020-06-10 08:25:21 +02:00 |
|
Vedde
|
fa6fdcd690
|
Added a few models and migrations
|
2020-06-09 10:45:16 +02:00 |
|
Sebastian Davaris
|
5c6f37eaf7
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-09 10:02:20 +02:00 |
|
Sebastian Davaris
|
bb03c4fc93
|
Added Models
|
2020-06-09 10:02:07 +02:00 |
|
Vedde
|
7eaa3311cb
|
Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts.
|
2020-06-09 09:05:07 +02:00 |
|
Sebastian Davaris
|
bab4c6d72e
|
Removed Vue
|
2020-06-09 08:38:05 +02:00 |
|
Sebastian Davaris
|
43fc299642
|
Added Vue
|
2020-06-09 08:24:20 +02:00 |
|
Sebastian Davaris
|
fbf1673fc0
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-08 15:08:58 +02:00 |
|
Sebastian Davaris
|
bd23d10a9d
|
Added first seeder.
|
2020-06-08 15:08:46 +02:00 |
|
Vedde
|
e2562f6960
|
added migrations of events, feedback, washing machines, and calendar events.
changed migration users table name into name first and name last.
added migration external link table string: name and link.
|
2020-06-08 14:59:25 +02:00 |
|
Vedde
|
cb20b1f862
|
added feedback, external link and washing reservations migrations
|
2020-06-08 10:56:37 +02:00 |
|
Sebastian Davaris
|
da00009fe9
|
Initial Commit
|
2020-06-08 10:04:45 +02:00 |