ivan
|
d4263d4b94
|
Ivan - Fix uploading of files
|
2017-02-18 15:28:23 -03:00 |
ivan
|
0bd07ef211
|
Ivan - Add token ticket for backend [skip ci]
|
2017-01-21 01:17:28 -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
|
e8e29d8701
|
Ivan - Fix static ticketevent
|
2017-01-15 01:36:04 -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 |
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
|
134540fed9
|
Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci]
|
2017-01-12 16:45:01 -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 Diaz
|
1ca57e1b76
|
Ivan - Add deploy on dev 3 changes and fixes [skip ci]
|
2017-01-10 17:07:49 -03:00 |
Ivan Diaz
|
a113d547d2
|
Ivan - Add verification token return data for backend [skip ci]
|
2017-01-10 13:19:36 -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 |
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 |
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 |
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
|
5c2f482c10
|
Guillermo - add path /user/verify [skip ci]
|
2016-12-22 03:07:06 -03:00 |
AntonyAntonio
|
69c3410e03
|
Guillermo - add test supported languages [skip ci]
|
2016-12-21 01:09:35 -03:00 |
AntonyAntonio
|
b26db547dc
|
Guillermo - add supported languages[skip ci]
|
2016-12-20 23:29:19 -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 |
AntonyAntonio
|
1a3adfe418
|
Guillermo - path / staff/get-all[skip ci]
|
2016-12-07 01:37:18 -03:00 |
ivan
|
cbc4c15101
|
Ivan - Fix issues with release block 2 part 2
|
2016-12-04 23:51:45 -03:00 |
ivan
|
f6ae50ef87
|
guillermo- banning architecture [skip ci]
|
2016-11-30 19:16:18 -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 Diaz
|
323b481c62
|
Merged in OS-116-Ticket-events (pull request #78)
OS-116 ticket events
|
2016-11-20 21:59:18 +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 |
ivan
|
47f9042c15
|
Guillermo - Ticket-seen [skip ci]
|
2016-10-21 16:38:08 -03:00 |
AntonyAntonio
|
ef3bd809aa
|
Guillermo - ticket-seen[skip ci]
|
2016-10-21 01:08:06 -03:00 |
AntonyAntonio
|
d9124eb21a
|
Guillermo - staff-un-assign-ticket[skip ci]
|
2016-10-17 23:19:04 -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
|
84b33ea871
|
Ivan - Add CustomResponse model and paths [skip ci]
|
2016-10-03 16:44:41 -03:00 |