Ivan Diaz 7b95c54257 Merge branch 'master' into os-147-151-file-architecture-and-backup ...

Conflicts:
	server/controllers/system.php
	server/data/ERRORS.php
	tests/init.rb

2017-01-14 21:45:43 -03:00

..

add-api-key.php

Guillermo - registration api keys [skip ci]

2017-01-13 17:06:49 -03:00

add-department.php

Guillermo - add creatae log architecture [skip ci]

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

backup-database.php

Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci]

2017-01-12 16:45:01 -03:00

delete-all-users.php

Guillermo - path-delete-all-users [skip ci]

2017-01-12 17:06:41 -03:00

delete-api-key.php

Guillermo - registration api keys [skip ci]

2017-01-13 15:50:35 -03:00

delete-department.php

Guillermo - add creatae log architecture [skip ci]

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

disable-registration.php

Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react

2017-01-11 03:50:47 -03:00

download.php

Ivan - Add file download component [skip ci]

2017-01-14 21:44:20 -03:00

edit-department.php

Guillermo - add creatae log architecture [skip ci]

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

edit-mail-template.php

Guillermo - path edit/recover-mail-templates [skip ci]

2017-01-03 20:35:46 -03:00

edit-settings.php

Guillermo - stats architecture [skip ci]

2017-01-11 04:25:26 -03:00

enable-registration.php

Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react

2017-01-11 03:50:47 -03:00

get-all-keys.php

Guillermo - registration api keys [skip ci]

2017-01-13 15:50:35 -03:00

get-logs.php

Ivan - Deploy changes [skip ci]

2017-01-11 00:21:27 -03:00

get-mail-templates.php

Guillermo - path get-mail-templates [skip ci]

2017-01-03 19:36:26 -03:00

get-settings.php

Merge branch 'master' into OS4#150Enable-registration

2017-01-11 03:49:32 -03:00

get-stats.php

Guillermo - stats architecture [skip ci]

2017-01-12 16:30:58 -03:00

init-settings.php

Ivan - Add file upload and download test [skip ci]

2017-01-13 21:58:59 -03:00

recover-mail-template.php

Guillermo - path edit/recover-mail-templates [skip ci]

2017-01-03 20:35:46 -03:00