Commit Graph

50 Commits

Author SHA1 Message Date
Ivan Diaz ace895a4a2 Use own exception class 2018-11-20 19:41:21 -03:00
Ivan Diaz 7dcc58f88e solve merge conflicts 2018-09-20 17:34:57 -03:00
Ivan Diaz b4342167e4 Update API documentation 2018-09-20 17:19:47 -03:00
Guillermo 89c42be18b fix minnor bugs 2018-09-08 15:52:51 -03:00
Ivan Diaz 5335f67746 Update version 4.2.0 2018-08-19 19:17:03 -03:00
ivan 989c2e35f8 Ivan - OpenSupports v4.1.0 release changes 2017-06-28 10:02:54 -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 ec34acc080 Ivan - Avoid verification if smtp is not set. Implement singleton pattern in MailSender class 2017-06-05 11:41:52 -03:00
ivan 6d58c44915 Ivan - Update controller documentations 2017-05-12 01:58:40 -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
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 05f0d453e1 Ivan - Fix smtp server [skip ci] 2017-03-15 17:28:23 -03:00
ivan f175669dc0 Ivan - Allow international characters improve text editor [skip ci] 2017-03-02 00:00:45 -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 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 6eae5f9299 Guillermo - csv import [skip ci] 2017-01-14 18:19:21 -03:00
AntonyAntonio 0108414a70 Guillermo - registration api keys [skip ci] 2017-01-13 17:06:49 -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
AntonyAntonio 397246aa4b Guillermo - paths enable/disable registration[skip ci] 2017-01-10 16:04:25 -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 b718598f32 Guillermo - add creatae log architecture [skip ci] 2016-12-28 21:55:00 -03:00
AntonyAntonio e24f46c278 Guillermo - add path /user/verify [skip ci] 2016-12-23 01:56:01 -03:00
AntonyAntonio 5c2f482c10 Guillermo - add path /user/verify [skip ci] 2016-12-22 03:07:06 -03:00
AntonyAntonio d40327f0ce Guillermo - ban-on-signup[skip ci] 2016-12-04 04:08:42 -03:00
ivan 8ab6240385 guillermo- get-users [skip ci] 2016-11-30 03:33:46 -03:00
ivan 06ad75b688 Ivan - Backend - Fixes to make frontend work with API [skip ci] 2016-09-09 02:24:12 -03:00
ivan 4f5f91994d Ivan - Backend - Add Captcha validation [skip ci] 2016-08-20 18:24:22 -03:00
ivan e0dd5cbf39 Ivan - Add name to user bean [skip ci] 2016-07-27 00:50:20 -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 5fd68fdc6e (Guillermo) code review changes 2016-07-19 16:41:04 -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 8b810f7bd5 Ivan - Add MailTemplate and MailSender 2016-07-14 19:06:47 -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
ivan 2a5fbae490 Ivan - Fix email sender issues [skip ci] 2016-07-08 18:00:52 -03:00
Ivan Diaz 89b2e52e87 Merged in create-ticket/comment (pull request #18)
Create ticket/comment
2016-07-08 04:02:55 -03:00
ivan 672bcd33a5 Ivan - Fix list-owning issues [skip ci] 2016-07-05 20:47:50 -03:00
ivan 09e163f00a Ivan - Fix list-owning issues [skip ci] 2016-07-05 20:40:30 -03:00
ivan 265b0c9bc2 Ivan - Implement respect/validation for validation [skip ci] 2016-07-04 15:57:00 -03:00
AntonyAntonio 94743f58ee (Guillermo) Add-email-sender-class 2 2016-07-04 15:47:28 -03:00
AntonyAntonio fad653ed7b (Guillermo) Add-email-sender-class 2016-07-04 04:09:32 -03:00
Ivan Diaz 953aa52584 [Ivan Diaz] - OS-#39 - Add User/Ticket/Comment classes 2016-05-14 19:08:30 -03:00
Ivan Diaz e7445a1c21 [Ivan Diaz] - Remove isAdmin property form user model 2016-04-28 21:23:27 -03:00
Ivan Diaz 993c618c9f [Ivan Diaz] - Move folder architecture 2016-04-17 18:44:24 -03:00