AntonyAntonio
|
78a98b9d0e
|
Guillermo - disable-user-system [skip ci]
|
2017-01-16 18:15:28 -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 |
|
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 |
|
Ivan Diaz
|
1ca57e1b76
|
Ivan - Add deploy on dev 3 changes and fixes [skip ci]
|
2017-01-10 17:07:49 -03:00 |
|
AntonyAntonio
|
51357c2cd8
|
Guillermo - path edit/recover-mail-templates [skip ci]
|
2017-01-03 20:35:46 -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 |
|
AntonyAntonio
|
5c2f482c10
|
Guillermo - add path /user/verify [skip ci]
|
2016-12-22 03:07:06 -03:00 |
|
ivan
|
05380fdfda
|
Ivan - Add transfer to department [skip ci]
|
2016-12-13 20:19:17 -03:00 |
|
Ivan Diaz
|
d57baa6cd8
|
Guillermo - staff/dellete[skip ci]
|
2016-12-07 17:24:42 -03:00 |
|
AntonyAntonio
|
8dd11af96b
|
Guillermo - path / staff/add[skip ci]
|
2016-12-05 23:17:18 -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
|
94fd359098
|
Ivan - Add articles paths [skip ci]
|
2016-11-22 22:27:05 -03:00 |
|
ivan
|
83e3672f55
|
Ivan - Add Get all tickets and search [skip ci]
|
2016-11-04 19:10:32 -03:00 |
|
ivan
|
920d7248f5
|
guillermo- path-ticket-change-priority [skip ci]
|
2016-10-15 04:32:38 -03:00 |
|
ivan
|
db97ee09b7
|
guillermo - add asign staff ticket [skip ci]
|
2016-10-07 19:03:21 -03:00 |
|
ivan
|
2b50837603
|
Ivan - Add CustomResponse tests [skip ci]
|
2016-10-04 18:42:47 -03:00 |
|
ivan
|
84b33ea871
|
Ivan - Add CustomResponse model and paths [skip ci]
|
2016-10-03 16:44:41 -03:00 |
|
ivan
|
0bed4bef45
|
Ivan - Add events to backend [skip ci]
|
2016-09-29 14:34:20 -03:00 |
|
ivan
|
07bc533681
|
Max Red - Create login page [skip ci]
|
2016-09-22 18:23:53 -03:00 |
|
ivan
|
06ad75b688
|
Ivan - Backend - Fixes to make frontend work with API [skip ci]
|
2016-09-09 02:24:12 -03:00 |
|
ivan
|
5972427cf2
|
Merge branch 'master' into captcha
|
2016-08-20 19:22:17 -03:00 |
|
ivan
|
4f5f91994d
|
Ivan - Backend - Add Captcha validation [skip ci]
|
2016-08-20 18:24:22 -03:00 |
|
AntonyAntonio
|
2aa2c59722
|
(Guillermo) actualization recover-password [skip ci]
|
2016-08-15 20:15:09 -03:00 |
|
AntonyAntonio
|
54da0699dd
|
(Guillermo) path-user-edit and mailsender [skip ci]
|
2016-08-07 23:21:48 -03:00 |
|
ivan
|
830e2115a3
|
Ivan - Add ruby api testing for comment/create
|
2016-08-04 15:41:22 -03:00 |
|
ivan
|
d6853b3a4b
|
Ivan - Fix all list/beanInstance functionality
|
2016-08-04 00:59:04 -03:00 |
|
ivan
|
eccc0b5a29
|
Ivan - Implent NullDataStore pattern, refactor login controller, add get-setting and set-setting controllers
|
2016-07-27 13:58:19 -03:00 |
|
ivan
|
4ccbd75759
|
Ivan - Add initial settings and initial mail templates [skip ci]
|
2016-07-26 18:30:51 -03:00 |