Dane Everitt 800e2df6b2 Merge branch 'develop' into feature/api-v1 ... # Conflicts: # app/Contracts/Repository/RepositoryInterface.php # app/Repositories/Eloquent/EloquentRepository.php # app/Services/Nodes/NodeUpdateService.php # tests/Unit/Services/Nodes/NodeUpdateServiceTest.php		2018-01-10 20:55:22 -06:00
..
files	Update file manager to account for new API error responses	2017-12-31 10:39:07 -06:00
tasks	Update schedule process to allow toggling/triggering via UI	2018-01-08 21:43:10 -06:00
2fa-modal.js	Implement changes to 2FA system (#761)	2017-11-18 13:35:33 -05:00
console.js	Fix for js console causing browser to become unresponsive (#715)	2017-11-02 18:57:54 -04:00
server.socket.js	Implement a better management interface for Settings (#809)	2017-12-14 21:05:26 -06:00
serverlist.js	fix error display when server is installing, closes #424	2017-05-05 16:27:38 -04:00