548 Commits

Author	SHA1	Message	Date
Ivan Diaz	285b62832a	Add image file size validation	2018-09-20 16:23:54 -03:00
Ivan Diaz	4df3bab1ff	Add test for image upload	2018-09-20 14:51:04 -03:00
Ivan Diaz	03778f0e95	Fix TextEditor, improve image uploading	2018-09-14 01:14:15 -03:00
Guillermo	89c42be18b	fix minnor bugs	2018-09-08 15:52:51 -03:00
Guillermo	e43835b2bc	fix bug #288 and add validatios	2018-09-05 01:21:21 -03:00
Ivan Diaz	5335f67746	Update version 4.2.0	2018-08-19 19:17:03 -03:00
Ivan Diaz	eef4c8622d	Fix assigment issues, login widget issues, recover password issues. Emails always on lowercase.	2018-08-14 15:21:36 -03:00
Ivan Diaz	25117074a0	Fix issues related with #80 ticket assignment	2018-07-28 02:35:13 -03:00
Ivan Diaz	6383b52fd0	Merge branch 'master' of github.com:opensupports/opensupports	2018-07-27 20:36:56 -03:00
Ivan Diaz	dda8e28e93	Add staff dropdown for assignment	2018-07-27 20:36:35 -03:00
Ivan Diaz	99ea7e0f8a	Add warning when staff has no departments assigned	2018-07-26 21:35:19 -03:00
Ivan Diaz	80ccccb951	Reduce stats to 30 days max	2018-07-26 17:28:27 -03:00
Guillermo	ce58e064cf	resolve merge conflict	2018-07-20 18:31:26 -03:00
Guillermo	a093bb41a5	back-end structure and tests of feature #161 #80	2018-07-20 18:21:18 -03:00
Ivan Diaz	33c73988f2	Merge branch 'master' into master	2018-07-19 21:59:38 -03:00
Guillermo	305b94c567	add front-end esctruct feature #101	2018-07-18 21:38:12 -03:00
Ivan Diaz	cd2e1cd3df	Add create ticket option for staff members	2018-07-17 23:18:51 -03:00
Ivan Diaz	0a5d444186	Mark as unread if author is not making the change	2018-07-17 02:04:00 -03:00
Ivan Diaz	96868abd92	Allow tickets to be created by staff members #175	2018-07-17 01:17:49 -03:00
Ivan Diaz	46da0c6719	Fix edit test	2018-07-06 17:05:38 -03:00
Ivan Diaz	254135dbf4	[HOTFIX] - Fix PHP 7.1 edit error	2018-07-06 16:06:51 -03:00
Ivan Diaz	352cfe0ca5	Fix image file stream	2018-07-02 23:31:47 -03:00
Ivan Diaz	cd16026f31	Fix #238 - database backup not working	2018-07-02 16:05:46 -03:00
Maxi Redigonda	0a88bbccd6	add dutch language	2018-06-29 15:38:34 -03:00
Ivan Diaz	775d9a65c3	merge nl language	2018-06-29 13:38:44 -03:00
Ivan Diaz	e52d4ca151	Add nl lang	2018-06-29 13:36:04 -03:00
Maxi Redigonda	dade0c995b	add greek language	2018-06-29 13:19:52 -03:00
Maxi Redigonda	a625971ec8	add portuguese Br language	2018-06-29 11:57:02 -03:00
ivan	ad7051f2e0	Remove htmlentities, use html-to-text	2018-06-11 18:28:36 -03:00
Guillermo Giuliana	5f07b85975	Merge pull request #218 from ivandiazwm/master ... Fix react editor, email links, smtp password being deleted	2018-06-06 02:40:49 -03:00
ivan	a5555b2596	Fix email links	2018-06-05 21:52:22 -03:00
ivan	17bdcc66d5	WIP	2018-06-04 18:04:03 -03:00
Guillermo	9c8052439c	Synchronize beckend title lenght validator	2018-06-02 02:10:31 -03:00
ivan	5c81b67e7c	[HOTFIX] - Email parsing	2018-05-18 16:52:50 -03:00
ivan	7c52aa02bb	UPdate Mail templates	2018-05-14 22:33:02 -03:00
Ivan Diaz	7be7f06754	Merge branch 'master' into master	2018-05-14 20:17:01 -03:00
Guillermo	6471ca6b13	Single file for email #66	2018-05-11 21:50:05 -03:00
ivan	43ef3e4e19	[Fix issue #104] - Show image attachements on browser	2018-05-02 21:40:44 -03:00
Ivan Diaz	ce3d2a249b	Merge pull request #183 from ivandiazwm/master ... Add docker and make support	2018-04-26 21:47:55 -03:00
ivan	635ccea020	Use mysql port from env variable	2018-04-26 21:34:28 -03:00
ivan	d29f379ff6	Update dbPort ducumentation, set default port	2018-04-26 17:42:59 -03:00
Maximiliano Redigonda	8bf8ed5223	Merge pull request #141 from mredigonda/issue-108 ... Fixes minimum size of titles.	2018-04-24 09:56:26 -03:00
ivan	43f8b6017a	Fix test issues	2018-04-18 15:31:17 -03:00
ivan	f7ef552da1	Merge remote-tracking branch 'guillermo/master'	2018-04-12 22:23:26 -03:00
ivan	e573a5460d	Change vendor chmod docker	2018-04-12 22:22:18 -03:00
ivan	909525d630	Fix docker issues	2018-04-11 22:10:28 -03:00
Ivan Diaz	b8740f3aaa	Add database creation on install	2018-03-29 16:38:00 -03:00
Ivan Diaz	accc5ba7ae	Add fakesmtp to make stop	2018-03-29 15:34:23 -03:00
Ivan Diaz	0c0e9c3e59	Add docker and make support	2018-03-27 23:30:18 -03:00
Guillermo	d0d6db77b7	Merge branch 'test' into guillermo/master	2018-03-12 19:45:12 -03:00
Guillermo	4ea1b925a9	wip	2018-03-12 19:31:54 -03:00
Guillermo	30fdb384f3	fix bug 115/166	2018-03-09 15:17:28 -03:00
Guillermo	d26d511ebd	fix bug #115	2018-02-28 02:43:34 -03:00
Ivan Diaz	695149c497	Merge branch 'master' of github.com:opensupports/opensupports	2018-02-25 15:11:43 -03:00
Ivan Diaz	7134f82b5f	Add IE compatibility	2018-02-25 12:33:38 -03:00
Maximiliano Redigonda	66de1f176d	Merge pull request #119 from mredigonda/master ... Minor fixes	2018-02-20 16:10:45 -03:00
Maxi Redigonda	39fd45dced	Fixes minimum length in add article backend	2018-01-18 20:24:44 -03:00
ivan	8f8c481d58	Revert "Revert "fix bug #58"" ... This reverts commit 4b3ea709c8.	2018-01-18 17:13:44 -03:00
Guillermo Giuliana	f211bd9cea	Merge pull request #136 from guillegiu/master ... fix bug #83	2018-01-17 22:10:28 -03:00
Maxi Redigonda	e088114b17	Merge branch 'master' of https://github.com/opensupports/opensupports	2018-01-17 00:54:52 -03:00
Guillermo	f09f86f7b3	fix bug #95	2018-01-16 23:41:23 -03:00
Guillermo	a98d7ecdd1	Add htmlentities to department name	2018-01-16 20:23:32 -03:00
Guillermo	3d416f82bd	fix bug 83	2018-01-12 23:08:07 -03:00
ivan	2d83116520	[HOTFIX] - Fix check-requirements to check files folder correctly	2018-01-11 18:51:07 -03:00
Maxi Redigonda	472dd6e8bb	Reverts wrong renaming of a path	2017-12-31 00:25:36 -03:00
Guillermo	c002fdf00f	fix bug #115	2017-12-29 18:40:59 -03:00
Guillermo	923571c5a2	fix bug #58	2017-12-29 17:50:46 -03:00
Maxi Redigonda	e3ca2c5e52	Fixes a typo and a path in the backend docs	2017-12-25 23:06:58 -03:00
ivan	83b1a7c69b	Fix version upgrade	2017-12-06 20:56:12 -03:00
ivan	a81e7320b7	Prepare 4.1.1	2017-11-30 18:06:09 -03:00
ivan	c3bf5e9fe5	use phpunit 5.7	2017-11-06 22:44:13 -03:00
ivan	1b48369e27	add test for linear congruential generator	2017-11-06 21:39:12 -03:00
ivan	3fabdfbe2f	fix phpunit tests	2017-11-06 16:06:34 -03:00
ivan	aa533856d5	Ivan - Fix linear congruential generator	2017-10-31 18:31:32 -03:00
ivan	84b128326c	Merge remote-tracking branch 'github/master'	2017-10-26 01:10:45 -03:00
ivan	911f457fbf	Ivan - Remove unset($this), that task should be done by the garbage collector. It doesn't work for php 7.1	2017-10-26 01:10:04 -03:00
Ivan Diaz	abf9aba17b	Merge pull request #47 from guillegiu/master ... issue #46	2017-07-11 04:33:00 -03:00
Guillermo	0aeb04c642	Guillermo - Issue #46	2017-07-11 03:39:17 -03:00
Guillermo	ea2c750515	Guillermo - Issue #20	2017-07-11 02:57:19 -03:00
ivan	989c2e35f8	Ivan - OpenSupports v4.1.0 release changes	2017-06-28 10:02:54 -03:00
ivan	70fb338de5	Ivan - Fix SMTP installation bug,	2017-06-28 06:55:03 -03:00
ivan	5114b4420b	Ivan - Fix edit staff myaccount verification	2017-06-28 05:52:45 -03:00
ivan	427af9f1b0	Ivan - Add default language as only supported language at the beginning, fix text display issue in japanese	2017-06-28 04:37:25 -03:00
ivan	36bac5d275	Ivan - Add Italian language #17 (thanks to @fabio82g)	2017-06-27 23:32:43 -03:00
ivan	00801f3b61	Ivan - Fix issue #27, fix frontend<->backend data flow with staff editor, add 403 response	2017-06-25 19:03:56 -03:00
ivan	fcb26fab60	Ivan - Fix comment bug #27	2017-06-25 06:07:14 -03:00
ivan	4876304f63	Ivan - Fix installation with session-prefix	2017-06-24 20:00:50 -03:00
AntonyAntonio	91c3b4f396	Guillermo - Issue #20	2017-06-20 16:47:27 -03:00
AntonyAntonio	3b102b3903	Guillermo - Issue #12 -Backend	2017-06-20 15:52:16 -03:00
Guillermo Giuliana	21777a1708	Merge pull request #2 from opensupports/master ... update master	2017-06-20 15:49:10 -03:00
AntonyAntonio	785e5eaa18	Guillermo - Issue #12 -Backend	2017-06-14 09:39:12 -03:00
AntonyAntonio	617e752695	Guillermo - Issue #12 -Backend	2017-06-14 00:37:40 -03:00
ivan	feee217510	Ivan - Fix MailSender instance to use singleton	2017-06-13 18:18:46 -03:00
ivan	a59bea46c6	Merge branch 'master' of https://github.com/opensupports/opensupports	2017-06-13 18:17:28 -03:00
ivan	d48d7ad875	Ivan - Add SMTP configuration to installation	2017-06-13 18:12:10 -03:00
Ivan Diaz	c648e7cd99	Merge pull request #31 from AntonyAntonio/master ... Issue #30	2017-06-13 04:35:01 -03:00
AntonyAntonio	06cf7ddcbe	Guillermo - Issue #30	2017-06-13 01:03:06 -03:00
Ivan Diaz	f9c05d9792	Merge pull request #25 from Kallys/close-ticket ... Allow users to close their tickets with user system disabled	2017-06-12 18:58:14 -03:00
Kallys	33ddbd972d	Fix review comments	2017-06-12 12:22:31 +02:00
ivan	4d7ac557c7	Ivan - Add SMTP improvements WIP	2017-06-10 04:17:54 -03:00
AntonyAntonio	463853aa70	Guillermo - add new option for sending mails to staff when a new ticket is created	2017-06-10 03:27:22 -03:00
ivan	4d5ff5449d	Merge branch 'development' of https://github.com/ivandiazwm/opensupports into development	2017-06-08 17:13:33 -03:00
ivan	cf1490711a	Guillermo - fix bug #11	2017-06-07 14:18:58 -03:00
Ivan Diaz	172d19c57f	Merge branch 'master' of https://github.com/opensupports/opensupports into development ... Conflicts: server/controllers/system/init-settings.php	2017-06-07 02:32:39 -03:00
Ivan Diaz	858add6443	Ivan - Create install step 5 WIP	2017-06-07 02:29:25 -03:00
Ivan Diaz	ec34acc080	Ivan - Avoid verification if smtp is not set. Implement singleton pattern in MailSender class	2017-06-05 11:41:52 -03:00
Kallys	d576ec726e	Allow users to close their tickets with user system disabled	2017-06-01 12:14:23 +02:00
ivan	6d58c44915	Ivan - Update controller documentations	2017-05-12 01:58:40 -03:00
ivan	145b73b3c8	Ivan - Update model documentations.	2017-05-11 16:37:03 -03:00
ivan	cb0cb7e16a	Ivan - Create API documentation json.	2017-05-11 00:33:32 -03:00
Ivan Diaz	8ad1145ffc	Update init-settings.php	2017-04-23 02:21:45 -03:00
AntonyAntonio	7a6eccb1bd	Merge branch 'DataAPI'	2017-04-21 22:41:29 -03:00
AntonyAntonio	a76eacb52b	Guillermo - things [skip ci]	2017-04-21 22:33:17 -03:00
AntonyAntonio	ce63b407e0	Guillermo - things [skip ci]	2017-04-21 03:09:24 -03:00
ivan	81d97fa271	Ivan - Reset configuration	2017-04-21 02:20:42 -03:00
ivan	e8ee0427d0	Ivan - Fix some issues [skip ci]	2017-04-21 01:43:06 -03:00
AntonyAntonio	3f2157ac4e	Guillermo - things [skip ci]	2017-04-21 00:34:20 -03:00
ivan	7b8226f579	Ivan - Fix StaffEditor issues [skip ci]	2017-04-20 21:54:04 -03:00
ivan	7792d6b527	Ivan - Add error documentation [skip ci]	2017-04-20 02:23:30 -03:00
ivan	b985d02f1b	Ivan - Add error documentation	2017-04-20 02:07:55 -03:00
AntonyAntonio	2b50c7a106	Guillermo - data staff [skip ci]	2017-04-18 01:39:55 -03:00
AntonyAntonio	8bc74384c2	Guillermo - data articles [skip ci]	2017-04-17 21:40:44 -03:00
AntonyAntonio	e3683ba1a4	Guillermo - data system [skip ci]	2017-04-17 21:09:16 -03:00
AntonyAntonio	be3d74ab92	Guillermo - data ticket [skip ci]	2017-04-16 23:59:11 -03:00
AntonyAntonio	81e9c632b3	Guillermo - data user [skip ci]	2017-04-16 02:35:04 -03:00
ivan	892e1536a2	Ivan - Fix installation in subfolder and file permissions	2017-04-10 22:30:39 -03:00
ivan	826d2f1eed	Ivan - Fix email template	2017-03-31 01:36:37 -03:00
ivan	d10de13626	Ivan - Fix installation issues [skip ci]	2017-03-30 20:37:55 -03:00
ivan	e49d93dbb0	Ivan - Fix Issues with installation process [skip ci]	2017-03-29 18:53:00 -03:00
ivan	48614fcc00	Ivan - Fix Installation issues [skip ci]	2017-03-29 18:46:26 -03:00
ivan	3047831864	Ivan - Fix language translations [skip ci]	2017-03-20 17:21:22 -03:00
ivan	88657ea76a	Ivan - Update email translations [skip ci]	2017-03-19 18:07:56 -03:00
ivan	a244a58ebc	Ivan - Add all mail templates [skip ci]	2017-03-16 20:00:21 -03:00
ivan	fdfcb751d3	Ivan - Add nice styling to emails [skip ci]	2017-03-16 18:29:39 -03:00
ivan	475d11ccac	Ivan - Fix PHPMailer configurations, improve user system install [skip ci]	2017-03-16 16:11:27 -03:00
ivan	05f0d453e1	Ivan - Fix smtp server [skip ci]	2017-03-15 17:28:23 -03:00
ivan	2a4590df2d	Ivan - Fix installation tests [skip ci]	2017-03-15 16:17:06 -03:00
ivan	339a36e260	Ivan - Add default config [skip ci]	2017-03-15 02:20:18 -03:00
ivan	46e3e65a0b	Ivan - Add installation service backend [skip ci]	2017-03-15 02:17:16 -03:00
ivan	62f5354b6c	Ivan - Fix dates [skip ci]	2017-03-04 19:20:44 -03:00
ivan	9d8c1a6225	Ivan - Fix dates [skip ci]	2017-03-04 19:07:14 -03:00
ivan	8c138b481c	Ivan - Fix csv import, remove sql import, add i18h keys for advanced settings [skip ci]	2017-03-04 18:38:49 -03:00
Ivan Diaz	484bfd4e99	Ivan - Fix enabling user system [skip ci]	2017-03-04 02:57:51 -03:00
ivan	6bff8e1493	Ivan - Add new logo, fix user system disabled architecture [skip ci]	2017-03-03 21:39:59 -03:00
ivan	3de5196dd5	Ivan - Add XSS protection backend [skip ci]	2017-03-02 02:56:42 -03:00
ivan	f175669dc0	Ivan - Allow international characters improve text editor [skip ci]	2017-03-02 00:00:45 -03:00
ivan	7f1047b311	Ivan - Fix test issues [skip ci]	2017-02-25 03:42:10 -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	f9ad440bf2	Ivan - Fix download get	2017-02-15 16:14:27 -03:00
ivan	8f02a08018	Ivan - Update profile pic upload [skip ci]	2017-02-09 17:05:59 -03:00
ivan	6f1638e5fe	Ivan - Update backend methods [skip ci]	2017-02-08 15:09:15 -03:00
ivan	0bd07ef211	Ivan - Add token ticket for backend [skip ci]	2017-01-21 01:17:28 -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	e8e29d8701	Ivan - Fix static ticketevent	2017-01-15 01:36:04 -03:00
Ivan Diaz	bfcb02b311	Merged in os-147-151-file-architecture-and-backup (pull request #123) ... Os 147 151 file architecture and backup	2017-01-15 00:02:45 -03:00
Ivan Diaz	575f34256a	Ivan - Fix unit testing backend	2017-01-14 23:51:31 -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
ivan	be49990091	Ivan - Add files folder [skip ci]	2017-01-12 03:02:56 -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 Diaz	a113d547d2	Ivan - Add verification token return data for backend [skip ci]	2017-01-10 13:19:36 -03:00
ivan	5ea4137e41	Max Red - Finally we did it! [skip ci]	2017-01-05 18:01:56 -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	6ddac56bc5	Max Red - Create system and staff fixtures for last-events and get-logs [skip ci]	2017-01-05 13:31:09 -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	af4853ed51	Guillermo - path and tests staff/last-events [skip ci]	2017-01-03 18:52:18 -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
Ivan Diaz	8be3fddac5	Merged in OS175-registration-with-verification-token (pull request #102) ... Os175 registration with verification token	2016-12-29 17:35:23 -03:00