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
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
c4e4d64014
Washing Reservation dynamic content
2020-07-28 14:26:32 +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
victor
a90c9aa8cd
big smoke
2020-07-28 13:21:02 +02:00
victor
47a07c6174
Added no match found on live search
2020-07-28 11:31:39 +02:00
victor
2dba1fd8f7
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 11:07:41 +02:00
victor
c9cb3e99cd
Jeg er ikke sikker
2020-07-28 11:07:33 +02:00
cf533bb69f
Merge remote-tracking branch 'origin/master'
2020-07-28 10:31:49 +02:00
f9c11e67db
Error and succes messages when you change password as user
2020-07-28 10:31:44 +02:00
Sebastian Davaris
22615b5f7d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 10:22:56 +02:00
Sebastian Davaris
fbe72420dc
Added RoleSeeder.php
2020-07-28 10:22:45 +02:00
8d8b5491c9
Removed unused/commented code
2020-07-28 10:17:00 +02:00
4d994d704b
Merge remote-tracking branch 'origin/master'
2020-07-28 10:13:52 +02:00
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
8cfca540f4
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 09:23:37 +02:00
victor
9a5be4e280
Name fix for contact
2020-07-28 09:23:28 +02:00
e5e937b76c
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 09:23:17 +02:00
282ac8e735
Fixed washing reservation bugs
2020-07-28 09:21:41 +02:00
dcc93ae40c
Merge remote-tracking branch 'origin/master'
2020-07-28 08:44:32 +02:00
a679abea52
Route to UserEventController
2020-07-28 08:44:25 +02:00
67ae7746a3
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 08:34:58 +02:00
b89c1509fe
Added comments for easier understanding.
2020-07-28 08:34:10 +02:00
Sebastian Davaris
fb65c1b9fc
Added UserEvent.php
2020-07-28 08:18:45 +02:00
a9cd26075e
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 08:06:27 +02:00
0d221c8439
Merge remote-tracking branch 'origin/master'
2020-07-27 14:59:03 +02:00
ca3e2689ea
Frontpage fixed
2020-07-27 14:58:56 +02:00
a51517036d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-27 14:37:59 +02:00
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
222a255fe7
Merge remote-tracking branch 'origin/master'
2020-07-27 14:01:12 +02:00
42449ae091
Comments Added
2020-07-27 14:01:04 +02:00
4eaf3de6d5
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-27 13:35:15 +02:00
661d8a0f69
Fixed users and role implementation
2020-07-27 13:35:00 +02:00
0c8cad9668
Fixed contacts
2020-07-27 13:34:45 +02:00
d99892613b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-27 13:25:57 +02:00
715b188ecd
removed useless comment
2020-07-27 13:24:35 +02:00
39af9758ee
User can now change password
2020-07-27 13:22:45 +02:00
a59c36ab1a
Merge remote-tracking branch 'origin/master'
2020-07-27 13:09:56 +02:00
52a9c6ba1a
User can now change password
2020-07-27 13:09:51 +02:00
victor
2dd20ac85a
Semi fix live search
2020-07-27 13:07:19 +02:00
4558e8d958
added more comments
...
removed silly debug.
2020-07-27 12:40:45 +02:00
01b556faba
Merge remote-tracking branch 'origin/master'
2020-07-27 12:03:49 +02:00
6979d0c0b4
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-27 10:43:40 +02:00
131ac97afa
added helpful comments to models
2020-07-27 10:43:22 +02:00
4b571781a5
Worked on base.blade.php
2020-07-27 10:31:57 +02:00
Sebastian Davaris
cbb01782fa
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-27 10:20:49 +02:00
Sebastian Davaris
010322b605
Fixed frontend fuckup #3
2020-07-27 10:20:29 +02:00
ce3c8e6459
added comment
2020-07-27 09:35:36 +02:00
Sebastian Davaris
79e5e95695
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
...
Conflicts:
skolehjem/public/css/admin.css
2020-07-27 08:25:42 +02:00
Sebastian Davaris
a755fd9680
Working on ResourceController.php again..
2020-07-27 08:24:16 +02:00
Neerholt
9c17623518
Live search
2020-07-07 19:29:21 +02:00
6eb198011f
Fixed redirect
2020-07-02 10:06:17 +02:00
471a2897a5
Fixed redirect
2020-07-01 11:59:48 +02:00
330b895a35
Fixed redirect
2020-07-01 11:56:44 +02:00
37f6016199
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 11:54:46 +02:00
cd828725b6
Fixed redirect
2020-07-01 11:54:33 +02:00
Neerholt
4e69768ae8
Lavet controller og et forsøg på GUI
2020-07-01 11:46:29 +02:00
2368573ee7
Merge remote-tracking branch 'origin/master'
2020-07-01 11:44:20 +02:00
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
b84b9dbe04
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 11:41:08 +02:00
9d757dc536
Fixed washing machine reservation, creation, edit and deletion
2020-07-01 11:38:09 +02:00
32a7e3d3d0
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 11:29:58 +02:00
9f48d2372f
added a few comments
2020-07-01 11:29:45 +02:00
9870556c5a
Now able to delete washing machines
2020-07-01 10:56:04 +02:00
432d9042fd
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 10:32:52 +02:00
2846dac2dc
Fixed Washing machine creation and editing
2020-07-01 10:30:28 +02:00
Neerholt
32b7b3c925
Test commit
2020-07-01 10:29:47 +02:00
b4f79c6f5e
Merge remote-tracking branch 'origin/master'
2020-07-01 10:13:57 +02:00
03b7f4236a
Users able to change password
2020-07-01 10:13:49 +02:00
6ecc96ef55
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 09:50:36 +02:00
Neerholt
eb48514545
Made it so you get send to index after you make,edit and update user information
2020-07-01 09:50:37 +02:00
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
6b294972e4
Fixed admin dashboard current user label
2020-07-01 09:39:10 +02:00
ff54108201
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 09:28:03 +02:00
47daff173c
Added "no role" option when updating and creating a user
2020-07-01 09:27:54 +02:00
f0a203fbb2
Rearranged admin panel site navigation
2020-07-01 09:27:18 +02:00
Neerholt
b929aa2bdb
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 09:17:14 +02:00
Neerholt
016613b469
Fix
2020-07-01 09:16:53 +02:00
a1c73b0224
changed web.php to be correct
2020-07-01 09:15:11 +02:00
cb927b9637
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
...
Conflicts:
skolehjem/routes/web.php
2020-07-01 09:13:43 +02:00
54a0fd0997
Added resource category migration and empty blade files
2020-07-01 09:08:33 +02:00
Sebastian Davaris
903341c1ec
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 08:14:34 +02:00
ec2479f0b4
Merge remote-tracking branch 'origin/master'
2020-06-30 14:40:54 +02:00
faa865c50f
fixed
2020-06-30 14:40:46 +02:00
c505738592
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 14:09:19 +02:00
3aee5515b1
Added confirmation to row deletion
2020-06-30 14:09:11 +02:00
5e60794c1a
Added account edit and route to it
2020-06-30 14:05:40 +02:00
8d7a684b93
Merge remote-tracking branch 'origin/master'
2020-06-30 14:04:41 +02:00
709be5ea87
Added account edit and route to it
2020-06-30 14:04:34 +02:00
Neerholt
ed9e6c9d6a
Slet roles
2020-06-30 13:30:01 +02:00
9f8cf52008
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 13:22:10 +02:00
9425f5e067
Fixed role implementation on user index
2020-06-30 13:22:02 +02:00
Sebastian Davaris
36995e4ca9
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 13:17:03 +02:00
56880d31be
Log out button for users added
2020-06-30 13:03:41 +02:00
Sebastian Davaris
73387686b5
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 12:41:45 +02:00
Sebastian Davaris
9065d2043b
Fixed UserController.php...
2020-06-30 12:41:28 +02:00
dfd8420270
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/app/MenuPlan.php
2020-06-30 12:40:02 +02:00
394b8551c8
Edited menuplan - Can now be seen by users
2020-06-30 12:38:02 +02:00
Sebastian Davaris
52735bc569
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 12:22:44 +02:00
Sebastian Davaris
68876198ed
Working on ResourceController.php.
2020-06-30 12:22:35 +02:00
Neerholt
e3c7204961
Added roles to fillable
2020-06-30 12:21:05 +02:00
Neerholt
90ec2b9a68
Added roles to store
2020-06-30 12:17:47 +02:00
2ab54da383
Fix
2020-06-30 12:13:49 +02:00
Neerholt
5bd37db3e2
Made it so roles data kev
2020-06-30 12:11:18 +02:00
Neerholt
1706e12cc8
Merge remote-tracking branch 'origin/master'
2020-06-30 12:09:17 +02:00
Neerholt
f46062a9c4
Made it so roles data
2020-06-30 12:08:31 +02:00
112a8989da
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 12:07:46 +02:00
c49080f366
Dynamic roles in user create/edit frontend
2020-06-30 12:07:38 +02:00
Neerholt
e5493e1888
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 12:02:45 +02:00
Neerholt
05ec4e0228
Fixed idk kev
2020-06-30 12:02:32 +02:00
b586eceea9
Fix
2020-06-30 12:01:25 +02:00
cab97f1c0a
Fix
2020-06-30 11:58:00 +02:00
778315ff0b
Fix
2020-06-30 11:56:31 +02:00
Neerholt
2bb1d83c2d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 11:55:21 +02:00
Neerholt
af6222df97
Fixed Store
2020-06-30 11:55:11 +02:00
4b4b2b68de
Fix
2020-06-30 11:54:17 +02:00
Neerholt
e14ba7bdbd
Added s
2020-06-30 11:51:20 +02:00
2b76f26877
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 11:51:14 +02:00
Neerholt
c7c172c44b
Controller fix small R
2020-06-30 11:49:58 +02:00
07389cb8d1
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 11:49:47 +02:00
27414ade79
Role implementation
2020-06-30 11:49:17 +02:00
e0142bf977
Fixed deletion
2020-06-30 11:45:54 +02:00
484641bdee
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 11:38:35 +02:00
b08422c520
Various fixes
2020-06-30 11:38:28 +02:00
Neerholt
2840b879ea
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 11:35:41 +02:00
Neerholt
7f8fa8004f
made the role controller done
2020-06-30 11:35:32 +02:00
78756ab5f0
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 11:31:21 +02:00
df679536de
Role frontend
2020-06-30 11:31:12 +02:00
Neerholt
3fe0b1e6e9
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 11:30:21 +02:00
Neerholt
6c020e36da
Made role controller, added index and create
2020-06-30 11:30:12 +02:00
f0132bee2c
worked on ResourceExtensionController.php and added resource_extension migration
2020-06-30 11:27:39 +02:00
8415338120
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 10:57:36 +02:00
5b36a52320
worked on ResourceExtensionController.php
2020-06-30 10:57:25 +02:00
Sebastian Davaris
bc862a2303
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 10:56:09 +02:00
Sebastian Davaris
c1627c2fa4
Fixed UserSeeder.php.
2020-06-30 10:55:58 +02:00
b878e81822
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 10:46:56 +02:00
2a63600135
Fixes
2020-06-30 10:46:49 +02:00
Sebastian Davaris
3cfcd980f4
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 10:42:19 +02:00
Sebastian Davaris
0491bc9b85
Fixed Last normal security.
2020-06-30 10:42:10 +02:00
7c2d7f21d0
Fixes and implementation of forgot password
2020-06-30 10:35:09 +02:00
aea1b0af04
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 10:19:08 +02:00
c074f32bbe
Fixes and implementation of forgot password
2020-06-30 10:19:01 +02:00
Sebastian Davaris
7f91e76d90
Fixed UserSeeder.php.
2020-06-30 10:09:31 +02:00
Sebastian Davaris
2409fec66e
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 10:04:16 +02:00
Sebastian Davaris
358b218d23
Finished security middlewarez
2020-06-30 10:04:06 +02:00
0dcc5ab6e8
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 09:33:33 +02:00
c8327871a4
edited PermissionSeeder.php
2020-06-30 09:33:22 +02:00
Sebastian Davaris
0a89d24319
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 09:21:33 +02:00
Sebastian Davaris
14b745dc2b
Added more permissions to the seeder..
2020-06-30 09:21:21 +02:00
2814490a8a
Merge remote-tracking branch 'origin/master'
2020-06-30 09:19:56 +02:00
af228f705d
Removed unnecessary files
2020-06-30 09:19:35 +02:00
2210bd9718
Merge x2
2020-06-30 08:56:19 +02:00
139e62dedf
Merge
2020-06-30 08:55:41 +02:00
Sebastian Davaris
620902d7d8
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 08:53:44 +02:00
ccc45f485c
Merge remote-tracking branch 'origin/master'
2020-06-30 08:52:59 +02:00
8445a22732
Created files for gallery
2020-06-30 08:52:46 +02:00
3b2fec0e09
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 08:52:20 +02:00
66e8b2e3d8
Modified EventController.php.
2020-06-30 08:52:11 +02:00
Neerholt
fd87e133e9
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 08:50:14 +02:00
Neerholt
20bfcb2c97
Made gallery, video, album, migrations
2020-06-30 08:50:04 +02:00
Sebastian Davaris
a91118a2b3
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 08:49:51 +02:00
Sebastian Davaris
c609cf78ff
Added more permissions to the seeder.
2020-06-30 08:49:39 +02:00
8e8a6c8d6b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 08:48:58 +02:00
223ba6dc41
Created files for gallery
2020-06-30 08:48:51 +02:00
1cf39cbbd2
Merge remote-tracking branch 'origin/master'
2020-06-30 08:35:49 +02:00
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
2f22ae275e
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-30 08:23:14 +02:00
2562c69c36
Fixed delete on indexes
2020-06-30 08:23:07 +02:00
d6a9aa0c4f
Merge remote-tracking branch 'origin/master'
2020-06-30 08:21:45 +02:00
c732d8eec0
Fixed menuplan create
2020-06-30 08:21:36 +02:00
c803d12299
Frontend support for role selection in user create, read and update.
2020-06-30 08:03:42 +02:00
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
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
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
Sebastian Davaris
b5ede965fe
Began working on security.
2020-06-29 14:28:09 +02:00
45a7302640
Removed unnecessary code from StaffController.php
2020-06-29 14:26:39 +02:00
5a136c537c
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 14:11:27 +02:00
e329f3f383
Fixes
2020-06-29 14:11:15 +02:00
58da7e8136
Merge remote-tracking branch 'origin/master'
2020-06-29 14:08:32 +02:00
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
7fb4920354
Fixes
2020-06-29 13:55:47 +02:00
357c046e44
Fixes
2020-06-29 13:47:18 +02:00
204a7497e0
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 13:38:11 +02:00
5e624d7561
Fixes
2020-06-29 13:38:05 +02:00
Neerholt
8df9869f28
remove ,
2020-06-29 13:36:51 +02:00
6441a8838a
Added a new column to feedbacks
2020-06-29 13:30:13 +02:00
b942d8c1e1
Updated create_staff_table
2020-06-29 13:29:19 +02:00
Neerholt
b48907b523
Made staff migrate
2020-06-29 13:27:48 +02:00
8f74a8b649
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 13:19:33 +02:00
c6ffa26baa
Fixes
2020-06-29 13:18:58 +02:00
42aa2b5c83
Renamed contact to contacts in app
2020-06-29 13:18:39 +02:00
Neerholt
b1f2fdd2b7
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
...
Conflicts:
skolehjem/app/Http/Controllers/ContactController.php
2020-06-29 13:09:29 +02:00
Neerholt
08d5436f22
Fix delete controller
2020-06-29 13:08:39 +02:00
626dddbb06
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 13:07:28 +02:00
f16018cb15
Kontakt frontend
2020-06-29 13:07:17 +02:00
9bc7369ffe
Merge remote-tracking branch 'origin/master'
2020-06-29 12:56:14 +02:00
f7786be665
Added Feedback index page + added routing in base.blade.php + Fixed routing in FeedbackController.php
2020-06-29 12:56:08 +02:00
0306717822
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 12:54:56 +02:00
7b691b8c94
added event migration
2020-06-29 12:54:43 +02:00
4020fcf502
updated event migration and admin stuff
2020-06-29 12:53:08 +02:00
8047e33ad3
Kontakt frontend
2020-06-29 12:45:27 +02:00
Neerholt
e00da21506
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 12:37:03 +02:00
Neerholt
f61f67d0bc
slette s
2020-06-29 12:36:07 +02:00
04ad9f6d1c
Kontakt frontend
2020-06-29 12:35:24 +02:00
79d6ffe52d
Merge remote-tracking branch 'origin/master'
2020-06-29 12:32:46 +02:00
7d80b014c7
Kontakt frontend
2020-06-29 12:32:34 +02:00
91a34f3d08
Merge remote-tracking branch 'origin/master'
2020-06-29 12:29:30 +02:00
600bbe7746
Fixed routing and backend to staff section
2020-06-29 12:29:23 +02:00
0e7bf85d26
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 12:25:04 +02:00
d37c0c63f6
Kontakt frontend
2020-06-29 12:24:45 +02:00
Neerholt
85846eab6c
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 12:23:08 +02:00
Neerholt
6820dc3e3b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 12:21:27 +02:00
Neerholt
3f5886223b
idk kev
2020-06-29 12:21:16 +02:00
30b31e0309
Kontakt frontend
2020-06-29 12:20:09 +02:00
97af5273be
Merge remote-tracking branch 'origin/master'
2020-06-29 11:57:16 +02:00
f5cdf848a3
Added Staff section and routing + some backend (That should be checked out)
2020-06-29 11:57:11 +02:00
Neerholt
76cd9663c2
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 11:48:46 +02:00
Neerholt
a0a6f1a9cb
Laver edit, show, update,delete controller for contacts
2020-06-29 11:48:36 +02:00
7641deaeef
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 11:42:38 +02:00
137c12cbee
Kontakt frontend
2020-06-29 11:41:33 +02:00
Neerholt
cee2818046
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 11:39:22 +02:00
Neerholt
c86c067d07
added s to the end of contacts
2020-06-29 11:39:00 +02:00
ad0f61dd51
Kontakt frontend
2020-06-29 11:38:18 +02:00
78992f6a61
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 11:34:30 +02:00
b198f830c3
Kontakt frontend
2020-06-29 11:34:21 +02:00
Neerholt
0ce8e109b2
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 11:14:19 +02:00
Neerholt
ba73440044
Lavet sådan at man kan adde information til contacts databasen
2020-06-29 11:14:07 +02:00
02faa63b98
Removed Fredag-Søndag in menuplans
2020-06-29 11:09:39 +02:00
7f7226e12d
"fixed" events migration
2020-06-29 11:05:07 +02:00
469c21645a
Added Event route in admins left navbar
2020-06-29 10:56:53 +02:00
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
0f93f4ca97
Fixes
2020-06-29 10:50:04 +02:00
7120b85784
Merge remote-tracking branch 'origin/master'
2020-06-29 10:46:35 +02:00
246ae2235d
Removed Fredag-Søndag on menuplan
2020-06-29 10:46:28 +02:00
Neerholt
419672a302
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 10:41:38 +02:00
Neerholt
f952ad33aa
Added s til controller
2020-06-29 10:41:27 +02:00
e8f13d81ec
Contact frontend
2020-06-29 10:40:34 +02:00
4feb85f91c
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 10:37:49 +02:00
86bf8cbc6e
Contact frontend
2020-06-29 10:37:42 +02:00
Neerholt
bb307df506
ikd kev
2020-06-29 10:37:37 +02:00
94b0d73cc4
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 10:31:31 +02:00
488995ca37
Contact frontend
2020-06-29 10:31:24 +02:00
Neerholt
b555af06c7
Lavet contact create controller
2020-06-29 10:30:09 +02:00
3f3984ddab
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 10:28:45 +02:00
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
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
6bdf7d3447
Fixes
2020-06-29 09:57:21 +02:00
2726ccadbf
Fixes
2020-06-29 09:28:57 +02:00
fc1d7c5a5b
Fixes
2020-06-29 09:26:07 +02:00
ac74aa3f82
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 09:22:01 +02:00
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
874f0064a1
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 09:19:57 +02:00
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
a98b259b9b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 09:03:31 +02:00
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
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
2e948b29e8
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 08:35:16 +02:00
8001c46a1e
Fixed hamburger menu
2020-06-29 08:35:08 +02:00
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
Sebastian Davaris
66ddd32944
Working on MenuPlanController.php
2020-06-29 08:31:36 +02:00
4576140d2f
Merge remote-tracking branch 'origin/master'
2020-06-29 08:31:27 +02:00
Neerholt
a7c3a54778
Data bliver nu vist på edit siden
2020-06-29 08:31:26 +02:00
d33a89757d
Merge remote-tracking branch 'origin/master'
2020-06-29 08:30:48 +02:00
b46f8f7b0a
changed route name and table data to show correct info
2020-06-29 08:30:31 +02:00
Neerholt
7588e05299
Merge remote-tracking branch 'origin/master'
2020-06-29 08:22:15 +02:00
Neerholt
b1ae0f0964
Fix edit siden
2020-06-29 08:22:07 +02:00
8987db9d31
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/resources/views/admin/washing-reservations/index.blade.php
2020-06-29 08:19:55 +02:00
b790d2cf65
Fixes
2020-06-29 08:15:11 +02:00
09040f0a36
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-29 08:14:01 +02:00
0ba866ec29
Fixes
2020-06-29 08:13:53 +02:00
Neerholt
7d13933ea7
Fix route link til edit på menuplan
2020-06-29 08:02:42 +02:00
f517e53557
Merge remote-tracking branch 'origin/master'
2020-06-29 07:54:41 +02:00
578dd8d522
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/app/Http/Controllers/MenuPlanController.php
# skolehjem/resources/views/admin/external-links/index.blade.php
2020-06-26 13:56:47 +02:00
89082b281b
added things to external link views and worked in controller
2020-06-26 13:56:28 +02:00
Sebastian Davaris
b56f3d2a34
Working on MenuPlanController.php
2020-06-26 13:55:04 +02:00
Sebastian Davaris
a84f1729f0
Fixed Vector 0x01
2020-06-26 13:17:18 +02:00
Sebastian Davaris
22c578bc4b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-26 13:14:10 +02:00
Sebastian Davaris
4173986df7
Fixed Routes in base.blade.php
2020-06-26 13:14:02 +02:00
Neerholt
44e70232cd
Kinda Tryna fix
2020-06-26 13:11:24 +02:00
Sebastian Davaris
df8eb6c8cb
Finished calendar.js (for now)
2020-06-26 13:07:57 +02:00
Sebastian Davaris
812ff6e855
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-26 12:51:16 +02:00
Sebastian Davaris
de607a2d3c
Fixed basic calendar functionality
2020-06-26 12:51:05 +02:00
c6282b77d1
Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations
2020-06-26 12:20:20 +02:00
400f2e563f
Removed ID From all admin sites.
...
Added washing-reservations under washing-machines instead of being alone
2020-06-26 12:17:46 +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
8569496d3d
Renamed Booking to Reservationer - Removed reused washing-reservations.index
2020-06-26 09:15:40 +02:00
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
Neerholt
659fe23bb7
Menu plan form fix
2020-06-26 08:20:43 +02:00
Neerholt
c917a26738
Merge remote-tracking branch 'origin/master'
2020-06-26 08:16:05 +02:00
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
Neerholt
47f687d12c
idk kev
2020-06-25 18:43:46 +02:00
Neerholt
bbd9a26b91
Create pages fix
2020-06-25 16:16:08 +02:00
Neerholt
795f7a919b
Fix menu plan index
2020-06-25 15:29:43 +02:00
ec8eba98c8
Fixed Menu Button (Still unnecessary code in resources->js->navmenu->menu.js)
2020-06-25 15:20:42 +02:00
1d08ddbf58
Fixed mistakes
2020-06-25 15:11:59 +02:00
8bda01c1dc
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 15:02:06 +02:00
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
7f083860f1
Fixes
2020-06-25 14:52:04 +02:00
3976d37af2
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 14:24:08 +02:00
9e9f48aca1
Edited frontpage
2020-06-25 14:23:52 +02:00
65ec87af51
Added washing-reservations
2020-06-25 13:30:58 +02:00
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
Sebastian Davaris
3f9eaa7f8d
Working on calendar.js again
2020-06-25 13:20:47 +02:00
1105233f7c
Edited BookingController.php
2020-06-25 13:14:08 +02:00
db3620763f
Merge remote-tracking branch 'origin/master'
2020-06-25 13:02:58 +02:00
103dfa6830
(Maybe) Fixed Menuplans
2020-06-25 13:01:53 +02:00
49d6853170
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 12:50:23 +02:00
635d91915a
Fixes
2020-06-25 12:50:09 +02:00
5b85da54f2
Merge remote-tracking branch 'origin/master'
2020-06-25 12:48:50 +02:00
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
41db59333b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-06-25 12:40:34 +02:00
b54bffb7a8
Updated Controllers
2020-06-25 12:40:26 +02:00
c51f5812e6
Merge remote-tracking branch 'origin/master'
2020-06-25 12:37:41 +02:00
80bf962f38
Le fix is not fix le
2020-06-25 12:37:17 +02:00
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
233a1e6add
Added BookingController.php, uncommented routed code in admin/layout/base.blade.php,
2020-06-25 11:56:38 +02:00
d73e540d09
Merge remote-tracking branch 'origin/master'
2020-06-25 11:20:04 +02:00
b16bb134da
Updated Controllers
2020-06-25 11:19:51 +02:00
10dc32c701
updated menuplan controller
2020-06-25 10:34:10 +02:00
00f798b940
Merge remote-tracking branch 'origin/master'
2020-06-25 09:15:30 +02:00
27b4f48af2
updated controller
2020-06-25 09:15:21 +02:00
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
bf57ec9d99
Added 2 more pages to Menuplans - Edited Href in Menuplans, Users & Washing-Machines
2020-06-25 08:12:53 +02:00
4ed33e4f99
Edited washing-machines, app\root\index & admin\layout\base
2020-06-24 14:19:55 +02:00
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
d4d0615a4e
Merge remote-tracking branch 'origin/master'
2020-06-24 09:26:53 +02:00
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
ccddf4d2f3
fixed wrong migration name of external link
...
fixed wrong path on controller view
2020-06-24 08:53:07 +02:00
6a0a46453f
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/app/Http/Controllers/EventController.php
2020-06-24 08:25:00 +02:00
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
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
a6c20f8ee8
Merge remote-tracking branch 'origin/master'
2020-06-23 12:01:45 +02:00
d5ddc0901c
Created Calender
2020-06-23 12:01:27 +02:00
85989f5b04
added crud external-link blade and added menu plan
2020-06-23 11:59:26 +02:00
dbe6a4dcfe
changed return view to Response::detect on controllers
2020-06-23 08:15:44 +02:00
4ddc765082
Got the mobile route to work
2020-06-23 06:42:43 +02:00
070ff2e3c6
Implemented first mobile detected route:)
2020-06-22 21:08:09 +02:00
f5fd0eb5bd
Added Mobile Detection.
2020-06-22 20:55:40 +02:00
8ac8930844
Merge remote-tracking branch 'origin/master'
2020-06-22 15:28:32 +02:00
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
4a8336e677
Merge remote-tracking branch 'origin/master'
2020-06-22 14:57:21 +02:00
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
fe9a97656f
Updated hrefs
2020-06-17 11:28:48 +02:00
99c2b16752
Changed create.blade.php
2020-06-17 09:08:26 +02:00
7478766927
Created views
2020-06-16 09:06:45 +02:00
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
5ce1e69d65
Fixes
2020-06-15 15:09:13 +02:00
eb2ce43928
Fixes on Menuplan sites
2020-06-15 12:42:09 +02:00
390969cf96
Added Menuplan sites
2020-06-15 12:29:03 +02:00
563f5ac694
Edited read.blade.php
2020-06-15 11:29:38 +02:00
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
e73e2aacdc
Added admin sites
2020-06-15 08:56:21 +02:00
88b7012f69
Merge remote-tracking branch 'origin/master'
2020-06-11 14:54:05 +02:00
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
643ac9e3de
added values to migrations.
2020-06-10 12:29:18 +02:00
2febf83348
Merge remote-tracking branch 'origin/master'
2020-06-10 08:33:15 +02:00
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
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
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
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
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
Anders
frederikpyt
victor
Sebastian Davaris
Vedran Zelen
Neerholt
Sebastian