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
cf957429c3
v0.9.15i - Fixed EN/DK Reservations
2020-08-17 10:27:29 +02:00
e6f03ad72b
v0.9.15h - NameCheck - Fixed Updates
2020-08-17 10:21:02 +02:00
Neerholt
5f516992d7
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-17 09:21:57 +02:00
Neerholt
ea623a72ca
v0.9.15g - NameCheck
2020-08-17 09:21:47 +02:00
4358f272ed
Merge remote-tracking branch 'origin/master'
2020-08-17 08:26:08 +02:00
4b44f24be4
v0.9.15f - Fixed Feedback backend
2020-08-17 08:26:01 +02:00
Neerholt
fce970de65
v0.9.15e - made nameCheck for guides
2020-08-17 08:23:48 +02:00
604d5dad19
v0.9.15d - Fixed bug
2020-08-14 12:10:18 +02:00
7dfcc36d07
v0.9.15c - Delete news when you delete its guide
2020-08-14 12:07:18 +02:00
dccc084dee
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-14 11:22:25 +02:00
Neerholt
a4509fa412
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-14 11:22:59 +02:00
Neerholt
8a71d1d5ae
v0.9.15a - optimized nameCheck
2020-08-14 11:22:51 +02:00
051aceb041
v0.9.15b - Updated the menuplan pdf design
2020-08-14 11:22:18 +02:00
45d1906497
v0.9.14 - Made an `Do you want email` slider on settings site
2020-08-14 10:17:52 +02:00
Neerholt
c37645fe85
v0.9.13b - Made your event taben look better
2020-08-14 09:03:15 +02:00
804a39e2a1
v0.9.13a - Updated .env.example
2020-08-14 07:44:33 +02:00
55eed84b86
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/app/Http/Controllers/EventController.php
2020-08-14 07:39:27 +02:00
9e0f449bd3
v0.9.13 - Added notifications in events, when an event you're signed up to gets canceled.
2020-08-14 07:36:42 +02:00
9232ed99a1
v0.9.12 - Fixed CSS - Started working on wants_email button in account
2020-08-13 15:28:20 +02:00
victor
8bfcfb6441
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-08-13 14:41:19 +02:00
victor
3a78734b7f
v0.9.11 - Check if event name already exist.
2020-08-13 14:41:10 +02:00
bd0d504ab8
v0.9.10 - Added wants_emails
2020-08-13 13:50:00 +02:00
7b52c43a05
v0.9.9a - Fixed order
2020-08-13 12:36:45 +02:00
d64e8fc4b8
v0.9.9 - Added custom 404 page
2020-08-13 12:06:28 +02:00
0e266c2583
v0.9.8 - Fixed participate/stop participating, so that you no longer hard refresh
2020-08-13 11:39:10 +02:00
2c8f947eb4
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-13 10:27:03 +02:00
1f1ea3c832
v0.9.7 - Edited about
2020-08-13 10:26:43 +02:00
Neerholt
f0a11000a6
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-13 10:03:14 +02:00
Neerholt
ea3ddb38a6
v0.9.5 - css stuff compile
2020-08-13 10:02:56 +02:00
a521b5ddea
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-13 09:36:00 +02:00
d969c76dcf
v0.9.6 - Added print icons
2020-08-13 09:35:53 +02:00
Neerholt
58fba39538
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-13 09:20:04 +02:00
Neerholt
9c70a0c4b4
v0.9.5 - Removed images support from pdf menuplan, added dynamic name support for the pdf document
2020-08-13 09:19:44 +02:00
6b9f77e7e7
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-13 09:09:19 +02:00
aef8aa5d2c
v0.9.4 - Added email notification when news gets added
2020-08-13 09:09:11 +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
4a46817265
v0.9.3 - Menuplan pdf converter now supports images download
2020-08-13 08:22:39 +02:00
5c871c3fb7
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/app/Http/Controllers/MenuPlanController.php
2020-08-12 15:28:15 +02:00
fff03fd131
v0.9.2 - Added send notifications
2020-08-12 15:26:32 +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
e06504b5fb
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/resources/lang/dk/msg.php
skolehjem/resources/lang/en/msg.php
2020-08-12 13:10:37 +02:00
4a8b22d6dd
v0.8.5 - Fixed lang and css
2020-08-12 13:09:47 +02:00
Neerholt
6671cd6aa8
v0.8.4b - Made about pages
2020-08-12 13:08:47 +02:00
Neerholt
d016ea6c4c
v0.8.4a - Added last support for images uploade
2020-08-12 12:49:05 +02:00
Neerholt
7784623efe
v0.8.4 - Images gitignore
2020-08-12 12:41:36 +02:00
Neerholt
d0b286c714
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-12 12:28:13 +02:00
Neerholt
e080b69d98
v0.8.3 - Added uploade images function
2020-08-12 12:28:05 +02:00
Neerholt
9c26526740
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-12 11:15:49 +02:00
Neerholt
1c6aa5c398
v0.8.1 - Added uploade images function to menuplan
2020-08-12 11:15:41 +02:00
edbdd7a292
v0.8.2 - Fixed user profile pic upload
2020-08-12 11:15:08 +02:00
37d915a37f
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-12 10:46:45 +02:00
55ab591b4e
v0.8.1 - Started adding user profile pic
2020-08-12 10:46:36 +02:00
fb88bfa4c8
v0.8.0 - Fixed ResourceController.php
2020-08-12 10:44:54 +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
511e0b783f
v0.7.7 - Various fixes
2020-08-11 18:21:51 +02:00
Neerholt
17434eb81d
v0.7.5 - Added helpers to support substr closetag function
2020-08-11 15:30:34 +02:00
2aaadd00b0
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-11 15:08:36 +02:00
Neerholt
ed568d12a8
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-11 15:09:19 +02:00
Neerholt
fc631ef66e
v0.7.5 - Added substr to guide and event
2020-08-11 15:09:11 +02:00
b1b96ad080
v0.7.6 - Added snackbar
2020-08-11 15:08:09 +02:00
1e4d55ef26
v0.7.4 - removed redundant code
2020-08-11 13:45:34 +02:00
e8278b7125
v0.7.3 - It now extends the layout
2020-08-11 13:44:18 +02:00
a9a9d42fb8
v0.7.3 - Major Fixes
2020-08-11 13:16:54 +02:00
80ec936a0c
v0.7.2 - Remember Me
2020-08-11 13:05:30 +02:00
b51704cc26
v0.7.1 - Major css fixes
2020-08-11 12:54:28 +02:00
c2ae6e08c3
v0.7.0 - Settings tab
2020-08-11 12:37:31 +02:00
Neerholt
76e0d7997a
v0.6.2e - Made setting controller. Made on resource controller
2020-08-11 12:26:52 +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
366f66215e
v0.6.2a - Fixed css
2020-08-11 10:16:07 +02:00
6e7cc443b8
v0.6.2a - Fixed css
2020-08-11 10:03:27 +02:00
81af08ef24
v0.6.2 - Fixed various bugs
2020-08-11 09:55:01 +02:00
e5cf13c4c2
v0.6.1 - Fixed env
2020-08-11 09:32:36 +02:00
5137d6da9d
v0.6.1 - Added jquery
2020-08-11 09:27:19 +02:00
e391acf261
v0.6.1 - Added jquery
2020-08-11 09:27:07 +02:00
64c260a63f
v0.6.0 - Darkmode
2020-08-11 09:13:48 +02:00
Neerholt
d071e583f5
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/public/css/webappdark.css
2020-08-11 08:14:15 +02:00
Neerholt
0fbda9e12b
v0.5.18s - bare commit det
2020-08-10 15:28:25 +02:00
1428d88716
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-10 15:20:01 +02:00
3d0afb2d6a
v0.5.18 - Darkmode
2020-08-10 15:19:53 +02:00
Neerholt
ea0d544509
v0.5.17c - Fix small bugs on darkmode
2020-08-10 14:59:22 +02:00
72824d87f2
v0.5.17b - Darkmode
2020-08-10 14:53:49 +02:00
Neerholt
511b4a288b
v0.5.17a - Made darkmode
2020-08-10 14:49:00 +02:00
Neerholt
89f8b2be44
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-10 13:26:56 +02:00
Neerholt
86536ba978
v0.5.17 - Made some small css changes to guides layout
2020-08-10 13:26:48 +02:00
534fbe2efd
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-10 12:44:45 +02:00
2ad27412a3
v0.5.17 - Fixed bugs
2020-08-10 12:44:29 +02:00
Neerholt
c410f3feb6
v0.5.16a - Fixed SSL bug
2020-08-10 12:44:26 +02:00
79d09464f2
v0.5.17 - Fixed bugs
2020-08-10 12:44:20 +02:00
2cc78c5d7c
Merge remote-tracking branch 'origin/master'
2020-08-10 12:29:44 +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
50b495ee01
v0.5.15i - Fixed bugs
2020-08-10 12:14:09 +02:00
bb1aade947
v0.5.15h - Fixed bugs
2020-08-10 12:07:41 +02:00
Neerholt
74767b3336
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-10 12:06:52 +02:00
Neerholt
8dba709ce1
v0.5.15g - added https support
2020-08-10 12:06:44 +02:00
6cabc6250c
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-10 11:47:07 +02:00
d1a2ec8210
v0.5.15f - Fixed small visual bug
2020-08-10 11:46:08 +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
Neerholt
1d8d89d299
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-10 11:06:41 +02:00
Neerholt
9a11e4b52c
v0.5.15b - optimized user search, so it now works like a charm :)
2020-08-10 11:06:27 +02:00
bc6626f997
v0.5.15d - Fixed bug
2020-08-10 10:29:52 +02:00
c077b0e55f
v0.5.15c - Fixed bug
2020-08-10 10:28:40 +02:00
1bea8401b4
v0.5.15b - Fixed bug
2020-08-10 10:21:09 +02:00
Neerholt
3263663f3d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/app/Http/Controllers/EventController.php
2020-08-10 10:17:41 +02:00
Neerholt
b27d05e55c
v0.5.15a - Made read more
2020-08-10 10:16:05 +02:00
fead36dd52
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/resources/views/app/news/index.blade.php
2020-08-10 09:39:12 +02:00
bd7800f5a0
v0.5.15 - Added subname to news
2020-08-10 09:37:19 +02:00
Neerholt
a011df41ee
v0.5.14c - Fixed middelware typo
2020-08-10 09:18:00 +02:00
Neerholt
2db8032635
v0.5.14c - Fixed route error when you clicked on participate
2020-08-10 09:17:21 +02:00
Neerholt
9c0f46e665
v0.5.14b - index event fix
2020-08-10 09:08:48 +02:00
Neerholt
15962e4114
v0.5.14b -Added Css
2020-08-10 09:05:53 +02:00
Neerholt
9841cbd24e
v0.5.14a -Made cookies more oo oriented
2020-08-08 23:51:24 +02:00
Neerholt
a97cd7cda5
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-07 14:25:08 +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
Neerholt
0cea9e50c1
v0.5.14 -Added see participant to events taben it self
2020-08-07 13:50:26 +02:00
9d6fc22b0f
v0.5.13 - Added signups.blade.php to see who have joined an event + en/dk versions
2020-08-07 13:31:09 +02:00
8388fecfb6
v0.5.12b - Fixed description of events (string to longText)
2020-08-07 13:00:37 +02:00
d921803dfd
v0.5.12a - Fixed store of event
2020-08-07 12:59:21 +02:00
Neerholt
376f37da8c
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-07 12:48:15 +02:00
Neerholt
04c280e602
v0.5.12 - Add read more to guides, and made specific pages to read a specific guide
2020-08-07 12:48:08 +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
c02c1aacd3
v0.5.8b - Fix
2020-08-07 10:36:08 +02:00
f7941841fe
v0.5.8a - Fix
2020-08-07 10:25:46 +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
b5fb505eaa
Merge pull request #3 from sebathefox/Multi-language
...
v.0.5.8 - Multi language
2020-08-07 08:53:29 +02:00
Neerholt
60391793fc
v0.5.7b - Added middelware
2020-08-07 08:52:01 +02:00
Neerholt
e5e057a51a
v0.5.7a - Added middelware
2020-08-07 08:51:05 +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
Neerholt
23929310f7
v0.5.7 - Add the last support for english
2020-08-06 20:33:46 +02:00
Neerholt
f96d23814b
v0.5.7 - Add msg English and msg Danish
2020-08-06 15:32:21 +02:00
Neerholt
7cc871ae90
v0.5.7 - Made multi language option
2020-08-06 15:31:38 +02:00
6e2ffa8de4
v0.5.6a - Fixed description when seeing your events
2020-08-06 14:50:07 +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
c472ae80fa
v0.5.5B - Change app home page to news page
2020-08-06 14:30:18 +02:00
4c2fc5f5f0
v0.5.5A - Small fixes
2020-08-06 13:35:07 +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
358e47b703
v0.5.3A - Added permission requirements to GuideController.php
2020-08-06 08:44:21 +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
7ea2208b4a
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-05 14:59:59 +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
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
76bea82eea
v0.5.1 - Made contact phone number optional and updated data in seeders.
2020-08-05 13:29:45 +02:00
121476de60
Fixed title
2020-08-05 11:14:30 +02:00
21f3832564
Fixed title
2020-08-05 11:11:45 +02:00
7d5273be8d
Fixed Images
2020-08-05 10:34:21 +02:00
eab59b8ff3
Merge remote-tracking branch 'origin/master'
2020-08-05 10:27:31 +02:00
c347e618fa
Fixed Layout
2020-08-05 10:27:07 +02:00
Neerholt
5fa22d748a
phone number and admin name
2020-08-05 10:22:10 +02:00
5f08267ec5
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-08-05 10:12:12 +02:00
5f7c91a507
Added error msg
2020-08-05 10:12:05 +02:00
02b6684030
Added - Deleting Washing Reservations when deleting a washing machine
2020-08-05 10:11:28 +02:00
d43ccb2a78
Merge remote-tracking branch 'origin/master'
2020-08-05 09:43:59 +02:00
f988967c22
Guides - Fixed
...
Contact - Added phonetimes
2020-08-05 09:43:53 +02:00
0539e5c666
Created seeder for contacts
2020-08-05 09:43:39 +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
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
ee3caae76a
Fixes
2020-08-05 09:15:50 +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
d4e439a39b
Fixed css
2020-08-05 08:45:29 +02:00
d5004405bc
Fixed href
2020-08-05 08:40:19 +02:00
b4634d4933
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/resources/views/app/layout/base.blade.php
2020-08-05 08:34:23 +02:00
5120adebc0
Fixed links CSS
2020-08-05 08:32:27 +02:00
4ed1d18392
Fixed month
2020-08-05 08:27:33 +02:00
182b33fbaf
Added href
2020-08-05 08:14:03 +02:00
072c5c65ab
Fixes and todo's
2020-08-05 08:10:38 +02:00
286b78865b
Fixed css and added no guides text
2020-08-05 07:51:30 +02:00
c04f26eaa7
fixes
2020-08-04 17:45:10 +02:00
4d7acfa6bd
fixes
2020-08-04 17:06:46 +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
1011165ca0
fixes
2020-08-04 16:50:08 +02:00
5aa1995cb8
fixes
2020-08-04 16:35:38 +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
d15f406059
Fail message when making a reservation with taken machine and time
2020-08-04 15:09:10 +02:00
2a3a728fa3
fixes
2020-08-04 14:27:11 +02:00
9d52e2e621
fixes
2020-08-04 14:23:07 +02:00
5973b94247
Merge remote-tracking branch 'origin/master'
2020-08-04 14:11:33 +02:00
66f7e3b86b
fixes
2020-08-04 14:11:05 +02:00
c8b85a6c9b
fixed guide_article
2020-08-04 13:37:06 +02:00
9ed3faedfe
fixed table name guideArticles -> guide_articles
2020-08-04 13:35:16 +02:00
f5a0174939
Merge remote-tracking branch 'origin/master'
2020-08-04 13:23:42 +02:00
694bd35b33
Implemented forgot password
2020-08-04 13:21:56 +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
408eb7090b
Fixed CSS
2020-08-04 10:40:01 +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
e8de894ae7
Merge remote-tracking branch 'origin/master'
2020-08-04 08:05:07 +02:00
f551d4c59f
Changed session messages on fail or success
2020-08-04 08:04:54 +02:00
84a1045747
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-08-03 15:02:36 +02:00
4fe015a74c
Fix
2020-08-03 15:02:26 +02:00
20d73c047f
Fixed date and stuff
2020-08-03 14:47:06 +02:00
0e9c054a12
Fix
2020-08-03 14:27:40 +02:00
898228637c
Fix
2020-08-03 14:26:58 +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
Neerholt
679de4872d
fixed
2020-08-03 13:14:58 +02:00
a66b7aad92
Fixes
2020-08-03 12:57:14 +02:00
7abfbe27b2
Merge remote-tracking branch 'origin/master'
2020-08-03 11:17:47 +02:00
11e3958f0a
Added - orderBy to own events & own reservations
...
Fixed - confirm message when deleting events
2020-08-03 11:17:36 +02:00
5ad6fb129b
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-08-03 10:48:24 +02:00
91f51d0689
Fixed css
2020-08-03 10:48:17 +02:00
90b58a8586
Fixed - Redirect in Event controler
...
Fixed - orderBy function when searching, in Event & Feedback
2020-08-03 10:46:48 +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
93198e5a54
Fixed css
2020-08-03 09:53:57 +02:00
c2a90c69f9
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/resources/views/app/users/editpass.blade.php
2020-08-03 09:43:51 +02:00
f2895a00e3
Started working on a better see password button
2020-08-03 09:42:17 +02:00
09fa8ce007
Fixed permissions
2020-08-03 09:39:32 +02:00
52f71abdd5
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-08-03 09:09:53 +02:00
b0b2a7b4f0
Fixed css
2020-08-03 09:09:46 +02:00
5f6546e399
Merge remote-tracking branch 'origin/master'
2020-08-03 08:54:35 +02:00
1d63879117
Added "orderBy" function to event and feedback.
2020-08-03 08:46:38 +02:00
073938a469
Fixed css
2020-08-03 08:45:45 +02:00
f14dc22d92
Fixed permissions, seeders and security
2020-08-03 08:35:20 +02:00
27fd564e9f
Fixed permissions, seeders and security
2020-08-03 08:33:11 +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
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
38f8bfa0c9
Fixed bugs
2020-07-30 15:25:37 +02:00
ab12a46943
Fixed bugs
2020-07-30 14:52:40 +02:00
0e77da93b2
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-30 14:51:50 +02:00
6a3068c95c
Fixed bugs
2020-07-30 14:51:43 +02:00
991db2bab0
Fixed bugs
2020-07-30 14:51:23 +02:00
e599d09aa7
Correct route to feedbacks x2
2020-07-30 14:51:03 +02:00
986a62009d
Correct route to feedbacks
2020-07-30 14:47:22 +02:00
6f11313362
Updated Seeders
2020-07-30 14:43:14 +02:00
264c44529a
Updated Seeders
2020-07-30 14:38:32 +02:00
666e8cb7f3
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-30 12:28:11 +02:00
be575a9515
Updated Seeders
2020-07-30 12:28:05 +02:00
f4ba4f6c45
Edited text
2020-07-30 12:20:52 +02:00
Neerholt
bad88a5e51
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-30 11:03:11 +02:00
Neerholt
7830e31b21
Roles are now searchable
2020-07-30 11:02:41 +02:00
b4f3be91e2
Link on front page are now centered
2020-07-30 10:34:00 +02:00
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
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
Neerholt
84b71731d9
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-30 09:17:37 +02:00
Neerholt
62d73d0894
Vaskemaskine search er kogt
2020-07-30 09:17:27 +02:00
0ab41524c6
Added an account page for admin site
2020-07-30 08:42:01 +02:00
4a1002edf3
Added more svg icons to the hamburger menu
2020-07-30 08:41:09 +02:00
9a6e1c4c4c
Fixed bug
2020-07-30 08:20:30 +02:00
7f8b6a3222
Merge remote-tracking branch 'origin/master'
2020-07-29 15:28:28 +02:00
d0c8adf7f4
Added store, update, edit to UserEventController.php
2020-07-29 15:28:21 +02:00
victor
d5ee1a2146
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-29 15:27:18 +02:00
victor
4826725e07
Made washing-reservations search
2020-07-29 15:27:07 +02:00
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
d6fc1b63b0
Fixed bug
2020-07-29 14:50:09 +02:00
30fb3b3cc0
Fixed bug
2020-07-29 14:36:11 +02:00
victor
0dd262d50c
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-29 13:59:59 +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
victor
a779b7325d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-29 13:33:20 +02:00
victor
7da57d5e18
Search
2020-07-29 13:33:11 +02:00
579a34355d
Fixed RoleSeeder.php
2020-07-29 13:28:25 +02:00
ef8d1626ec
Fixed RoleSeeder.php
2020-07-29 13:21:51 +02:00
556c0e1ba2
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-29 12:30:12 +02:00
9a1ca59e5b
Permission fixes
2020-07-29 12:30:05 +02:00
bc2323b915
Removed @extends("app.layout.header") from a few blade.php files in app
2020-07-29 12:25:36 +02:00
a5cb2e2cde
Permission fixes
2020-07-29 12:18:08 +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
6a4cdbfb17
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-29 09:50:04 +02:00
victor
26c28d8e54
Made filter search
2020-07-29 09:49:54 +02:00
fc0f97b04e
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-28 15:13:43 +02:00
b4f9065d79
Fixes
2020-07-28 15:13:33 +02:00
606e13560b
Washing Reservation create
2020-07-28 15:03:17 +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
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
Neerholt
Anders
frederikpyt
Neerholt
Sebastian Davaris
Vedran Zelen