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

275 Commits

Author SHA1 Message Date
victor 2681472772 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 
 Conflicts:
	skolehjem/database/migrations/2020_08_06_092000_create_news_table.php
	skolehjem/resources/views/admin/news/create.blade.php
	skolehjem/resources/views/admin/news/edit.blade.php
 2020-10-07 15:28:47 +02:00
victor 22694bd0fb v1.4.4 Made news expiration date, add category to app homepages, made small css things 2020-10-07 15:27:29 +02:00
frederikpyt 3e44501cd4 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-10-07 12:21:07 +02:00
frederikpyt 19f38e214c v1.4.3 - Small fixes 2020-10-07 12:20:58 +02:00
Anders 491ecc9d6e v1.4.2 - Fixed QL Editor 
Added Feedback to menu bar
 2020-10-07 11:59:58 +02:00
frederikpyt 233bc2b35e Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-10-07 08:25:14 +02:00
frederikpyt 159c3f3764 v1.4.1 - Small fixes 2020-10-07 08:23:26 +02:00
Anders164a f70d6a7a95 v1.4.0a - Fixed Category Dropdown CSS 2020-10-05 21:06:45 +02:00
Anders f95318a8f2 v1.4.0 - Added category search on the app 
Added comments
Fixed code
Fixed pagination still being there without using it
 2020-09-22 10:45:27 +02:00
frederikpyt 505ed3710b v1.3.4 - Small fixes 2020-09-22 09:07:36 +02:00
Neerholt 89ea2c971b v1.1.0a - Added "andet option" til feedback 2020-09-10 12:35:38 +02:00
Anders e483400d82 v1.1.0 - Users can now sign up (Automatically gets 'Bruger' role) 2020-09-10 10:25:27 +02:00
Anders 3b86e29c00 v1.0.0c - Fixed CSS 2020-09-09 12:20:50 +02:00
Anders a1cda94b13 Small change for ekapp (No need for comit number) 2020-09-09 09:20:50 +02:00
Anders cc49bf4252 v1.0.0b - Removed name + emails (Only commented out) 2020-09-09 09:16:56 +02:00
Anders 5d82e7251b v1.0.0a - Edited CSS & Controller img's 2020-09-09 09:15:17 +02:00
frederikpyt 6c4fceb697 v0.12.3 - Fixed reset password and email charset 2020-09-08 08:48:30 +02:00
Anders 66762efb8a v0.12.2 - Added feedback storing to ajax instead of backend 2020-09-07 14:21:59 +02:00
Anders 1030bcc13f v0.12.1 - Added css to headers 2020-09-07 13:10:20 +02:00
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 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 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 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 34e123ee19 v0.10.17a - Various fixes 2020-08-31 11:56:05 +02:00
frederikpyt 59bd705d89 v0.10.16a - Various fixes 2020-08-31 10:15:12 +02:00
frederikpyt c6c54996b5 v0.10.16 - Various fixes 2020-08-31 09:36:10 +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 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
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