vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
938 Commits 3 Branches 0 Tags 707 MiB
Commit Graph

281 Commits

Author SHA1 Message Date
Neerholt 23929310f7 v0.5.7 - Add the last support for english 2020-08-06 20:33:46 +02:00
Neerholt 7cc871ae90 v0.5.7 - Made multi language option 2020-08-06 15:31:38 +02:00
Anders 6e2ffa8de4 v0.5.6a - Fixed description when seeing your events 2020-08-06 14:50:07 +02:00
Anders 1b7738fd09 Merge remote-tracking branch 'origin/master' 2020-08-06 14:47:28 +02:00
Anders 708313a4b3 v0.5.6 - Fixed Guide when destroying. 
Added accountable in Event table to see who is the accountable for the event. Changed description field to CKEditor
 2020-08-06 14:47:22 +02:00
frederikpyt c472ae80fa v0.5.5B - Change app home page to news page 2020-08-06 14:30:18 +02:00
frederikpyt ab4275dc33 v0.5.4C - Added a back button on forgot password 2020-08-06 11:17:55 +02:00
frederikpyt 4b0ad949ba v0.5.4 - Created the "reservations in location" screen and added a location option when creating reservations. 2020-08-06 10:32:34 +02:00
frederikpyt 9b631843b0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/database/seeds/ContactSeeder.php
 2020-08-05 13:30:32 +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 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 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 286b78865b Fixed css and added no guides text 2020-08-05 07:51:30 +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
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
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
Anders 408eb7090b Fixed CSS 2020-08-04 10:40:01 +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 a66b7aad92 Fixes 2020-08-03 12:57:14 +02:00
Anders 11e3958f0a Added - orderBy to own events & own reservations 
Fixed - confirm message when deleting events
 2020-08-03 11:17:36 +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
frederikpyt 93198e5a54 Fixed css 2020-08-03 09:53:57 +02:00
Anders c2a90c69f9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	skolehjem/resources/views/app/users/editpass.blade.php
 2020-08-03 09:43:51 +02:00
Anders f2895a00e3 Started working on a better see password button 2020-08-03 09:42:17 +02:00
frederikpyt 09fa8ce007 Fixed permissions 2020-08-03 09:39:32 +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
Anders 56cbe7ad41 Added success message when you change credentials 
Added "see password" button - With CSS & Script (Script in file)
 2020-07-31 09:28:58 +02:00
frederikpyt 0e77da93b2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-30 14:51:50 +02:00
frederikpyt 991db2bab0 Fixed bugs 2020-07-30 14:51:23 +02:00
Anders e599d09aa7 Correct route to feedbacks x2 2020-07-30 14:51:03 +02:00
Anders 986a62009d Correct route to feedbacks 2020-07-30 14:47:22 +02:00
Anders f4ba4f6c45 Edited text 2020-07-30 12:20:52 +02:00
Anders f36f460b14 Front Page now has all useable buttons and links. 
Added "Are you sure" when you unsubscribe from an event
 2020-07-30 10:31:04 +02:00
frederikpyt 06346d9675 Fixed css and created the washing reservation index for app 2020-07-30 10:11:52 +02:00
frederikpyt 4a1002edf3 Added more svg icons to the hamburger menu 2020-07-30 08:41:09 +02:00
Anders 0c5cb360f2 User can now remove themselves from an event - And get a success message after they've done so. 
Removed user_id from washingReservation
 2020-07-29 14:59:35 +02:00
Anders bc2323b915 Removed @extends("app.layout.header") from a few blade.php files in app 2020-07-29 12:25:36 +02:00
frederikpyt 569ace008a Permission fixes and washing reservation fixes 2020-07-29 11:53:37 +02:00
frederikpyt b4f9065d79 Fixes 2020-07-28 15:13:33 +02:00
frederikpyt 606e13560b Washing Reservation create 2020-07-28 15:03:17 +02:00
frederikpyt fd2184c654 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/resources/views/app/layout/base.blade.php
 2020-07-28 14:30:37 +02:00
frederikpyt c4e4d64014 Washing Reservation dynamic content 2020-07-28 14:26:32 +02:00
Anders f9c11e67db Error and succes messages when you change password as user 2020-07-28 10:31:44 +02:00
Anders 8d8b5491c9 Removed unused/commented code 2020-07-28 10:17:00 +02:00
Anders 80725dee12 Made it possible to sign up for events. 
Added fail and success messages when signing up.
Fixed unique keys in migrate
 2020-07-28 10:13:44 +02:00
frederikpyt e5e937b76c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 09:23:17 +02:00
frederikpyt 282ac8e735 Fixed washing reservation bugs 2020-07-28 09:21:41 +02:00
Anders a679abea52 Route to UserEventController 2020-07-28 08:44:25 +02:00
Anders ca3e2689ea Frontpage fixed 2020-07-27 14:58:56 +02:00
Anders 4b571781a5 Worked on base.blade.php 2020-07-27 10:31:57 +02:00
Anders a174b47258 Fail message when there is no activity. 
You can now use the button "Kontoret" in the menu navbar
 2020-07-01 11:44:14 +02:00
Anders 03b7f4236a Users able to change password 2020-07-01 10:13:49 +02:00
Anders faa865c50f fixed 2020-06-30 14:40:46 +02:00
Anders 709be5ea87 Added account edit and route to it 2020-06-30 14:04:34 +02:00
Anders 56880d31be Log out button for users added 2020-06-30 13:03:41 +02:00
Anders dfd8420270 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	skolehjem/app/MenuPlan.php
 2020-06-30 12:40:02 +02:00
Anders 394b8551c8 Edited menuplan - Can now be seen by users 2020-06-30 12:38:02 +02:00
Sebastian Davaris 0491bc9b85 Fixed Last normal security. 2020-06-30 10:42:10 +02:00
frederikpyt c074f32bbe Fixes and implementation of forgot password 2020-06-30 10:19:01 +02:00
Sebastian Davaris a91118a2b3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:49:51 +02:00
Anders d93fff517a Users can now create a feedback to the admins (Needing a new way to see the message in the admin panel) 2020-06-30 08:35:40 +02:00
Sebastian Davaris 4d35b368c6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:50:08 +02:00
Vedde a3209bc422 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/app/Http/Controllers/ContactController.php
 2020-06-29 14:48:53 +02:00
Sebastian Davaris eb749e58a5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:28:17 +02:00
Anders b32a782b17 Added feedbacks.index in root->index. Added Feedbacks page to app. Added a send feedback button on contacts->index 2020-06-29 14:08:26 +02:00
Anders 42aa2b5c83 Renamed contact to contacts in app 2020-06-29 13:18:39 +02:00
Vedde 0306717822 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:54:56 +02:00
Vedde 4020fcf502 updated event migration and admin stuff 2020-06-29 12:53:08 +02:00
frederikpyt 30b31e0309 Kontakt frontend 2020-06-29 12:20:09 +02:00
Anders 02faa63b98 Removed Fredag-Søndag in menuplans 2020-06-29 11:09:39 +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
Neerholt 3115b337cd jeg er ikke sikker på hvad der der sket :) 2020-06-29 10:07:42 +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 b8f2c57fc0 Created konto entry in hamburger menu 2020-06-29 09:21:54 +02:00
Sebastian Davaris 1eaa34516b Fixed PhoneController.php 2020-06-29 09:21:17 +02:00
frederikpyt 42e3ece4aa Updated Contact 2020-06-29 09:03:24 +02:00
frederikpyt 8001c46a1e Fixed hamburger menu 2020-06-29 08:35:08 +02:00
frederikpyt b790d2cf65 Fixes 2020-06-29 08:15:11 +02:00
frederikpyt 0ba866ec29 Fixes 2020-06-29 08:13:53 +02:00
Sebastian Davaris 4173986df7 Fixed Routes in base.blade.php 2020-06-26 13:14:02 +02:00
Sebastian Davaris df8eb6c8cb Finished calendar.js (for now) 2020-06-26 13:07:57 +02:00
Sebastian Davaris de607a2d3c Fixed basic calendar functionality 2020-06-26 12:51:05 +02:00
Sebastian Davaris ecf1488bef Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-26 10:52:39 +02:00
Sebastian Davaris 933172777f Working on calendar.js some more.. 2020-06-26 10:52:26 +02:00
Anders e6d9ddf7d8 Fixed EventController to go to Events instead of bookings 
Added app->events->index page (needed backend and a foreach loop (foreach event do...))

Changed name in menu 'Vaske Booking Liste' to 'Reservationer'
 2020-06-26 08:56:18 +02:00
Anders ff1fbaf53f Added href to the first 3 buttons in the menu button. 
(Missing routing to the last 3)
 2020-06-26 08:07:12 +02:00
Anders 1d08ddbf58 Fixed mistakes 2020-06-25 15:11:59 +02:00
Anders 8bda01c1dc Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 15:02:06 +02:00
Anders bad4196e95 bleh 2020-06-25 15:01:33 +02:00
Sebastian Davaris b55fd18c71 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/resources/views/app/root/index.blade.php
 2020-06-25 14:56:45 +02:00
frederikpyt 7f083860f1 Fixes 2020-06-25 14:52:04 +02:00
frederikpyt 3976d37af2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 14:24:08 +02:00
frederikpyt 9e9f48aca1 Edited frontpage 2020-06-25 14:23:52 +02:00
Anders a77b266999 Removed: 
BookingController.php, Booking.php - Was already made being called washing-reservation
Route in web.php (Bookings not needed)

Fixed:
WashingReservationController.php
admin->layout->base (washing-reservations instead of booking)
 2020-06-25 13:28:51 +02:00
Sebastian Davaris 3d9cc63241 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-25 13:20:59 +02:00
Anders 233a1e6add Added BookingController.php, uncommented routed code in admin/layout/base.blade.php, 2020-06-25 11:56:38 +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 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
frederikpyt 7cb1fe6ed6 Moved files 2020-06-24 09:25:59 +02:00
Sebastian Davaris 8ac68ef7b9 Added FontAwesome 2020-06-23 15:32:42 +02:00
Sebastian 4ddc765082 Got the mobile route to work 2020-06-23 06:42:43 +02:00
Frederikmillingpytlick e73e2aacdc Added admin sites 2020-06-15 08:56:21 +02:00