Commit Graph

896 Commits

Author SHA1 Message Date
Anders d4ac70de70 v0.12.0 - Fixed pagination
Fixed RolesController.php - Changes "User" to "Bruger"
Added æøåÆØÅ to roles pattern
Fixed bugs/mistakes
2020-09-07 12:44:24 +02:00
Anders 02527035c9 v0.11.4a - Removed unused script 2020-09-07 09:54:14 +02:00
Anders 976f1b5bf0 v0.11.4 - Added AJAX onclick function to users.edit (Now it checks if email & phone number already exists) 2020-09-07 09:53:15 +02:00
Anders 5f234d95dc v0.11.3 - Fixed roles
Added pattern to passwords
2020-09-07 08:33:46 +02:00
Neerholt 84f5c51c48 v0.11.2b - Made a support user account 2020-09-07 08:28:49 +02:00
Neerholt b62582e039 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-09-03 08:31:42 +02:00
Neerholt ed51bb99fa v0.11.2a - Fixed pagination, made a create user 2020-09-03 08:31:31 +02:00
frederikpyt b4d80ac76f v0.11.2 - Added autoscroll 2020-09-02 15:19:18 +02:00
frederikpyt ebd80a31b8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-09-02 15:11:07 +02:00
frederikpyt 4811c5f7af v0.11.1f - Fixed css 2020-09-02 15:10:58 +02:00
Anders 842933f4df v0.11.1e - Fixed roles.create/edit - Added comment to users.create (To add a pattern later) 2020-09-02 13:31:56 +02:00
Anders 821428c150 v0.11.1d - Fixed WashingReservation 2020-09-02 13:15:11 +02:00
Anders 2f5a03343a Merge remote-tracking branch 'origin/master' 2020-09-02 12:32:36 +02:00
Anders ff7cb033d5 v0.11.1c - Fixed CSS & HTML 2020-09-02 12:32:30 +02:00
frederikpyt 211a68c81b v0.11.1b - Fixed 2020-09-02 12:31:44 +02:00
frederikpyt f2500730ec v0.11.1a - Maybe fix? 2020-09-02 12:20:49 +02:00
frederikpyt 4a64d49902 v0.11.1 - Fixed roles and permissions 2020-09-02 11:40:36 +02:00
Anders d7bfdaebf6 v0.11.0 - You can now edit roles
Fixed minor details
2020-09-02 08:56:02 +02:00
Anders ca855f3349 v0.10.20d - Fixed RootController.php 2020-08-31 15:26:25 +02:00
Anders 25c279653b v0.10.20c - Changed type_id to type on news.index, so it's no longer a number 2020-08-31 14:54:25 +02:00
frederikpyt 101be37dfe Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/resources/views/app/news/index.blade.php
2020-08-31 14:44:15 +02:00
frederikpyt 34b078b21a v0.10.20b - Darkmode fixes 2020-08-31 14:41:44 +02:00
Anders 9b26e5f1af Merge remote-tracking branch 'origin/master'
# Conflicts:
#	skolehjem/app/Http/Controllers/RootController.php
#	skolehjem/resources/views/app/news/index.blade.php
2020-08-31 14:35:03 +02:00
Anders cf1baac983 v0.10.20a - Changed type_id to type on news.index, so it's no longer a number 2020-08-31 14:31:56 +02:00
Neerholt efb2840ff0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/app/Http/Controllers/RootController.php
2020-08-31 14:29:24 +02:00
Neerholt 20aa9c52af v0.10.20 - Made some small design changes to home pages 2020-08-31 14:28:15 +02:00
Anders bccd00683f v0.10.19 - Added building name to reservation site
Fixed $eventsToDelete in EventController.php
2020-08-31 14:04:02 +02:00
frederikpyt a6ffea7016 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-31 13:20:57 +02:00
frederikpyt f29fe0180a v0.10.18a - Various fixes 2020-08-31 13:20:49 +02:00
Anders b6f4fdb138 v0.10.18 - When deleting a menu, guide or event - The news according to the menu,guide or event will also get deleted (correctly now) 2020-08-31 12:48:59 +02:00
frederikpyt 56cdd63fbb Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-31 11:56:17 +02:00
frederikpyt 34e123ee19 v0.10.17a - Various fixes 2020-08-31 11:56:05 +02:00
Anders 10bd0c021c Merge remote-tracking branch 'origin/master' 2020-08-31 10:57:31 +02:00
Anders 7b157fcd90 v0.10.17 - Added permission check (create/edit/delete) on all admin sites 2020-08-31 10:57:26 +02:00
frederikpyt 59bd705d89 v0.10.16a - Various fixes 2020-08-31 10:15:12 +02:00
frederikpyt 0418805b7c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/database/seeds/RoleSeeder.php
2020-08-31 09:38:20 +02:00
frederikpyt c6c54996b5 v0.10.16 - Various fixes 2020-08-31 09:36:10 +02:00
Neerholt 3856541790 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/database/seeds/RoleSeeder.php
2020-08-31 09:16:04 +02:00
Neerholt e36ddf78f8 v0.10.15r - Remove ExternalLink 2020-08-31 09:14:20 +02:00
frederikpyt d8a754d398 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-31 08:16:36 +02:00
frederikpyt 08362b24cb v0.10.15q - Various fixes 2020-08-31 08:16:26 +02:00
Anders 1dafdfe052 Merge remote-tracking branch 'origin/master' 2020-08-28 12:54:49 +02:00
Anders c86b8eba03 v0.10.15p - Fixed 'msg.telefontid' 2020-08-28 12:54:39 +02:00
Neerholt 7d4bd47ab8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-28 08:28:44 +02:00
Neerholt 3235cea505 v0.10.15o - Permissions semi works 2020-08-28 08:28:32 +02:00
Anders e0af87ba97 v0.10.15n - Added a functional Full Control button to roles.create 2020-08-28 08:26:32 +02:00
Neerholt b6d819e5f8 v0.10.15m - added the last value to roles permissions 2020-08-27 16:40:46 +02:00
Neerholt 4beadfb223 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-27 15:30:26 +02:00
Neerholt a766bfea95 v0.10.15l - Made role permissions semi done, sometimes it works sometimes it doesn't, it needs some touch up 2020-08-27 15:29:59 +02:00
frederikpyt 78794074b2 v0.10.15k - Fixed admin access 2020-08-27 13:59:11 +02:00