AntonyAntonio 1c0c16f7f6 Merge branch 'master' into OS156-Disable-user-system ...

Conflicts:
	server/controllers/system.php
	server/controllers/system/init-settings.php
	server/data/ERRORS.php
	server/libs/Controller.php
	tests/init.rb

2017-01-16 16:13:40 -03:00

..

ban.php

Guillermo - add creatae log architecture [skip ci]

2016-12-28 21:55:00 -03:00

check-session.php

Ivan - Update remember logic using local storage [skip ci]

2016-07-20 01:31:07 -03:00

delete.php

Guillermo - disable-user-system [skip ci]

2017-01-16 16:07: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

(Guillermo) path-user-edit and mailsender [skip ci]

2016-08-07 23:21:48 -03:00

get-user.php

Guillermo - disable-user-system [skip ci]

2017-01-16 16:07:53 -03:00

get-users.php

Guillermo - disable-user-system [skip ci]

2017-01-16 16:07:53 -03:00

get.php

Ivan - Add verification token return data for backend [skip ci]

2017-01-10 13:19:36 -03:00

list-ban.php

guillermo- banning architecture [skip ci]

2016-11-30 19:16:18 -03:00

login.php

Guillermo - disable-user-system [skip ci]

2017-01-16 16:07:53 -03:00

logout.php

Ivan - Implement respect/validation for validation [skip ci]

2016-07-04 15:57:00 -03:00

recover-password.php

Guillermo - disable-user-system [skip ci]

2017-01-16 16:07:53 -03:00

send-recover-password.php

Guillermo - disable-user-system [skip ci]

2017-01-16 16:07:53 -03:00

signup.php

Merge branch 'master' into OS156-Disable-user-system

2017-01-16 16:13:40 -03:00

un-ban.php

Ivan Diaz - update backend logs [skip ci]

2017-01-05 16:26:43 -03:00

verify.php

Guillermo - disable-user-system [skip ci]

2017-01-16 16:07:53 -03:00