Ivan Diaz
|
858add6443
|
Ivan - Create install step 5 WIP
|
2017-06-07 02:29:25 -03:00 |
|
Ivan Diaz
|
ec34acc080
|
Ivan - Avoid verification if smtp is not set. Implement singleton pattern in MailSender class
|
2017-06-05 11:41:52 -03:00 |
Kallys
|
d576ec726e
|
Allow users to close their tickets with user system disabled
|
2017-06-01 12:14:23 +02:00 |
|
ivan
|
6d58c44915
|
Ivan - Update controller documentations
|
2017-05-12 01:58:40 -03:00 |
|
ivan
|
145b73b3c8
|
Ivan - Update model documentations.
|
2017-05-11 16:37:03 -03:00 |
|
ivan
|
cb0cb7e16a
|
Ivan - Create API documentation json.
|
2017-05-11 00:33:32 -03:00 |
|
Ivan Diaz
|
8ad1145ffc
|
Update init-settings.php
|
2017-04-23 02:21:45 -03:00 |
AntonyAntonio
|
7a6eccb1bd
|
Merge branch 'DataAPI'
|
2017-04-21 22:41:29 -03:00 |
|
AntonyAntonio
|
a76eacb52b
|
Guillermo - things [skip ci]
|
2017-04-21 22:33:17 -03:00 |
|
AntonyAntonio
|
ce63b407e0
|
Guillermo - things [skip ci]
|
2017-04-21 03:09:24 -03:00 |
|
ivan
|
81d97fa271
|
Ivan - Reset configuration
|
2017-04-21 02:20:42 -03:00 |
|
ivan
|
e8ee0427d0
|
Ivan - Fix some issues [skip ci]
|
2017-04-21 01:43:06 -03:00 |
|
AntonyAntonio
|
3f2157ac4e
|
Guillermo - things [skip ci]
|
2017-04-21 00:34:20 -03:00 |
|
ivan
|
7b8226f579
|
Ivan - Fix StaffEditor issues [skip ci]
|
2017-04-20 21:54:04 -03:00 |
|
ivan
|
7792d6b527
|
Ivan - Add error documentation [skip ci]
|
2017-04-20 02:23:30 -03:00 |
|
ivan
|
b985d02f1b
|
Ivan - Add error documentation
|
2017-04-20 02:07:55 -03:00 |
|
AntonyAntonio
|
2b50c7a106
|
Guillermo - data staff [skip ci]
|
2017-04-18 01:39:55 -03:00 |
|
AntonyAntonio
|
8bc74384c2
|
Guillermo - data articles [skip ci]
|
2017-04-17 21:40:44 -03:00 |
|
AntonyAntonio
|
e3683ba1a4
|
Guillermo - data system [skip ci]
|
2017-04-17 21:09:16 -03:00 |
|
AntonyAntonio
|
be3d74ab92
|
Guillermo - data ticket [skip ci]
|
2017-04-16 23:59:11 -03:00 |
|
AntonyAntonio
|
81e9c632b3
|
Guillermo - data user [skip ci]
|
2017-04-16 02:35:04 -03:00 |
|
ivan
|
892e1536a2
|
Ivan - Fix installation in subfolder and file permissions
|
2017-04-10 22:30:39 -03:00 |
|
ivan
|
826d2f1eed
|
Ivan - Fix email template
|
2017-03-31 01:36:37 -03:00 |
|
ivan
|
d10de13626
|
Ivan - Fix installation issues [skip ci]
|
2017-03-30 20:37:55 -03:00 |
|
ivan
|
e49d93dbb0
|
Ivan - Fix Issues with installation process [skip ci]
|
2017-03-29 18:53:00 -03:00 |
|
ivan
|
48614fcc00
|
Ivan - Fix Installation issues [skip ci]
|
2017-03-29 18:46:26 -03:00 |
|
ivan
|
3047831864
|
Ivan - Fix language translations [skip ci]
|
2017-03-20 17:21:22 -03:00 |
|
ivan
|
88657ea76a
|
Ivan - Update email translations [skip ci]
|
2017-03-19 18:07:56 -03:00 |
|
ivan
|
a244a58ebc
|
Ivan - Add all mail templates [skip ci]
|
2017-03-16 20:00:21 -03:00 |
|
ivan
|
fdfcb751d3
|
Ivan - Add nice styling to emails [skip ci]
|
2017-03-16 18:29:39 -03:00 |
|
ivan
|
475d11ccac
|
Ivan - Fix PHPMailer configurations, improve user system install [skip ci]
|
2017-03-16 16:11:27 -03:00 |
|
ivan
|
05f0d453e1
|
Ivan - Fix smtp server [skip ci]
|
2017-03-15 17:28:23 -03:00 |
|
ivan
|
2a4590df2d
|
Ivan - Fix installation tests [skip ci]
|
2017-03-15 16:17:06 -03:00 |
|
ivan
|
339a36e260
|
Ivan - Add default config [skip ci]
|
2017-03-15 02:20:18 -03:00 |
|
ivan
|
46e3e65a0b
|
Ivan - Add installation service backend [skip ci]
|
2017-03-15 02:17:16 -03:00 |
|
ivan
|
62f5354b6c
|
Ivan - Fix dates [skip ci]
|
2017-03-04 19:20:44 -03:00 |
|
ivan
|
9d8c1a6225
|
Ivan - Fix dates [skip ci]
|
2017-03-04 19:07:14 -03:00 |
|
ivan
|
8c138b481c
|
Ivan - Fix csv import, remove sql import, add i18h keys for advanced settings [skip ci]
|
2017-03-04 18:38:49 -03:00 |
|
Ivan Diaz
|
484bfd4e99
|
Ivan - Fix enabling user system [skip ci]
|
2017-03-04 02:57:51 -03:00 |
|
ivan
|
6bff8e1493
|
Ivan - Add new logo, fix user system disabled architecture [skip ci]
|
2017-03-03 21:39:59 -03:00 |
|
ivan
|
3de5196dd5
|
Ivan - Add XSS protection backend [skip ci]
|
2017-03-02 02:56:42 -03:00 |
|
ivan
|
f175669dc0
|
Ivan - Allow international characters improve text editor [skip ci]
|
2017-03-02 00:00:45 -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
|
3d27415041
|
Ivan - Fix stats
|
2017-02-18 20:58:31 -03:00 |
|
Ivan Diaz
|
2189c18a3c
|
Ivan - Fix some staff edition issues [skip ci]
|
2017-02-18 19:47:19 -03:00 |
|
ivan
|
d4263d4b94
|
Ivan - Fix uploading of files
|
2017-02-18 15:28:23 -03:00 |
|
ivan
|
f9ad440bf2
|
Ivan - Fix download get
|
2017-02-15 16:14:27 -03:00 |
|
ivan
|
8f02a08018
|
Ivan - Update profile pic upload [skip ci]
|
2017-02-09 17:05:59 -03:00 |
|
ivan
|
6f1638e5fe
|
Ivan - Update backend methods [skip ci]
|
2017-02-08 15:09:15 -03:00 |
|
ivan
|
0bd07ef211
|
Ivan - Add token ticket for backend [skip ci]
|
2017-01-21 01:17:28 -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
|
78a98b9d0e
|
Guillermo - disable-user-system [skip ci]
|
2017-01-16 18:15:28 -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 |
|
AntonyAntonio
|
565c60c198
|
Guillermo - csv import [skip ci]
|
2017-01-15 17:33:33 -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
|
e8e29d8701
|
Ivan - Fix static ticketevent
|
2017-01-15 01:36:04 -03:00 |
|
Ivan Diaz
|
bfcb02b311
|
Merged in os-147-151-file-architecture-and-backup (pull request #123)
Os 147 151 file architecture and backup
|
2017-01-15 00:02:45 -03:00 |
|
Ivan Diaz
|
575f34256a
|
Ivan - Fix unit testing backend
|
2017-01-14 23:51:31 -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
|
35d9a166cf
|
Ivan - Add file download component [skip ci]
|
2017-01-14 21:44:20 -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 |
|
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
|
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
|
71984384cc
|
Ivan - Add validations before download and upload on comment [skip ci]
|
2017-01-12 20:31:12 -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
|
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
|
b8d24b601d
|
Guillermo - stats architecture [skip ci]
|
2017-01-12 16:30:58 -03:00 |
|
ivan
|
be49990091
|
Ivan - Add files folder [skip ci]
|
2017-01-12 03:02:56 -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
|
9383fd0d3e
|
Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react
# Conflicts:
# server/controllers/system/get-settings.php
|
2017-01-11 03:50:47 -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
|
3299c3dd8d
|
Ivan - Deploy changes [skip ci]
|
2017-01-11 00:21:27 -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 |
|
AntonyAntonio
|
a317f6a29c
|
Guillermo - paths enable/disable registration[skip ci]
|
2017-01-10 15:22:36 -03:00 |
|
Ivan Diaz
|
a113d547d2
|
Ivan - Add verification token return data for backend [skip ci]
|
2017-01-10 13:19:36 -03:00 |
|
ivan
|
5ea4137e41
|
Max Red - Finally we did it! [skip ci]
|
2017-01-05 18:01:56 -03:00 |
|
ivan
|
1465a53616
|
Merge branch 'master' into os-143-last-activity
# Conflicts:
# client/src/data/languages/en.js
|
2017-01-05 16:27:19 -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 |
|
Ivan Diaz
|
dad5d0bd86
|
Ivan - Update settings values [skip ci]
|
2017-01-04 19:29:23 -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 |
|
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
|
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 |