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
..
ban.php	Guillermo - add creatae log architecture [skip ci]	2016-12-28 21:55:00 -03:00
check-session.php	…
delete.php	Guillermo - add creatae log architecture [skip ci]	2016-12-29 02:50:53 -03:00
edit-email.php	(Guillermo) add ruby testing for user-edit [skip ci]	2016-08-09 23:54:39 -03:00
edit-password.php	…
get-user.php	Guillermo - add path /user/verify [skip ci]	2016-12-23 01:56:01 -03:00
get-users.php	Ivan - Updates needed for dev3 deploy [skip ci]	2016-12-13 21:10:49 -03:00
get.php	Ivan - STAFF LOGIN - Add Staff login to backend [skip ci]	2016-09-25 01:16:10 -03:00
list-ban.php	guillermo- banning architecture [skip ci]	2016-11-30 19:16:18 -03:00
login.php	Guillermo - add path /user/verify [skip ci]	2016-12-23 01:27:21 -03:00
logout.php	…
recover-password.php	(Guillermo) actualization recover-password [skip ci]	2016-08-15 20:15:09 -03:00
send-recover-password.php	(Guillermo) actualization recover-password [skip ci]	2016-08-15 20:15:09 -03:00
signup.php	Merge branch 'master' into OS141create-Log-Architectur	2016-12-29 18:54:17 -03:00
un-ban.php	Guillermo - add creatae log architecture [skip ci]	2016-12-28 21:55:00 -03:00
verify.php	Guillermo - add path /user/verify [skip ci]	2016-12-22 03:07:06 -03:00