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
|
a04c38636b
|
v0.5.2 - Made the new menuplan, so you now can use CKeditor.
|
2020-08-05 14:59:41 +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
|
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
|
d4e439a39b
|
Fixed css
|
2020-08-05 08:45:29 +02:00 |
|
frederikpyt
|
072c5c65ab
|
Fixes and todo's
|
2020-08-05 08:10:38 +02:00 |
|
frederikpyt
|
c04f26eaa7
|
fixes
|
2020-08-04 17:45:10 +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
|
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
|
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
|
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
|
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
|
ffb347b51d
|
Merge remote-tracking branch 'origin/master'
|
2020-08-03 10:37:04 +02:00 |
|
Anders
|
b4263d8891
|
Fixed - Password & Confirm Password in create user now need to be the same.
Added new "see password" function on all password sites.
Fixed bugs
|
2020-08-03 10:36:57 +02:00 |
|
Neerholt
|
d7c4f2052b
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
Conflicts:
skolehjem/routes/web.php
|
2020-08-03 10:09:54 +02:00 |
|
Neerholt
|
84cd760b0f
|
Made ris ros filter
|
2020-08-03 10:08:03 +02:00 |
|
Anders
|
1f5660001e
|
Fixed - Being able to change credentials without removing password
Added - Checking if the password is the same to confirm password in admin
|
2020-07-31 11:14:24 +02:00 |
|
Anders
|
d8ff713b90
|
Added "see password" button in admin - With CSS & Script (Script in file) - Edited form style and input styles
|
2020-07-31 10:38:10 +02:00 |
|
frederikpyt
|
38f8bfa0c9
|
Fixed bugs
|
2020-07-30 15:25:37 +02:00 |
|
frederikpyt
|
cf4559874a
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-30 10:12:00 +02:00 |
|
frederikpyt
|
06346d9675
|
Fixed css and created the washing reservation index for app
|
2020-07-30 10:11:52 +02:00 |
|
Anders
|
0ab41524c6
|
Added an account page for admin site
|
2020-07-30 08:42:01 +02:00 |
|
victor
|
4826725e07
|
Made washing-reservations search
|
2020-07-29 15:27:07 +02:00 |
|
frederikpyt
|
13c2e56e34
|
Filter search css
|
2020-07-29 13:58:19 +02:00 |
|
frederikpyt
|
657acbd6eb
|
Added User on washing reservation show
|
2020-07-29 13:43:18 +02:00 |
|
frederikpyt
|
faec1f66c5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-29 11:53:46 +02:00 |
|
frederikpyt
|
569ace008a
|
Permission fixes and washing reservation fixes
|
2020-07-29 11:53:37 +02:00 |
|
victor
|
26c28d8e54
|
Made filter search
|
2020-07-29 09:49:54 +02:00 |
|
Anders
|
fd3f2de668
|
Merge remote-tracking branch 'origin/master'
|
2020-07-28 14:54:26 +02:00 |
|
Anders
|
556e6cf25a
|
You are now able to remove people who have signed up for events - With routing etc.
|
2020-07-28 14:54:19 +02:00 |
|
victor
|
63f2cc31d9
|
Fix live search again
|
2020-07-28 14:23:54 +02:00 |
|
victor
|
f6d762ba46
|
Revert "Added no match found on live search"
This reverts commit 47a07c61
|
2020-07-28 13:21:22 +02:00 |