167 Commits

Author	SHA1	Message	Date
ivan	f175669dc0	Ivan - Allow international characters improve text editor [skip ci]	2017-03-02 00:00:45 -03:00
ivan	5126b40538	Ivan - Fix AreYouSure design, fix stats, rename get-api-keys, use allow-attachment, fix login verificationToken, fix deletion, fix ticket view permission, fix last events when empty, fix configuration in frontend, fix system preferences and my account	2017-02-24 03:56:25 -03:00
Ivan Diaz	3d27415041	Ivan - Fix stats	2017-02-18 20:58:31 -03:00
Ivan Diaz	2189c18a3c	Ivan - Fix some staff edition issues [skip ci]	2017-02-18 19:47:19 -03:00
ivan	d4263d4b94	Ivan - Fix uploading of files	2017-02-18 15:28:23 -03:00
ivan	6f1638e5fe	Ivan - Update backend methods [skip ci]	2017-02-08 15:09:15 -03:00
AntonyAntonio	35ac87ab88	Merge branch 'master' into OS156-Disable-user-system ... Conflicts: server/controllers/system.php tests/init.rb	2017-01-17 15:03:48 -03:00
AntonyAntonio	78a98b9d0e	Guillermo - disable-user-system [skip ci]	2017-01-16 18:15:28 -03:00
AntonyAntonio	c4b63aab43	Guillermo - disable-user-system [skip ci]	2017-01-16 18:04:26 -03:00
AntonyAntonio	8ce33a2e40	Guillermo - disable-user-system [skip ci]	2017-01-16 17:11:45 -03:00
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
AntonyAntonio	fdd35ed2c1	Guillermo - disable-user-system [skip ci]	2017-01-16 16:07:53 -03:00
AntonyAntonio	565c60c198	Guillermo - csv import [skip ci]	2017-01-15 17:33:33 -03:00
AntonyAntonio	8f2310f855	Merge branch 'master' into OS154-CSV-Import ... Conflicts: server/controllers/system.php	2017-01-15 17:08:07 -03:00
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
Ivan Diaz	35d9a166cf	Ivan - Add file download component [skip ci]	2017-01-14 21:44:20 -03:00
AntonyAntonio	6eae5f9299	Guillermo - csv import [skip ci]	2017-01-14 18:19:21 -03:00
AntonyAntonio	a9b52d7ed9	Merge branch 'master' into OS-149-delete-all-users ... Conflicts: server/controllers/system.php	2017-01-14 13:42:08 -03:00
Ivan Diaz	dffe4a87a0	Ivan - Add file upload and download test [skip ci]	2017-01-13 21:58:59 -03:00
AntonyAntonio	0108414a70	Guillermo - registration api keys [skip ci]	2017-01-13 17:06:49 -03:00
AntonyAntonio	f79913de97	Guillermo - registration api keys [skip ci]	2017-01-13 15:50:35 -03:00
Ivan Diaz	012103c2ad	Merge branch 'master' into os-147-151-file-architecture-and-backup ... Conflicts: server/controllers/system.php server/controllers/system/init-settings.php server/data/ERRORS.php	2017-01-13 14:42:04 -03:00
ivan	71984384cc	Ivan - Add validations before download and upload on comment [skip ci]	2017-01-12 20:31:12 -03:00
ivan	f2401dcec7	Ivan - Fix file uploader issues, add file upload in ticket creation [skip ci]	2017-01-12 18:29:50 -03:00
AntonyAntonio	8763264a01	Merge branch 'master' into OS-144Stats-Architecture ... Conflicts: server/controllers/system.php server/controllers/system/init-settings.php tests/init.rb	2017-01-12 17:10:37 -03:00
AntonyAntonio	1d514dda58	Guillermo - path-delete-all-users [skip ci]	2017-01-12 17:06:41 -03:00
ivan	134540fed9	Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci]	2017-01-12 16:45:01 -03:00
AntonyAntonio	b8d24b601d	Guillermo - stats architecture [skip ci]	2017-01-12 16:30:58 -03:00
AntonyAntonio	868d08ecb2	Guillermo - stats architecture [skip ci]	2017-01-12 02:50:45 -03:00
AntonyAntonio	845939f089	Guillermo - stats architecture [skip ci]	2017-01-11 04:25:26 -03:00
ivan	9383fd0d3e	Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react ... # Conflicts: # server/controllers/system/get-settings.php	2017-01-11 03:50:47 -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	3299c3dd8d	Ivan - Deploy changes [skip ci]	2017-01-11 00:21:27 -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	a317f6a29c	Guillermo - paths enable/disable registration[skip ci]	2017-01-10 15:22:36 -03:00
ivan	1465a53616	Merge branch 'master' into os-143-last-activity ... # Conflicts: # client/src/data/languages/en.js	2017-01-05 16:27:19 -03:00
ivan	c99b5fc881	Ivan Diaz - update backend logs [skip ci]	2017-01-05 16:26:43 -03:00
Ivan Diaz	dad5d0bd86	Ivan - Update settings values [skip ci]	2017-01-04 19:29:23 -03:00
AntonyAntonio	51357c2cd8	Guillermo - path edit/recover-mail-templates [skip ci]	2017-01-03 20:35:46 -03:00
AntonyAntonio	1a600f4c61	Guillermo - path get-mail-templates [skip ci]	2017-01-03 19:36:26 -03:00
AntonyAntonio	c7cdfd7318	Guillermo - add creatae log architecture [skip ci]	2016-12-29 02:04:35 -03:00
AntonyAntonio	b718598f32	Guillermo - add creatae log architecture [skip ci]	2016-12-28 21:55:00 -03:00
AntonyAntonio	69c3410e03	Guillermo - add test supported languages [skip ci]	2016-12-21 01:09:35 -03:00
AntonyAntonio	7f9c12df36	Guillermo - add supported and allowed editable [skip ci]	2016-12-21 00:00:19 -03:00
AntonyAntonio	d30d14d58b	Merge branch 'master' into OS-132-add-supported-lenguages	2016-12-20 23:29:55 -03:00
AntonyAntonio	b26db547dc	Guillermo - add supported languages[skip ci]	2016-12-20 23:29:19 -03:00
AntonyAntonio	83edf85f3d	Guillermo - path edit-settings tests[skip ci]	2016-12-19 23:17:35 -03:00
AntonyAntonio	8aaca982d6	Merge branch 'master' into OS131-Path-system-edit-settings	2016-12-18 23:43:41 -03:00
AntonyAntonio	da2373e013	Guillermo - path edit-settings[skip ci]	2016-12-14 22:27:31 -03:00