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
|
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 |
|
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
|
b8d24b601d
|
Guillermo - stats architecture [skip ci]
|
2017-01-12 16:30:58 -03:00 |
|
AntonyAntonio
|
397246aa4b
|
Guillermo - paths enable/disable registration[skip ci]
|
2017-01-10 16:04:25 -03:00 |
|
AntonyAntonio
|
d7cd5086bd
|
Guillermo - tests get/edit/recover-mail-templates [skip ci]
|
2017-01-03 21:06:45 -03:00 |
|
AntonyAntonio
|
af4853ed51
|
Guillermo - path and tests staff/last-events [skip ci]
|
2017-01-03 18:52:18 -03:00 |
|
AntonyAntonio
|
83edf85f3d
|
Guillermo - path edit-settings tests[skip ci]
|
2016-12-19 23:17:35 -03:00 |
|
AntonyAntonio
|
496dc9d939
|
Guillermo - department parths/ department tests[skip ci]
|
2016-12-12 02:12:17 -03:00 |
|
ivan
|
895fbf011f
|
GUILLERMO - all test staff [skip ci]
|
2016-12-08 03:21:37 -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
|
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 |
|
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
|
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
|
dcea795f89
|
guillermo - add asign staff ticket [skip ci]
|
2016-10-07 20:32:22 -03:00 |
|
ivan
|
684bdb1a25
|
Ivan - Add CustomResponse tests [skip ci]
|
2016-10-03 16:57:12 -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
|
10d6eebc69
|
Ivan - Backend - Add get-settings tests [skip ci]
|
2016-08-20 18:33:47 -03:00 |
|
AntonyAntonio
|
9e778f2c90
|
(Guillermo) add ruby testing for user-edit [skip ci]
|
2016-08-09 22:55:12 -03:00 |
|
ivan
|
855c99398d
|
Ivan - Fix ticket creation and comment
|
2016-08-04 01:37:23 -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
|
dc3df30ef6
|
(Guillermo) recover password
|
2016-07-22 04:44:55 -03:00 |
|
Ivan Diaz
|
9d378d07e5
|
Ivan - Add local storage class [skip ci]
|
2016-07-20 20:39:36 -03:00 |
|
Ivan Diaz
|
342aab48b7
|
[AntonyAntonio] - Add remember me test [skip ci]
|
2016-07-15 22:16:22 -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 |