Neerholt
f403c464c7
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-20 14:59:31 +02:00
Neerholt
89276c5af1
v0.10.11a - Made hide filter, filter washing machine search semi done, and texts fixs
2020-08-20 14:59:22 +02:00
ab5a6206ce
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-20 14:56:18 +02:00
c0d336a8e0
v0.10.11 - Collapse-able admin menu
2020-08-20 14:56:11 +02:00
a145c88e2c
v0.10.10f - You can no longer see your own reservations if they're an hour past due (Samt with admin)
2020-08-20 12:18:30 +02:00
Neerholt
0516acba78
v0.10.10e - Made a hide show filter button, not done but works, css fix tomorrow
2020-08-19 15:30:39 +02:00
3f2dcf1a0c
v0.10.10a - Added Quill.js & Quill.snow.css to our own files, instead of calling it. - Removed uneccesary quill.snow.css in menuplan
2020-08-19 10:35:44 +02:00
82ac44133b
v0.10.8 - Added - You can only see washingreservations for the day, and are maximum an hour after 'time' in column - Reloads the page after every 5 minutes (This needs a fix)
2020-08-19 09:01:21 +02:00
52b42124a1
v0.10.6 - Uniformily changed the event name
2020-08-18 19:09:40 +02:00
19b1176718
v0.10.5b - Added Date to feedbacks.index
2020-08-18 13:01:39 +02:00
1e405d9f3c
v0.10.3 - Added user "X X" to seeder, and fixed analytics
2020-08-18 08:35:53 +02:00
55153521b4
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-18 08:19:20 +02:00
44ade93240
v0.10.3 - Fixed darkmode css on app/washing-reservations/create.blade.php. Fixed frontend file upload valdiation. Fixed analytics
2020-08-18 08:19:14 +02:00
e6e0e3c95d
v0.10.2 - Full functioning AJAX check submit code on User controller create & edit
...
- Plus all other pages where you create or update something of an unique value
2020-08-18 08:16:25 +02:00
c08933ba9b
v0.10.1b - Added error message when creating a user with a difference in `Adgangskode` & `Bekræft Adgangskode`
...
Removed old error messages
2020-08-17 15:25:26 +02:00
58c6d08ca2
Merge remote-tracking branch 'origin/master'
2020-08-17 15:10:52 +02:00
d19b9c1d1a
v0.10.1a - Added AJAX check on update WashingMachine
...
Added AJAX check on create (missing on update) UserController - Only checks when submitting
2020-08-17 15:10:44 +02:00
4a72493f9b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-17 15:06:55 +02:00
983b02e00e
v0.10.1 - Added location on washing_reservations and created a WashingMachineSeeder.php
2020-08-17 15:06:48 +02:00
Neerholt
e6fbafb011
v0.10.0i - :(
2020-08-17 15:06:35 +02:00
Neerholt
d4bc3f5520
v0.10.0g - Fixed stuff :)
2020-08-17 14:24:27 +02:00
Neerholt
25f1dc80d4
v0.10.0f - Fixed a route error on main index pages, when you clicked on see participants
2020-08-17 13:52:51 +02:00
Neerholt
7f42423599
v0.10.0e - Made some css fix to the main index dashboard pages
2020-08-17 13:22:08 +02:00
Neerholt
8bba60fa5a
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-17 12:24:49 +02:00
Neerholt
9db169aadb
v0.10.0d - Rolled back menuplan to old system layout and functionality
2020-08-17 12:24:43 +02:00
5ac480454a
v0.10.0c - Fixed WashingMachine create & update AJAX
2020-08-17 11:07:26 +02:00
3bde377caa
v0.10.0b - Fixed Location update AJAX
...
Added - You are now able to delete a location
2020-08-17 10:43:52 +02:00
Neerholt
773655c294
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-17 10:31:41 +02:00
Neerholt
fe9eb4fd4d
v0.10.0a - Added last support for NameCheck
2020-08-17 10:31:33 +02:00
e82c793820
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-17 10:29:02 +02:00
9596a426fa
v0.10.0 - Added admin dashboard
2020-08-17 10:28:54 +02:00
e6f03ad72b
v0.9.15h - NameCheck - Fixed Updates
2020-08-17 10:21:02 +02:00
Neerholt
ea623a72ca
v0.9.15g - NameCheck
2020-08-17 09:21:47 +02:00
Neerholt
fce970de65
v0.9.15e - made nameCheck for guides
2020-08-17 08:23:48 +02:00
Neerholt
8a71d1d5ae
v0.9.15a - optimized nameCheck
2020-08-14 11:22:51 +02:00
victor
3a78734b7f
v0.9.11 - Check if event name already exist.
2020-08-13 14:41:10 +02:00
d969c76dcf
v0.9.6 - Added print icons
2020-08-13 09:35:53 +02:00
0300a6a76b
v0.9.4 - Added remove function to feedback admin page
...
Added - You can now see if you're participating an event on event.index and yourevents.blade.php
Fixed `Tilbage` buttons
2020-08-13 09:08:34 +02:00
Neerholt
0886c8f583
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-12 15:25:36 +02:00
Neerholt
c84d2a3d73
v0.9.1 - You can now convert menuplan to pdf
2020-08-12 15:25:29 +02:00
2cbb517ef1
v0.9.0 - Added individual `Read more` buttons on news.index
...
Added NewsType - To see if it's a news, menu, guide or event
Added type column to News type_id & arrangement_id (Both needed to see what type (menu,guide,news,event) and arrangement(The individual types ID))
Added NewsTypeSeeder.php
Fixed CSS
Added & Fixed messages en/dk
Fixed Editors
Added routing when removing yourself from an event, on events.index
2020-08-12 15:17:48 +02:00
Neerholt
d016ea6c4c
v0.8.4a - Added last support for images uploade
2020-08-12 12:49:05 +02:00
Neerholt
e080b69d98
v0.8.3 - Added uploade images function
2020-08-12 12:28:05 +02:00
Neerholt
1c6aa5c398
v0.8.1 - Added uploade images function to menuplan
2020-08-12 11:15:41 +02:00
746926d439
v0.7.8 - Added Quill Editor to all sites - Fixed Event name/subname showance in news.index
2020-08-12 08:42:58 +02:00
Neerholt
2ae0c1661c
v0.6.2d - Added are you sure you want to leave alert if you have unsaved data on a pages
2020-08-11 10:54:01 +02:00
Neerholt
a223d5484e
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-11 10:40:08 +02:00
Neerholt
37b53a5480
v0.6.2c
2020-08-11 10:39:22 +02:00
14fb54c5df
v0.6.2b - Are you sure
2020-08-11 10:38:49 +02:00
e391acf261
v0.6.1 - Added jquery
2020-08-11 09:27:07 +02:00
2e187524bf
v0.5.16 - Fixed Cookie Problem on controllers. Added quill editor on event. Added message in msg.php en/dk
2020-08-10 12:29:38 +02:00
Neerholt
332fdc3347
v0.5.15e - Removed search function from menuplan and fix some css on event search
2020-08-10 11:45:58 +02:00
726cb52aee
v0.5.14 - Fixed signups on event. Added en/dk versions. Added TinyMCEditor on events create/edit. Removed menuplans monday-thursday
2020-08-07 14:11:13 +02:00
9a6d1b64c1
v0.5.11 - Changed CKEditor to TinyMCEditor / Removed Monday-Thursday in menu_plans and added a TinyMCEditor instead.
2020-08-07 12:20:15 +02:00
c268440021
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-08-07 10:59:02 +02:00
b0eda7f8e7
v0.5.10 - Added support for menuplan as news creation
2020-08-07 10:58:50 +02:00
e0b998dec0
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/app/Http/Controllers/UserEventController.php
2020-08-07 10:52:25 +02:00
a23337b9d4
v0.5.9 - Fixed en/dk messages + added backend en/dk messages
2020-08-07 10:51:10 +02:00
4c2b58f33b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
...
Conflicts:
skolehjem/resources/views/admin/events/create.blade.php
2020-08-07 09:49:31 +02:00
246004ebfd
v0.5.8 - Added create news option on guide and event create/edit
2020-08-07 09:47:23 +02:00
76e3638706
v0.5.6b - Added error messages when loggin in with wrong credentials, when changing password and when logging out - Admin & User
2020-08-07 08:35:23 +02:00
1b7738fd09
Merge remote-tracking branch 'origin/master'
2020-08-06 14:47:28 +02:00
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
3e4e6e71ab
v0.5.5 - Added news on the admin panel
2020-08-06 12:21:19 +02:00
ab4275dc33
v0.5.4C - Added a back button on forgot password
2020-08-06 11:17:55 +02:00
c56fb6a96d
v0.5.4B - Fixed some css
2020-08-06 10:57:18 +02:00
2d9bd2e11c
v0.5.4A - Added a no reservations message on "reservations in location" page
2020-08-06 10:49:16 +02:00
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
f4a277185d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-08-06 08:37:28 +02:00
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
76bea82eea
v0.5.1 - Made contact phone number optional and updated data in seeders.
2020-08-05 13:29:45 +02:00
f988967c22
Guides - Fixed
...
Contact - Added phonetimes
2020-08-05 09:43:53 +02:00
91f7a4aa05
Merge remote-tracking branch 'origin/master'
2020-08-05 09:24:08 +02:00
a78e7d90f6
Fixed - Guides
...
Added - contacts visual (controller coming soon)
2020-08-05 09:23:57 +02:00
d4e439a39b
Fixed css
2020-08-05 08:45:29 +02:00
072c5c65ab
Fixes and todo's
2020-08-05 08:10:38 +02:00
c04f26eaa7
fixes
2020-08-04 17:45:10 +02:00
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
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
0e72166ac4
Removed External Links
2020-08-04 15:20:56 +02:00
c8b85a6c9b
fixed guide_article
2020-08-04 13:37:06 +02:00
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
d818d15b85
Implemented forgot password
2020-08-04 10:59:45 +02:00
9d44432fc2
Session message on fail - Menuplans
2020-08-04 10:11:18 +02:00
2edfd71de9
Session message on fail - Users / Roles / Events
2020-08-04 09:34:56 +02:00
b59189eac0
Session message on fail - Washing machine
2020-08-04 08:31:14 +02:00
20d73c047f
Fixed date and stuff
2020-08-03 14:47:06 +02:00
ae14081221
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-08-03 13:50:34 +02:00
093a944980
Fix
2020-08-03 13:50:27 +02:00
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
a66b7aad92
Fixes
2020-08-03 12:57:14 +02:00
ffb347b51d
Merge remote-tracking branch 'origin/master'
2020-08-03 10:37:04 +02:00
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
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
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
38f8bfa0c9
Fixed bugs
2020-07-30 15:25:37 +02:00
cf4559874a
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-30 10:12:00 +02:00
06346d9675
Fixed css and created the washing reservation index for app
2020-07-30 10:11:52 +02:00
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
13c2e56e34
Filter search css
2020-07-29 13:58:19 +02:00
657acbd6eb
Added User on washing reservation show
2020-07-29 13:43:18 +02:00
faec1f66c5
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-29 11:53:46 +02:00
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
fd3f2de668
Merge remote-tracking branch 'origin/master'
2020-07-28 14:54:26 +02:00
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
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
8d8b5491c9
Removed unused/commented code
2020-07-28 10:17:00 +02:00
victor
9a5be4e280
Name fix for contact
2020-07-28 09:23:28 +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
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
victor
2dd20ac85a
Semi fix live search
2020-07-27 13:07:19 +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
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
9d757dc536
Fixed washing machine reservation, creation, edit and deletion
2020-07-01 11:38:09 +02:00
2846dac2dc
Fixed Washing machine creation and editing
2020-07-01 10:30:28 +02:00
6ecc96ef55
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-01 09:50:36 +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
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
3aee5515b1
Added confirmation to row deletion
2020-06-30 14:09:11 +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
dfd8420270
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/app/MenuPlan.php
2020-06-30 12:40:02 +02:00
Neerholt
frederikpyt
Anders
Neerholt
Sebastian Davaris
Vedde