| Age | Commit message (Collapse) | Author |
|
|
|
|
|
automation to be called from objects of various classes of our app
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|