493 Commits

Author	SHA1	Message	Date
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
AntonyAntonio	93fbd1cbf0	Guillermo - add TESTS log [skip ci]	2016-12-29 17:25:45 -03:00
AntonyAntonio	cab43cf5e0	Guillermo - add creatae log architecture [skip ci]	2016-12-29 02:50:53 -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
Ivan Diaz	5874cf279e	Merged in fix-some-bugs (pull request #103) ... Fix some bugs	2016-12-27 16:05:42 -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
ivan	01748a2a25	Ivan - Update redbean version to support php7 [skip ci]	2016-12-24 16:53:33 -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	5c2f482c10	Guillermo - add path /user/verify [skip ci]	2016-12-22 03:07:06 -03:00
ivan	488633b0c2	Ivan - Avoid staff deleting himself and avoid level change to oneself [skip ci]	2016-12-21 17:54:02 -03:00
ivan	91f8394ef6	Ivan - Add 6000 as max characters for commit [skip ci]	2016-12-21 17:07:34 -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
Ivan Diaz	abea0bbb97	Merged in OS128-add-additionals-settings (pull request #96) ... Os128 add additionals settings	2016-12-13 23:25:07 -03:00
Ivan Diaz	839bc0bf9e	Merged in OS-168-update-dates (pull request #97) ... OS-168 update dates	2016-12-13 22:06:58 -03:00
ivan	8d2033ec31	Ivan - Updates needed for dev3 deploy [skip ci]	2016-12-13 21:10:49 -03:00
ivan	05380fdfda	Ivan - Add transfer to department [skip ci]	2016-12-13 20:19:17 -03:00
AntonyAntonio	0000fe5159	Guillermo - path edit-settings[skip ci]	2016-12-13 02:03:35 -03:00
AntonyAntonio	2a1176516c	Guillermo - additional settings[skip ci]	2016-12-13 00:21:06 -03:00
AntonyAntonio	d13ff18528	Guillermo - add new settings[skip ci]	2016-12-13 00:19:57 -03:00
Ivan Diaz	5fca935c8d	Merged in 114-staff-member-view (pull request #92) ... 114 staff member view	2016-12-12 17:57:47 -03:00
Ivan Diaz	763e83331b	Merged in OS-124-departments-paths (pull request #93) ... Guillermo - department parths/ department tests	2016-12-12 17:47:33 -03:00
Max Red	be3cdf25f9	Max - modifies backend date function [skip ci]	2016-12-12 15:56:25 -03:00
AntonyAntonio	496dc9d939	Guillermo - department parths/ department tests[skip ci]	2016-12-12 02:12:17 -03:00
Ivan Diaz	54151612f7	Ivan - Add my account and fix styling issues [skip ci]	2016-12-12 01:46:50 -03:00
AntonyAntonio	49a4620457	Guillermo - department add owners property[skip ci]	2016-12-10 18:55:12 -03:00
Ivan Diaz	97ef914d27	Guillermo - staff/add-last-login [skip ci]	2016-12-08 17:39:47 -03:00
Ivan Diaz	980904f86e	Guillermo - staff/edit[skip ci]	2016-12-08 14:30:19 -03:00
ivan	895fbf011f	GUILLERMO - all test staff [skip ci]	2016-12-08 03:21:37 -03:00
Ivan Diaz	829e6060f5	Guillermo - staff/edit[skip ci]	2016-12-07 23:43:32 -03:00
Ivan Diaz	6bad194903	Guillermo - staff/edit[skip ci]	2016-12-07 19:30:31 -03:00
Ivan Diaz	d57baa6cd8	Guillermo - staff/dellete[skip ci]	2016-12-07 17:24:42 -03:00
Ivan Diaz	630e121bfb	Guillermo - staff/add [skip ci]	2016-12-07 16:59:42 -03:00
AntonyAntonio	60211c2b3c	Guillermo - path / staff/delete[skip ci]	2016-12-07 02:06:50 -03:00
AntonyAntonio	1a3adfe418	Guillermo - path / staff/get-all[skip ci]	2016-12-07 01:37:18 -03:00
AntonyAntonio	b2547ce5f8	Guillermo - path / staff/add[skip ci]	2016-12-06 01:32:00 -03:00
AntonyAntonio	8dd11af96b	Guillermo - path / staff/add[skip ci]	2016-12-05 23:17:18 -03:00
ivan	cbc4c15101	Ivan - Fix issues with release block 2 part 2	2016-12-04 23:51:45 -03:00
AntonyAntonio	d40327f0ce	Guillermo - ban-on-signup[skip ci]	2016-12-04 04:08:42 -03:00
ivan	f6ae50ef87	guillermo- banning architecture [skip ci]	2016-11-30 19:16:18 -03:00
ivan	f3c1882a13	guillermo- delete-user [skip ci]	2016-11-30 17:30:00 -03:00
ivan	5907cbda00	guillermo- get-user [skip ci]	2016-11-30 14:13:57 -03:00
ivan	8ab6240385	guillermo- get-users [skip ci]	2016-11-30 03:33:46 -03:00
ivan	2703f82253	Ivan - Fix master issues. Improve error handling	2016-11-24 18:02:18 -03:00
ivan	94fd359098	Ivan - Add articles paths [skip ci]	2016-11-22 22:27:05 -03:00
ivan	d227b3f34d	Ivan - Create article and topic datastore [skip ci]	2016-11-21 16:55:05 -03:00
ivan	9aceff4313	Ivan - Fixes for Deploy	2016-11-20 23:01:38 -03:00
ivan	c8ee619000	Merge branch 'master' into OS-116-Ticket-events ... # Conflicts: # tests/init.rb	2016-11-20 19:02:47 -03:00
ivan	8b3c8bf284	Ivan - Fix authorUser/authorStaff issues, fix date, add tests for ticket events [skip ci]	2016-11-20 19:00:39 -03:00
Ivan Diaz	323b481c62	Merged in OS-116-Ticket-events (pull request #78) ... OS-116 ticket events	2016-11-20 21:59:18 +00:00
AntonyAntonio	66281df491	Guillermo - staff-get-all-tickets[skip ci]	2016-11-19 22:54:08 -03:00
Ivan Diaz	b0bb56fae2	Merged in change-profile-pic-url (pull request #76) ... init-settings.php edited online with Bitbucket	2016-11-08 19:48:25 +00:00
Ivan Diaz	faf2544d1d	init-settings.php edited online with Bitbucket	2016-11-05 16:56:33 +00:00
ivan	83e3672f55	Ivan - Add Get all tickets and search [skip ci]	2016-11-04 19:10:32 -03:00
Ivan Diaz	1f7efd4086	Ivan - Add all ticket events to Ticketevent datastore [skip ci]	2016-10-23 15:31:48 -03:00
AntonyAntonio	7693f030f0	Guillermo - staff-get-all-tickets[skip ci]	2016-10-22 00:40:56 -03:00
ivan	47f9042c15	Guillermo - Ticket-seen [skip ci]	2016-10-21 16:38:08 -03:00
ivan	221288402e	Guillermo - Ticket-seen [skip ci]	2016-10-21 16:12:17 -03:00
AntonyAntonio	ef3bd809aa	Guillermo - ticket-seen[skip ci]	2016-10-21 01:08:06 -03:00
Ivan Diaz	20b3f6ebc0	GuilleSabe-ticket-seen[skip ci]	2016-10-20 18:34:06 -03:00
AntonyAntonio	d9124eb21a	Guillermo - staff-un-assign-ticket[skip ci]	2016-10-17 23:19:04 -03:00
ivan	73633278e6	guillermo- wip [skip ci]	2016-10-15 05:03:56 -03:00
ivan	920d7248f5	guillermo- path-ticket-change-priority [skip ci]	2016-10-15 04:32:38 -03:00
ivan	073a429231	guillermo- path-ticket-close and path-ticket-re-open [skip ci]	2016-10-15 03:23:12 -03:00
ivan	ea586072eb	guillermo- path- tickets-change-department [skip ci]	2016-10-15 01:32:44 -03:00
ivan	59099a3bbf	guillermo- path- staff-get-ticket [skip ci]	2016-10-14 21:59:11 -03:00
ivan	fd42574d15	guillermo- path- staff-un-assign-ticket [skip ci]	2016-10-14 16:32:32 -03:00
ivan	5034ba71a3	guillermo- path- staff-un-assign-ticket [skip ci]	2016-10-14 16:12:54 -03:00
ivan	6083c8731d	Ivan - Add delete custom response [skip ci]	2016-10-13 20:29:36 -03:00
ivan	db97ee09b7	guillermo - add asign staff ticket [skip ci]	2016-10-07 19:03:21 -03:00
ivan	2eed29e910	Merge branch 'master' into OS-79-assign-ticket-to-staff	2016-10-07 17:40:55 -03:00
ivan	2b50837603	Ivan - Add CustomResponse tests [skip ci]	2016-10-04 18:42:47 -03:00
ivan	684bdb1a25	Ivan - Add CustomResponse tests [skip ci]	2016-10-03 16:57:12 -03:00
ivan	84b33ea871	Ivan - Add CustomResponse model and paths [skip ci]	2016-10-03 16:44:41 -03:00
Ivan Diaz	4f127b1d21	Ivan - Add text editor to text area [skip ci]	2016-09-30 18:47:04 -03:00
ivan	be8374fd9a	antonyantonio - add priority ticket backend[skip ci]	2016-09-29 17:09:34 -03:00
ivan	6ee9e412c1	Ivan - Eliminate Comment DataStore [skip ci]	2016-09-29 14:47:25 -03:00
ivan	4512d4b484	Ivan - Create Ticket::addEvent function [skip ci]	2016-09-29 14:46:31 -03:00
ivan	0bed4bef45	Ivan - Add events to backend [skip ci]	2016-09-29 14:34:20 -03:00
ivan	cc7c5bfb3d	Ivan - STAFF LOGIN - Add Staff login to backend [skip ci]	2016-09-25 01:16:10 -03:00
ivan	9fadaa74f0	Ivan - Add staff DataStore [skip ci]	2016-09-24 16:26:37 -03:00
Ivan Diaz	060f1b7a12	Merged in OS-68-crear-admin-login (pull request #51) ... Max Red - Create login page	2016-09-23 16:55:06 -03:00
ivan	f8b27f98c6	Ivan - dev3 deploy implementation fixes	2016-09-22 20:33:45 -03:00
ivan	07bc533681	Max Red - Create login page [skip ci]	2016-09-22 18:23:53 -03:00
ivan	06ad75b688	Ivan - Backend - Fixes to make frontend work with API [skip ci]	2016-09-09 02:24:12 -03:00
ivan	7b6f9e28c8	Ivan - Backend - Add validator to /ticket/get [skip ci]	2016-09-09 00:41:59 -03:00
ivan	da7aad3576	Ivan - Backend - Create /user/get path [skip ci]	2016-09-09 00:38:58 -03:00
ivan	e22b3d999c	Ivan - Backend - Create /ticket/get path [skip ci]	2016-09-03 21:46:08 -03:00
Ivan Diaz	62cb8df2b6	Merged in captcha (pull request #39) ... Funcionalidad de Captcha [Frontend/Backend]	2016-08-30 16:28:56 -03:00
ivan	157cce4b5e	Ivan - Backend - Fix captcha test	2016-08-30 16:13:31 -03:00
ivan	12cf0df27f	Ivan - Backend - Fix captcha tests	2016-08-30 15:41:35 -03:00
ivan	d1f1909cc3	Ivan - Backend - Fix captcha tests	2016-08-30 15:35:10 -03:00
AntonyAntonio	2f157fe2c6	(Guillermo) ticketnumber stage 1 [skip ci]	2016-08-20 21:16:07 -03:00
ivan	5972427cf2	Merge branch 'master' into captcha	2016-08-20 19:22:17 -03:00
ivan	8a87e8118d	Ivan - Backend - Add unit test for captcha validation [skip ci]	2016-08-20 19:19:18 -03:00
ivan	4f5f91994d	Ivan - Backend - Add Captcha validation [skip ci]	2016-08-20 18:24:22 -03:00
ivan	4b7ece614f	Ivan - Backend - Add /system/get-settings path[skip ci]	2016-08-20 18:06:41 -03:00
AntonyAntonio	54eb3e89e8	(Guillermo) ticketnumber stage 1 [skip ci]	2016-08-16 23:49:40 -03:00
AntonyAntonio	2aa2c59722	(Guillermo) actualization recover-password [skip ci]	2016-08-15 20:15:09 -03:00
AntonyAntonio	23604cc713	(Guillermo) add ruby testing for user-edit [skip ci]	2016-08-09 23:54:39 -03:00
AntonyAntonio	54da0699dd	(Guillermo) path-user-edit and mailsender [skip ci]	2016-08-07 23:21:48 -03:00
ivan	4943a5eb94	Ivan - Make getProps of Department static	2016-08-04 20:21:51 -03:00
ivan	3c3c11027d	Ivan - Fix Recover Password validations	2016-08-04 16:01:24 -03:00
ivan	830e2115a3	Ivan - Add ruby api testing for comment/create	2016-08-04 15:41:22 -03:00
ivan	855c99398d	Ivan - Fix ticket creation and comment	2016-08-04 01:37:23 -03:00
ivan	d6853b3a4b	Ivan - Fix all list/beanInstance functionality	2016-08-04 00:59:04 -03:00
Ivan Diaz	a98cf9176b	Merged in Full-ticket-create-logic (pull request #32) ... (Guillermo) full ticket create	2016-08-03 15:08:57 -03:00
Ivan Diaz	4d5ce7022e	Merged in settings-options-backend (pull request #29) ... Settings options backend	2016-08-02 15:09:16 -03:00
AntonyAntonio	0fc5bac930	(Guillermo) full ticket create	2016-08-01 00:34:55 -03:00
ivan	50974d2ed2	Ivan - Fix mocks and unit testing to use NullDataStore and BeanMock [skip ci]	2016-07-27 18:27:28 -03:00
ivan	eccc0b5a29	Ivan - Implent NullDataStore pattern, refactor login controller, add get-setting and set-setting controllers	2016-07-27 13:58:19 -03:00
Ivan Diaz	1b7b449ae6	Merged master into add-name-to-signup	2016-07-27 11:12:36 -03:00
ivan	d23fba451e	Ivan - Add smtp settings [skip ci]	2016-07-27 01:04:29 -03:00
ivan	e0dd5cbf39	Ivan - Add name to user bean [skip ci]	2016-07-27 00:50:20 -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
ivan	4ccbd75759	Ivan - Add initial settings and initial mail templates [skip ci]	2016-07-26 18:30:51 -03:00
Ivan Diaz	8fa096f662	Merged in remember-me-frontend (pull request #25) ... Remember me frontend	2016-07-25 21:19:30 -03:00
AntonyAntonio	74f9d04824	guillermo - code review changes again [skip ci]	2016-07-25 17:26:14 -03:00
AntonyAntonio	7497bd0d6c	guillermo - code review changes again [skip ci]	2016-07-25 14:36:29 -03:00
AntonyAntonio	1f39e4d845	Merge branch 'master' into Recover-Password ... Conflicts: server/models/ERRORS.php	2016-07-25 11:00:43 -03:00
AntonyAntonio	dc3df30ef6	(Guillermo) recover password	2016-07-22 04:44:55 -03:00
Ivan Diaz	63813f2425	Merged in validation-user-sign-up (pull request #23) ... Validation user sign up	2016-07-21 21:49:36 -03:00
AntonyAntonio	7c1ee7d6fc	guillermo - code review changes [skip ci]	2016-07-21 15:27:57 -03:00
Ivan Diaz	9d378d07e5	Ivan - Add local storage class [skip ci]	2016-07-20 20:39:36 -03:00
Ivan Diaz	d648aff2b3	Ivan - Add local storage class [skip ci]	2016-07-20 18:38:20 -03:00
AntonyAntonio	8b8ac11b97	(Guillermo) recover password	2016-07-20 01:38:34 -03:00
ivan	b3cd09ba00	Ivan - Update remember logic using local storage [skip ci]	2016-07-20 01:31:07 -03:00
ivan	0c27a96113	Merge remote-tracking branch 'origin/master'	2016-07-19 17:58:36 -03:00
ivan	4d0759a004	Ivan - Fix master build	2016-07-19 17:58:17 -03:00
Ivan Diaz	4c075d3821	Merged in Add-email-sender-class (pull request #22) ... Add email sender class	2016-07-19 17:49:21 -03:00
AntonyAntonio	4414140343	Merge branch 'master' into validation-user-sign-up	2016-07-19 17:40:36 -03:00
AntonyAntonio	5fd68fdc6e	(Guillermo) code review changes	2016-07-19 16:41:04 -03:00
ivan	c613d886b3	Ivan - Fix master login test	2016-07-19 10:51:43 -03:00
AntonyAntonio	8fc5ed0e57	(Guillermo) code review changes	2016-07-19 02:38:43 -03:00
AntonyAntonio	70b42ed39d	(Guillermo) code review changes	2016-07-19 02:35:37 -03:00
Ivan Diaz	35a968652a	[AntonyAntonio] - Add remember me test [skip ci]	2016-07-16 03:57:42 -03:00
Ivan Diaz	5949c85aeb	[AntonyAntonio] - Add remember me test [skip ci]	2016-07-16 03:54:29 -03:00
Ivan Diaz	342aab48b7	[AntonyAntonio] - Add remember me test [skip ci]	2016-07-15 22:16:22 -03:00
AntonyAntonio	466bb85d34	(Guillermo) code review changes	2016-07-15 17:12:06 -03:00
ivan	9a25e7b7ae	Ivan - Add FakeSMTP support [skip ci]	2016-07-14 19:53:24 -03:00
ivan	e6fb52791e	Ivan - Add Unit testing for MailTemplate [skip ci]	2016-07-14 19:31:23 -03:00
ivan	8b810f7bd5	Ivan - Add MailTemplate and MailSender	2016-07-14 19:06:47 -03:00
AntonyAntonio	48fe22c536	(Guillermo) Add-email-sender-class	2016-07-14 03:34:13 -03:00
ivan	948b476c12	Merge branch 'master' into Add-email-sender-class ... # Conflicts: # server/composer.json # server/controllers/user/signup.php	2016-07-14 01:45:50 -03:00
AntonyAntonio	533e34c395	(Guillermo) Add-email-sender-class	2016-07-13 20:30:23 -03:00
ivan	2a5fbae490	Ivan - Fix email sender issues [skip ci]	2016-07-08 18:00:52 -03:00
ivan	9312baa3b0	Ivan - Fix master phpunit build: Add validations to comment	2016-07-08 04:46:28 -03:00
ivan	ab6b2326b9	Ivan - Fix master phpunit build: Undesired property	2016-07-08 04:27:17 -03:00
Ivan Diaz	89b2e52e87	Merged in create-ticket/comment (pull request #18) ... Create ticket/comment	2016-07-08 04:02:55 -03:00