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 |
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
|
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 |
|
AntonyAntonio
|
8f2310f855
|
Merge branch 'master' into OS154-CSV-Import
Conflicts:
server/controllers/system.php
|
2017-01-15 17:08:07 -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
|
6eae5f9299
|
Guillermo - csv import [skip ci]
|
2017-01-14 18:19:21 -03:00 |
|
AntonyAntonio
|
a9b52d7ed9
|
Merge branch 'master' into OS-149-delete-all-users
Conflicts:
server/controllers/system.php
|
2017-01-14 13:42:08 -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 |
|
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
|
1d514dda58
|
Guillermo - path-delete-all-users [skip ci]
|
2017-01-12 17:06:41 -03:00 |
|
ivan
|
134540fed9
|
Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci]
|
2017-01-12 16:45:01 -03:00 |
|
AntonyAntonio
|
845939f089
|
Guillermo - stats architecture [skip ci]
|
2017-01-11 04:25:26 -03:00 |
|
AntonyAntonio
|
a317f6a29c
|
Guillermo - paths enable/disable registration[skip ci]
|
2017-01-10 15:22:36 -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
|
c7cdfd7318
|
Guillermo - add creatae log architecture [skip ci]
|
2016-12-29 02:04:35 -03:00 |
|
AntonyAntonio
|
0000fe5159
|
Guillermo - path edit-settings[skip ci]
|
2016-12-13 02:03:35 -03:00 |
|
AntonyAntonio
|
496dc9d939
|
Guillermo - department parths/ department tests[skip ci]
|
2016-12-12 02:12:17 -03:00 |
|
ivan
|
4b7ece614f
|
Ivan - Backend - Add /system/get-settings path[skip ci]
|
2016-08-20 18:06:41 -03:00 |
|
ivan
|
4ccbd75759
|
Ivan - Add initial settings and initial mail templates [skip ci]
|
2016-07-26 18:30:51 -03:00 |