118 Commits

Author	SHA1	Message	Date
AntonyAntonio	b8d24b601d	Guillermo - stats architecture [skip ci]	2017-01-12 16:30:58 -03:00
ivan	a7ef5c10f2	Merge branch 'master' into OS4#150Enable-registration ... # Conflicts: # server/controllers/system/get-settings.php	2017-01-11 03:49:32 -03:00
Ivan Diaz	1ca57e1b76	Ivan - Add deploy on dev 3 changes and fixes [skip ci]	2017-01-10 17:07:49 -03:00
AntonyAntonio	397246aa4b	Guillermo - paths enable/disable registration[skip ci]	2017-01-10 16:04:25 -03:00
AntonyAntonio	d7cd5086bd	Guillermo - tests get/edit/recover-mail-templates [skip ci]	2017-01-03 21:06:45 -03:00
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	93fbd1cbf0	Guillermo - add TESTS log [skip ci]	2016-12-29 17:25:45 -03:00
AntonyAntonio	b718598f32	Guillermo - add creatae log architecture [skip ci]	2016-12-28 21:55:00 -03:00
AntonyAntonio	4e92a0d7a0	Merge branch 'master' into OS175-registration-with-verification-token ... Conflicts: tests/system/edit-settings.rb	2016-12-26 00:27:50 -03:00
AntonyAntonio	e24f46c278	Guillermo - add path /user/verify [skip ci]	2016-12-23 01:56:01 -03:00
AntonyAntonio	be2e492aa4	Guillermo - add path /user/verify [skip ci]	2016-12-23 01:27:21 -03:00
AntonyAntonio	69c3410e03	Guillermo - add test supported languages [skip ci]	2016-12-21 01:09:35 -03:00
AntonyAntonio	83edf85f3d	Guillermo - path edit-settings tests[skip ci]	2016-12-19 23:17:35 -03:00
ivan	05380fdfda	Ivan - Add transfer to department [skip ci]	2016-12-13 20:19:17 -03:00
AntonyAntonio	496dc9d939	Guillermo - department parths/ department tests[skip ci]	2016-12-12 02:12:17 -03:00
ivan	9aceff4313	Ivan - Fixes for Deploy	2016-11-20 23:01:38 -03:00
ivan	10d6eebc69	Ivan - Backend - Add get-settings tests [skip ci]	2016-08-20 18:33:47 -03:00
ivan	3f01526814	Ivan - Fix issues with mail templating and add it to ruby tests [skip ci]	2016-07-27 00:44:07 -03:00