Commit Graph

14 Commits

Author SHA1 Message Date
a880eb65b0
Revert last commits
This reverts commit 2ddef6058d.
2021-10-13 02:57:00 +01:00
2ddef6058d
Revert "Revert "Revert "Merge branch 'master' into develop"""
This reverts commit 427c9d1c57.
*facepalm*
2021-10-13 01:55:12 +01:00
427c9d1c57
Revert "Revert "Merge branch 'master' into develop""
This reverts commit fc6d7d2b18.
2021-10-13 01:47:16 +01:00
fc6d7d2b18
Revert "Merge branch 'master' into develop"
This reverts commit 42178e26de, reversing
changes made to d876dd6055.
2021-10-13 01:19:04 +01:00
b2b29382bf
Merge branch 'develop' 2021-10-13 00:02:42 +01:00
a3d0730808 Update to Laravel & PHP 8 2021-10-12 18:08:15 +01:00
e4fb438721 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	app/Http/Controllers/TeamFileController.php
#	app/TeamFile.php
#	config/adminlte.php
#	routes/web.php
2020-11-02 21:50:30 +00:00
96aa01b9c6 Recent changes 2020-11-02 21:44:05 +00:00
4eb115d165 Revert "Apply fixes from StyleCI (pull request #6)"
This reverts pull request #6.

> This pull request applies code style fixes from an analysis carried out by [StyleCI](https://bitbucket.styleci.io).
> 
> For more information, click [here](https://bitbucket.styleci.io/analyses/a2Jl7D).
2020-10-21 00:29:50 +00:00
773ec570d9 Apply fixes from StyleCI 2020-10-21 00:01:41 +00:00
d5d23b7dbd Apply fixes from StyleCI 2020-10-11 01:54:22 +00:00
06d1e0ad3f RSM-8 Add team files page and ability to download files 2020-10-11 02:54:09 +01:00
6541e25a39 Apply fixes from StyleCI 2020-10-10 16:30:26 +00:00
f80e9fcba0 First commit 2020-04-26 05:09:32 +01:00