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

137 Commits

Author SHA1 Message Date
frederikpyt f7941841fe v0.5.8a - Fix 2020-08-07 10:25:46 +02:00
frederikpyt 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
frederikpyt 246004ebfd v0.5.8 - Added create news option on guide and event create/edit 2020-08-07 09:47:23 +02:00
Neerholt b5fb505eaa
Merge pull request #3 from sebathefox/Multi-language 
v.0.5.8 - Multi language
 2020-08-07 08:53:29 +02:00
Neerholt e5e057a51a v0.5.7a - Added middelware 2020-08-07 08:51:05 +02:00
Anders 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 7cc871ae90 v0.5.7 - Made multi language option 2020-08-06 15:31:38 +02:00
Anders 6e2ffa8de4 v0.5.6a - Fixed description when seeing your events 2020-08-06 14:50:07 +02:00
Anders 1b7738fd09 Merge remote-tracking branch 'origin/master' 2020-08-06 14:47:28 +02:00
Anders 708313a4b3 v0.5.6 - Fixed Guide when destroying. 
Added accountable in Event table to see who is the accountable for the event. Changed description field to CKEditor
 2020-08-06 14:47:22 +02:00
frederikpyt c472ae80fa v0.5.5B - Change app home page to news page 2020-08-06 14:30:18 +02:00
frederikpyt ab4275dc33 v0.5.4C - Added a back button on forgot password 2020-08-06 11:17:55 +02:00
frederikpyt 4b0ad949ba v0.5.4 - Created the "reservations in location" screen and added a location option when creating reservations. 2020-08-06 10:32:34 +02:00
frederikpyt 9b631843b0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/database/seeds/ContactSeeder.php
 2020-08-05 13:30:32 +02:00
frederikpyt 76bea82eea v0.5.1 - Made contact phone number optional and updated data in seeders. 2020-08-05 13:29:45 +02:00
Anders eab59b8ff3 Merge remote-tracking branch 'origin/master' 2020-08-05 10:27:31 +02:00
Anders c347e618fa Fixed Layout 2020-08-05 10:27:07 +02:00
frederikpyt 5f7c91a507 Added error msg 2020-08-05 10:12:05 +02:00
Anders f988967c22 Guides - Fixed 
Contact - Added phonetimes
 2020-08-05 09:43:53 +02:00
Anders 91f7a4aa05 Merge remote-tracking branch 'origin/master' 2020-08-05 09:24:08 +02:00
Anders a78e7d90f6 Fixed - Guides 
Added - contacts visual (controller coming soon)
 2020-08-05 09:23:57 +02:00
frederikpyt 07fa636a2e Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/resources/views/app/layout/base.blade.php
 2020-08-05 09:17:44 +02:00
Neerholt 90a36d85b9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 
 Conflicts:
	skolehjem/resources/views/app/users/index.blade.php
 2020-08-05 09:14:28 +02:00
Neerholt fbaed9bedd Deleted media links on home pages 2020-08-05 09:12:58 +02:00
frederikpyt d5004405bc Fixed href 2020-08-05 08:40:19 +02:00
Anders b4634d4933 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	skolehjem/resources/views/app/layout/base.blade.php
 2020-08-05 08:34:23 +02:00
Anders 5120adebc0 Fixed links CSS 2020-08-05 08:32:27 +02:00
frederikpyt 4ed1d18392 Fixed month 2020-08-05 08:27:33 +02:00
frederikpyt 182b33fbaf Added href 2020-08-05 08:14:03 +02:00
frederikpyt 286b78865b Fixed css and added no guides text 2020-08-05 07:51:30 +02:00
frederikpyt 4d7acfa6bd fixes 2020-08-04 17:06:46 +02:00
frederikpyt 64d1f785f9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 
 Conflicts:
	skolehjem/app/Http/Controllers/WashingReservationController.php
 2020-08-04 16:52:42 +02:00
frederikpyt 1011165ca0 fixes 2020-08-04 16:50:08 +02:00
frederikpyt 5aa1995cb8 fixes 2020-08-04 16:35:38 +02:00
frederikpyt 50d8079da2 fixes 2020-08-04 15:29:21 +02:00
Anders d15f406059 Fail message when making a reservation with taken machine and time 2020-08-04 15:09:10 +02:00
Anders c8b85a6c9b fixed guide_article 2020-08-04 13:37:06 +02:00
Neerholt 210aa00fc6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-04 13:21:39 +02:00
Neerholt c223cb967c Made it so they can now make there own dynamic guide 2020-08-04 13:21:23 +02:00
Anders 408eb7090b Fixed CSS 2020-08-04 10:40:01 +02:00
Anders e8de894ae7 Merge remote-tracking branch 'origin/master' 2020-08-04 08:05:07 +02:00
Anders f551d4c59f Changed session messages on fail or success 2020-08-04 08:04:54 +02:00
frederikpyt 84a1045747 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-08-03 15:02:36 +02:00
frederikpyt 4fe015a74c Fix 2020-08-03 15:02:26 +02:00
Anders 20d73c047f Fixed date and stuff 2020-08-03 14:47:06 +02:00
frederikpyt a66b7aad92 Fixes 2020-08-03 12:57:14 +02:00
Anders 11e3958f0a Added - orderBy to own events & own reservations 
Fixed - confirm message when deleting events
 2020-08-03 11:17:36 +02:00
Anders b4263d8891 Fixed - Password & Confirm Password in create user now need to be the same. 
Added new "see password" function on all password sites.
Fixed bugs
 2020-08-03 10:36:57 +02:00
frederikpyt 93198e5a54 Fixed css 2020-08-03 09:53:57 +02:00