 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 |
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 |
frederikpyt
|
5f7c91a507
|
Added error msg
|
2020-08-05 10:12:05 +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
|
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 |
|
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 |
|
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 |
|
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
|
408eb7090b
|
Fixed CSS
|
2020-08-04 10:40:01 +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
|
e8de894ae7
|
Merge remote-tracking branch 'origin/master'
|
2020-08-04 08:05:07 +02:00 |
|
Anders
|
f551d4c59f
|
Changed session messages on fail or success
|
2020-08-04 08:04:54 +02:00 |
|
frederikpyt
|
84a1045747
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-08-03 15:02:36 +02:00 |
|
frederikpyt
|
4fe015a74c
|
Fix
|
2020-08-03 15:02:26 +02:00 |
|
Anders
|
20d73c047f
|
Fixed date and stuff
|
2020-08-03 14:47:06 +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 |
|
Anders
|
01f9502653
|
Removes - Console.log in feedback(s)
|
2020-08-03 13:44:53 +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 |
|
frederikpyt
|
a66b7aad92
|
Fixes
|
2020-08-03 12:57:14 +02:00 |
|
Anders
|
7abfbe27b2
|
Merge remote-tracking branch 'origin/master'
|
2020-08-03 11:17:47 +02:00 |