| Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
client/js/controllers/home/home.js
|
|
into develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
and add function to simplify parameters using in tests
|
|
Image.php, resolve conflict in AppTestClass.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- updated all functions to provide basic error-handling
- defined updateServer and deleteServer
|
|
|
|
|
|
into othmane
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|