AntonyAntonio
|
e317bbea38
|
Merge branch 'master' into OS141create-Log-Architectur
Conflicts:
server/controllers/staff/delete.php
tests/system/edit-settings.rb
|
2016-12-29 18:54:17 -03:00 |
|
AntonyAntonio
|
cab43cf5e0
|
Guillermo - add creatae log architecture [skip ci]
|
2016-12-29 02:50:53 -03:00 |
ivan
|
488633b0c2
|
Ivan - Avoid staff deleting himself and avoid level change to oneself [skip ci]
|
2016-12-21 17:54:02 -03:00 |
|
AntonyAntonio
|
49a4620457
|
Guillermo - department add owners property[skip ci]
|
2016-12-10 18:55:12 -03:00 |
|
ivan
|
895fbf011f
|
GUILLERMO - all test staff [skip ci]
|
2016-12-08 03:21:37 -03:00 |
|
Ivan Diaz
|
829e6060f5
|
Guillermo - staff/edit[skip ci]
|
2016-12-07 23:43:32 -03:00 |
|
Ivan Diaz
|
6bad194903
|
Guillermo - staff/edit[skip ci]
|
2016-12-07 19:30:31 -03:00 |
|
Ivan Diaz
|
d57baa6cd8
|
Guillermo - staff/dellete[skip ci]
|
2016-12-07 17:24:42 -03:00 |
|
AntonyAntonio
|
60211c2b3c
|
Guillermo - path / staff/delete[skip ci]
|
2016-12-07 02:06:50 -03:00 |
|
AntonyAntonio
|
1a3adfe418
|
Guillermo - path / staff/get-all[skip ci]
|
2016-12-07 01:37:18 -03:00 |