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 |
|
frederikpyt
|
033d8f7c15
|
v0.10.15j - Fixed admin access
|
2020-08-27 12:46:07 +02:00 |
|
frederikpyt
|
fc91a2f06b
|
v0.10.15i - Fixed admin access
|
2020-08-27 11:12:43 +02:00 |
|
frederikpyt
|
c0669d6eda
|
v0.10.15h - Fixed admin access
|
2020-08-27 10:59:19 +02:00 |
|
Neerholt
|
5766770a4b
|
v0.10.15g - Added roles permissions selection, semi done
|
2020-08-27 10:20:48 +02:00 |
|
Anders
|
7b2d6fcf60
|
Merge remote-tracking branch 'origin/master'
|
2020-08-26 10:49:19 +02:00 |
|
Anders
|
b72ca3fbde
|
v0.10.15f - Added video to guides (Still in need of <iframe></iframe> to be removed on news site)
|
2020-08-26 10:49:11 +02:00 |
|
Neerholt
|
a9608bdf3a
|
v0.10.15e - Administration can now changes a users profile images
|
2020-08-26 08:56:18 +02:00 |
|
Anders
|
f33cf609da
|
v0.10.15d - Changed remember password to remember me
Added pattern to user edit on admin site
|
2020-08-25 15:08:54 +02:00 |
|
Anders
|
0bd324e996
|
Merge remote-tracking branch 'origin/master'
|
2020-08-25 14:48:58 +02:00 |
|
Anders
|
3b6b20f934
|
v0.10.15c - Changed error message when changing password (removed quotes). Added placeholder to email & phone number + added pattern to phone number
|
2020-08-25 14:48:52 +02:00 |
|
frederikpyt
|
c1972e70c8
|
v0.10.15b - Fixed scroll
|
2020-08-25 14:16:47 +02:00 |
|
Neerholt
|
f5e3e0c6e0
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-25 14:07:29 +02:00 |