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 |
 victor
|
9a5be4e280
|
Name fix for contact
|
2020-07-28 09:23:28 +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
|
0d221c8439
|
Merge remote-tracking branch 'origin/master'
|
2020-07-27 14:59:03 +02:00 |
|
Anders
|
ca3e2689ea
|
Frontpage fixed
|
2020-07-27 14:58:56 +02:00 |
Neerholt
|
519bd70ace
|
Merge branch 'master' into LiveSearch
|
2020-07-27 14:23:13 +02:00 |
|
victor
|
b9633d36a9
|
Made Live search is done
|
2020-07-27 16:03:49 +02:00 |
|
victor
|
f1fb73beec
|
Fix css on live search, live search now works
|
2020-07-27 14:03:57 +02:00 |
|
frederikpyt
|
4eaf3de6d5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-27 13:35:15 +02:00 |
|
frederikpyt
|
661d8a0f69
|
Fixed users and role implementation
|
2020-07-27 13:35:00 +02:00 |
|
frederikpyt
|
0c8cad9668
|
Fixed contacts
|
2020-07-27 13:34:45 +02:00 |
|
victor
|
2dd20ac85a
|
Semi fix live search
|
2020-07-27 13:07:19 +02:00 |
|
Anders
|
4b571781a5
|
Worked on base.blade.php
|
2020-07-27 10:31:57 +02:00 |
 Sebastian Davaris
|
010322b605
|
Fixed frontend fuckup #3
|
2020-07-27 10:20:29 +02:00 |
|
Neerholt
|
9c17623518
|
Live search
|
2020-07-07 19:29:21 +02:00 |
|
frederikpyt
|
471a2897a5
|
Fixed redirect
|
2020-07-01 11:59:48 +02:00 |
|
Neerholt
|
4e69768ae8
|
Lavet controller og et forsøg på GUI
|
2020-07-01 11:46:29 +02:00 |
|
Anders
|
2368573ee7
|
Merge remote-tracking branch 'origin/master'
|
2020-07-01 11:44:20 +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 |
|
frederikpyt
|
9d757dc536
|
Fixed washing machine reservation, creation, edit and deletion
|
2020-07-01 11:38:09 +02:00 |
|
frederikpyt
|
432d9042fd
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 10:32:52 +02:00 |
|
frederikpyt
|
2846dac2dc
|
Fixed Washing machine creation and editing
|
2020-07-01 10:30:28 +02:00 |
|
Anders
|
b4f79c6f5e
|
Merge remote-tracking branch 'origin/master'
|
2020-07-01 10:13:57 +02:00 |
|
Anders
|
03b7f4236a
|
Users able to change password
|
2020-07-01 10:13:49 +02:00 |
|
frederikpyt
|
6ecc96ef55
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:50:36 +02:00 |
|
frederikpyt
|
ca744a33e9
|
Removed feedback create button from admin dashboard
|
2020-07-01 09:50:29 +02:00 |
|
Neerholt
|
2b69938251
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:43:24 +02:00 |
|
Neerholt
|
7b4610f02f
|
Fix
|
2020-07-01 09:43:11 +02:00 |
|
frederikpyt
|
6b294972e4
|
Fixed admin dashboard current user label
|
2020-07-01 09:39:10 +02:00 |
|
frederikpyt
|
ff54108201
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:28:03 +02:00 |
|
frederikpyt
|
47daff173c
|
Added "no role" option when updating and creating a user
|
2020-07-01 09:27:54 +02:00 |
|
frederikpyt
|
f0a203fbb2
|
Rearranged admin panel site navigation
|
2020-07-01 09:27:18 +02:00 |
Vedde
|
cb927b9637
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/routes/web.php
|
2020-07-01 09:13:43 +02:00 |
|
Vedde
|
54a0fd0997
|
Added resource category migration and empty blade files
|
2020-07-01 09:08:33 +02:00 |
|
Anders
|
ec2479f0b4
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 14:40:54 +02:00 |
|
Anders
|
faa865c50f
|
fixed
|
2020-06-30 14:40:46 +02:00 |
|
frederikpyt
|
c505738592
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 14:09:19 +02:00 |
|
frederikpyt
|
3aee5515b1
|
Added confirmation to row deletion
|
2020-06-30 14:09:11 +02:00 |
|
Anders
|
8d7a684b93
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 14:04:41 +02:00 |
|
Anders
|
709be5ea87
|
Added account edit and route to it
|
2020-06-30 14:04:34 +02:00 |
|
frederikpyt
|
9f8cf52008
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 13:22:10 +02:00 |
|
frederikpyt
|
9425f5e067
|
Fixed role implementation on user index
|
2020-06-30 13:22:02 +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 |
|
frederikpyt
|
2ab54da383
|
Fix
|
2020-06-30 12:13:49 +02:00 |
|
frederikpyt
|
c49080f366
|
Dynamic roles in user create/edit frontend
|
2020-06-30 12:07:38 +02:00 |
|
frederikpyt
|
b586eceea9
|
Fix
|
2020-06-30 12:01:25 +02:00 |
|
frederikpyt
|
cab97f1c0a
|
Fix
|
2020-06-30 11:58:00 +02:00 |
|
frederikpyt
|
778315ff0b
|
Fix
|
2020-06-30 11:56:31 +02:00 |
|
frederikpyt
|
4b4b2b68de
|
Fix
|
2020-06-30 11:54:17 +02:00 |
|
frederikpyt
|
27414ade79
|
Role implementation
|
2020-06-30 11:49:17 +02:00 |
|
frederikpyt
|
b08422c520
|
Various fixes
|
2020-06-30 11:38:28 +02:00 |
|
frederikpyt
|
df679536de
|
Role frontend
|
2020-06-30 11:31:12 +02:00 |
|
Vedde
|
8415338120
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 10:57:36 +02:00 |
|
Vedde
|
5b36a52320
|
worked on ResourceExtensionController.php
|
2020-06-30 10:57:25 +02:00 |
|
frederikpyt
|
b878e81822
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 10:46:56 +02:00 |
|
frederikpyt
|
2a63600135
|
Fixes
|
2020-06-30 10:46:49 +02:00 |
|
Sebastian Davaris
|
0491bc9b85
|
Fixed Last normal security.
|
2020-06-30 10:42:10 +02:00 |
|
frederikpyt
|
aea1b0af04
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 10:19:08 +02:00 |
|
frederikpyt
|
c074f32bbe
|
Fixes and implementation of forgot password
|
2020-06-30 10:19:01 +02:00 |
|
Sebastian Davaris
|
358b218d23
|
Finished security middlewarez
|
2020-06-30 10:04:06 +02:00 |
|
Sebastian Davaris
|
620902d7d8
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:53:44 +02:00 |
|
Vedde
|
3b2fec0e09
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:52:20 +02:00 |
|
Vedde
|
66e8b2e3d8
|
Modified EventController.php.
|
2020-06-30 08:52:11 +02:00 |
|
Sebastian Davaris
|
a91118a2b3
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:49:51 +02:00 |
|
Anders
|
1cf39cbbd2
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 08:35:49 +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
|
f638777878
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
skolehjem/resources/views/admin/users/index.blade.php
|
2020-06-30 08:25:18 +02:00 |
|
Sebastian Davaris
|
4a0840b104
|
Modified base.blade.php?
|
2020-06-30 08:24:29 +02:00 |
|
frederikpyt
|
2f22ae275e
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:23:14 +02:00 |
|
frederikpyt
|
2562c69c36
|
Fixed delete on indexes
|
2020-06-30 08:23:07 +02:00 |
|
Anders
|
d6a9aa0c4f
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 08:21:45 +02:00 |
|
Anders
|
c732d8eec0
|
Fixed menuplan create
|
2020-06-30 08:21:36 +02:00 |
|
frederikpyt
|
c803d12299
|
Frontend support for role selection in user create, read and update.
|
2020-06-30 08:03:42 +02:00 |
|
frederikpyt
|
a4ff9a3590
|
Fixed calender CSS
|
2020-06-30 07:45:58 +02:00 |
|
Sebastian Davaris
|
4d35b368c6
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 14:50:08 +02:00 |
|
Sebastian Davaris
|
988ceb7c8a
|
Fixed error AND 0x01
|
2020-06-29 14:49:57 +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 |
|
Vedde
|
7234304496
|
worked on event blade files.
|
2020-06-29 14:48:31 +02:00 |
|
Sebastian Davaris
|
eb749e58a5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 14:28:17 +02:00 |
|
Anders
|
45a7302640
|
Removed unnecessary code from StaffController.php
|
2020-06-29 14:26:39 +02:00 |
|
frederikpyt
|
5a136c537c
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 14:11:27 +02:00 |
|
frederikpyt
|
e329f3f383
|
Fixes
|
2020-06-29 14:11:15 +02:00 |
|
Anders
|
58da7e8136
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 14:08:32 +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 |
|
frederikpyt
|
7fb4920354
|
Fixes
|
2020-06-29 13:55:47 +02:00 |
|
frederikpyt
|
357c046e44
|
Fixes
|
2020-06-29 13:47:18 +02:00 |
|
frederikpyt
|
5e624d7561
|
Fixes
|
2020-06-29 13:38:05 +02:00 |
|
frederikpyt
|
8f74a8b649
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 13:19:33 +02:00 |
|
frederikpyt
|
c6ffa26baa
|
Fixes
|
2020-06-29 13:18:58 +02:00 |
|
Anders
|
42aa2b5c83
|
Renamed contact to contacts in app
|
2020-06-29 13:18:39 +02:00 |
|
frederikpyt
|
626dddbb06
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 13:07:28 +02:00 |
|
frederikpyt
|
f16018cb15
|
Kontakt frontend
|
2020-06-29 13:07:17 +02:00 |
|
Anders
|
9bc7369ffe
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 12:56:14 +02:00 |
|
Anders
|
f7786be665
|
Added Feedback index page + added routing in base.blade.php + Fixed routing in FeedbackController.php
|
2020-06-29 12:56:08 +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
|
8047e33ad3
|
Kontakt frontend
|
2020-06-29 12:45:27 +02:00 |
|
frederikpyt
|
04ad9f6d1c
|
Kontakt frontend
|
2020-06-29 12:35:24 +02:00 |
|
frederikpyt
|
79d6ffe52d
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 12:32:46 +02:00 |
|
frederikpyt
|
7d80b014c7
|
Kontakt frontend
|
2020-06-29 12:32:34 +02:00 |
|
Anders
|
91a34f3d08
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 12:29:30 +02:00 |
|
Anders
|
600bbe7746
|
Fixed routing and backend to staff section
|
2020-06-29 12:29:23 +02:00 |
|
frederikpyt
|
d37c0c63f6
|
Kontakt frontend
|
2020-06-29 12:24:45 +02:00 |
|
frederikpyt
|
30b31e0309
|
Kontakt frontend
|
2020-06-29 12:20:09 +02:00 |
|
Anders
|
f5cdf848a3
|
Added Staff section and routing + some backend (That should be checked out)
|
2020-06-29 11:57:11 +02:00 |
|
frederikpyt
|
137c12cbee
|
Kontakt frontend
|
2020-06-29 11:41:33 +02:00 |
|
frederikpyt
|
ad0f61dd51
|
Kontakt frontend
|
2020-06-29 11:38:18 +02:00 |
|
frederikpyt
|
78992f6a61
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 11:34:30 +02:00 |
|
frederikpyt
|
b198f830c3
|
Kontakt frontend
|
2020-06-29 11:34:21 +02:00 |
|
Anders
|
02faa63b98
|
Removed Fredag-Søndag in menuplans
|
2020-06-29 11:09:39 +02:00 |
|
Vedde
|
7f7226e12d
|
"fixed" events migration
|
2020-06-29 11:05:07 +02:00 |
|
Anders
|
469c21645a
|
Added Event route in admins left navbar
|
2020-06-29 10:56:53 +02:00 |
|
frederikpyt
|
1863d953f8
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/resources/views/admin/menuplans/create.blade.php
|
2020-06-29 10:52:18 +02:00 |
|
frederikpyt
|
0f93f4ca97
|
Fixes
|
2020-06-29 10:50:04 +02:00 |
|
Anders
|
7120b85784
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 10:46:35 +02:00 |
|
Anders
|
246ae2235d
|
Removed Fredag-Søndag on menuplan
|
2020-06-29 10:46:28 +02:00 |
|
frederikpyt
|
e8f13d81ec
|
Contact frontend
|
2020-06-29 10:40:34 +02:00 |
|
frederikpyt
|
86bf8cbc6e
|
Contact frontend
|
2020-06-29 10:37:42 +02:00 |
|
frederikpyt
|
488995ca37
|
Contact frontend
|
2020-06-29 10:31:24 +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 |