ivan
|
635ccea020
|
Use mysql port from env variable
|
2018-04-26 21:34:28 -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
|
909525d630
|
Fix docker issues
|
2018-04-11 22:10:28 -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 |
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 |
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 |
Guillermo
|
02b6993615
|
Fix edit settings test
|
2018-01-04 00:57:45 -03:00 |
ivan
|
5114b4420b
|
Ivan - Fix edit staff myaccount verification
|
2017-06-28 05:52:45 -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 |
AntonyAntonio
|
91c3b4f396
|
Guillermo - Issue #20
|
2017-06-20 16:47:27 -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 |
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
|
cf1490711a
|
Guillermo - fix bug #11
|
2017-06-07 14:18:58 -03:00 |
ivan
|
e440b348d1
|
Ivan - Fix article deletion tests
|
2017-04-18 21:21:16 -03:00 |
ivan
|
e49d93dbb0
|
Ivan - Fix Issues with installation process [skip ci]
|
2017-03-29 18:53:00 -03:00 |
ivan
|
a244a58ebc
|
Ivan - Add all mail templates [skip ci]
|
2017-03-16 20:00:21 -03:00 |
ivan
|
2a4590df2d
|
Ivan - Fix installation tests [skip ci]
|
2017-03-15 16:17:06 -03:00 |
Ivan Diaz
|
484bfd4e99
|
Ivan - Fix enabling user system [skip ci]
|
2017-03-04 02:57:51 -03:00 |
ivan
|
3de5196dd5
|
Ivan - Add XSS protection backend [skip ci]
|
2017-03-02 02:56:42 -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
|
2189c18a3c
|
Ivan - Fix some staff edition issues [skip ci]
|
2017-02-18 19:47:19 -03:00 |
ivan
|
8d0da0e451
|
Ivan - Fix ruby tests
|
2017-02-18 15:55:09 -03:00 |
ivan
|
f9ad440bf2
|
Ivan - Fix download get
|
2017-02-15 16:14:27 -03:00 |
ivan
|
222dbdea04
|
Ivan - Fix download get
|
2017-02-15 03:08:48 -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
|
6ff0dbdf6b
|
Guillermo - Add user system test [skip ci]
|
2017-01-16 21:05:11 -03:00 |
AntonyAntonio
|
e44792c3de
|
Ivan - Add csv file [skip ci]
|
2017-01-16 20:06:22 -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 |
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
|
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 |
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 Diaz
|
db63948db7
|
Ivan - Add file upload test [skip ci]
|
2017-01-13 14:40:21 -03:00 |
AntonyAntonio
|
087a24c75c
|
Guillermo - stast architecture [skip ci]
|
2017-01-13 13:46:57 -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
|
5f5a2be76b
|
Guillermo - stast architecture [skip ci]
|
2017-01-12 18:26:06 -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 |
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
|
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
|
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 |
Ivan Diaz
|
91e539a053
|
Ivan - Fix master type [skip ci]
|
2017-01-06 18:40:33 -03:00 |
AntonyAntonio
|
d7cd5086bd
|
Guillermo - tests get/edit/recover-mail-templates [skip ci]
|
2017-01-03 21:06:45 -03:00 |
AntonyAntonio
|
78e3a4383a
|
Guillermo - path and tests staff/last-events [skip ci]
|
2017-01-03 19:02:08 -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
|
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 |
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 |
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
|
83edf85f3d
|
Guillermo - path edit-settings tests[skip ci]
|
2016-12-19 23:17:35 -03:00 |
ivan
|
05380fdfda
|
Ivan - Add transfer to department [skip ci]
|
2016-12-13 20:19:17 -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 |
AntonyAntonio
|
496dc9d939
|
Guillermo - department parths/ department tests[skip ci]
|
2016-12-12 02:12:17 -03:00 |
AntonyAntonio
|
1d90b80c90
|
Guillermo - department add owners property add tests[skip ci]
|
2016-12-10 19:06:21 -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
|
e962afba67
|
guillermo- add all test #os-101 #os-96 #os-97 #os-100[skip ci]
|
2016-12-01 15:07:11 -03:00 |
ivan
|
94fd359098
|
Ivan - Add articles paths [skip ci]
|
2016-11-22 22:27: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
|
83e3672f55
|
Ivan - Add Get all tickets and search [skip ci]
|
2016-11-04 19:10:32 -03:00 |
ivan
|
47f9042c15
|
Guillermo - Ticket-seen [skip ci]
|
2016-10-21 16:38:08 -03:00 |
Ivan Diaz
|
20b3f6ebc0
|
GuilleSabe-ticket-seen[skip ci]
|
2016-10-20 18:34:06 -03:00 |
AntonyAntonio
|
2e1b7d78f2
|
Guillermo - staff-get-new-tickets[skip ci]
|
2016-10-18 00:35:16 -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
|
17d395f8d6
|
guillermo- path- staff-get-ticket [skip ci]
|
2016-10-14 22:22:28 -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
|
6083c8731d
|
Ivan - Add delete custom response [skip ci]
|
2016-10-13 20:29:36 -03:00 |
ivan
|
dcea795f89
|
guillermo - add asign staff ticket [skip ci]
|
2016-10-07 20:32:22 -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
|
be8374fd9a
|
antonyantonio - add priority ticket backend[skip ci]
|
2016-09-29 17:09:34 -03:00 |
ivan
|
34d8e9702b
|
Ivan - Update comment tests [skip ci]
|
2016-09-29 14:41:59 -03:00 |
ivan
|
cc7c5bfb3d
|
Ivan - STAFF LOGIN - Add Staff login to backend [skip ci]
|
2016-09-25 01:16:10 -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 |
AntonyAntonio
|
2f157fe2c6
|
(Guillermo) ticketnumber stage 1 [skip ci]
|
2016-08-20 21:16:07 -03:00 |
ivan
|
10d6eebc69
|
Ivan - Backend - Add get-settings tests [skip ci]
|
2016-08-20 18:33:47 -03:00 |
AntonyAntonio
|
23604cc713
|
(Guillermo) add ruby testing for user-edit [skip ci]
|
2016-08-09 23:54:39 -03:00 |
AntonyAntonio
|
9e778f2c90
|
(Guillermo) add ruby testing for user-edit [skip ci]
|
2016-08-09 22:55:12 -03:00 |
ivan
|
c72f414f3f
|
Ivan - Fix Warning tests
|
2016-08-04 17:18:42 -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 Diaz
|
a98cf9176b
|
Merged in Full-ticket-create-logic (pull request #32)
(Guillermo) full ticket create
|
2016-08-03 15:08:57 -03:00 |
AntonyAntonio
|
0fc5bac930
|
(Guillermo) full ticket create
|
2016-08-01 00:34:55 -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 |
AntonyAntonio
|
74f9d04824
|
guillermo - code review changes again [skip ci]
|
2016-07-25 17:26:14 -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 |
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 |
AntonyAntonio
|
76ecd4ebc3
|
(Guillermo) add tests for signup validation
|
2016-07-19 17:39:26 -03:00 |
Ivan Diaz
|
342aab48b7
|
[AntonyAntonio] - Add remember me test [skip ci]
|
2016-07-15 22:16:22 -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
|
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 |
ivan
|
f4450e81de
|
Ivan - Update ownCommentList logic for tickets [skip ci]
|
2016-07-03 21:32:34 -03:00 |
AntonyAntonio
|
c0aeb36b15
|
(Guillermo) Create path /ticket/create 2.0
|
2016-06-21 20:16:43 -03:00 |
Ivan Diaz
|
d19f8132e0
|
[Guillermo Giu] - Add tests for 'ticket/create' controller
|
2016-06-17 18:43:10 -03:00 |
Ivan Diaz
|
108ebd781c
|
[Ivan Diaz] - OS-#39 - Fix test issues
|
2016-05-14 20:22:46 -03:00 |