Commit Graph

988 Commits

Author SHA1 Message Date
Ivan Diaz db3ef9be13 Merge pull request #28 from ivandiazwm/master
Guillermo - fix bug #11
2017-06-07 14:30:48 -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 57fdaceaea Merge pull request #23 from Kallys/master
Fix #22
2017-06-06 00:11:58 -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
Kallys bd88239c7c Fix #22 2017-05-19 20:08:45 +02:00
Ivan Diaz 13ed10dc4e Merge pull request #19 from ivandiazwm/master
Update API documentation
2017-05-14 22:52:52 -03: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
Guillermo Giuliana 51dc76b386 Update de.js
algunas cosas tenian que malir sal
2017-05-08 01:34:01 -03:00
Guillermo Giuliana f36de6a728 Merge pull request #10 from Kallys/master
Update french translation
2017-05-06 18:29:43 +02:00
Kallys c5292fc432 Fix typo 2017-05-05 15:42:56 +02:00
Kallys 2557748410 Update french translation 2017-05-05 15:37:29 +02:00
Ivan Diaz 8ad1145ffc Update init-settings.php 2017-04-23 02:21:45 -03:00
Ivan Diaz 466d264d17 Merge pull request #3 from AntonyAntonio/master
Add API documentation
2017-04-22 07:57:56 +02: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
Ivan Diaz 57ed917f54 Merge pull request #2 from ivandiazwm/master
Bug fixing and Improvements
2017-04-21 08:18:59 +02: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 bd52d7b680 Ivan - Fix hindi language, fix installation error response, fix responsive issues with other languages, fix topic delete bug [skip ci] 2017-04-20 21:50:52 -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
ivan e440b348d1 Ivan - Fix article deletion tests 2017-04-18 21:21:16 -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 Diaz ebd4f8ca9f Merge pull request #1 from ivandiazwm/master
Fix issues with subfolders
2017-04-11 00:15:57 -03:00
ivan 892e1536a2 Ivan - Fix installation in subfolder and file permissions 2017-04-10 22:30:39 -03:00
ivan 491fc901a8 Ivan - Add icon 2017-04-07 18:48:15 -03:00
Ivan Diaz eed114fb02 Update README.md [ci skip] 2017-04-06 21:27:12 -03:00
Ivan Diaz 37d32fab57 Update README.md [ci skip] 2017-04-06 21:25:44 -03:00
Ivan Diaz f65ae4b14a Update README.md [ci skip] 2017-04-06 21:24:33 -03:00
Ivan Diaz 86daeb18be Update README.md [ci skip] 2017-04-06 21:23:37 -03:00
Ivan Diaz 6502e425d9 Update .travis.yml 2017-04-06 21:05:06 -03:00
Ivan Diaz 3048adec1e Update .travis.yml 2017-04-06 20:57:03 -03:00
Ivan Diaz 5600af9cf1 Update .travis.yml 2017-04-06 20:49:06 -03:00
Ivan Diaz ac69df8c70 Update .travis.yml 2017-04-06 20:36:51 -03:00
Ivan Diaz a23f2a2641 Create .travis.yml 2017-04-06 20:30:08 -03:00
ivan 826d2f1eed Ivan - Fix email template 2017-03-31 01:36:37 -03:00
ivan 2218fee003 Ivan - Fix es language 2017-03-31 00:55:42 -03:00
ivan 5475133b9e Merge branch 'idioma_espanol'
# Conflicts:
#	client/src/data/languages/es.js
2017-03-31 00:54:25 -03:00