Commit Graph

5615 Commits

Author SHA1 Message Date
Johnny
96510364e2 Merge branch 'master' into asset-csv 2022-01-07 14:38:04 -05:00
Johnny
1df39836fd Merge pull request #253 from wrongecho/cookie
Set PHP session cookie to be httponly
2022-01-07 14:28:17 -05:00
Johnny
5d27a1717b Merge pull request #249 from wrongecho/api
API Changes - General refactor & Add asset via API
2022-01-07 14:27:24 -05:00
johnnyq
adf1dbe76e Cleanups 2022-01-07 14:25:35 -05:00
Marcus Hill
6609e5065a Set php session cookie to be httponly 2022-01-07 19:10:29 +00:00
Marcus Hill
d0483f2472 Allow csv file upload 2022-01-07 18:36:55 +00:00
Marcus Hill
c5e976d995 Add index.php files to upload directories to prevent file traversal 2022-01-07 18:35:23 +00:00
Marcus Hill
a392ac0d85 Fix user initials in ticket reply 2022-01-07 16:17:04 +00:00
Marcus Hill
3eff9e3d48 Add count to asset import via csv 2022-01-07 16:01:30 +00:00
Marcus Hill
87faebd90d Add functionality to for adding new assets via API 2022-01-07 15:51:22 +00:00
Marcus Hill
d420cd691d Initial API restructure 2022-01-07 15:21:09 +00:00
Johnny
2bfb50616c Merge pull request #248 from wrongecho/import_asset_csv
Add basic asset import functionality
2022-01-06 20:20:48 -05:00
Marcus Hill
5dc9eb4d1d Add basic asset import functionality 2022-01-07 00:58:38 +00:00
Johnny
b8ea7ca2f9 Merge pull request #247 from aftechro/patch-1
Update client_contacts.php
2022-01-06 19:35:21 -05:00
AFTECH.RO
f476d0ea7f Update client_contacts.php
added the info of the contact type - for approval procedures/purposes
2022-01-07 00:26:24 +00:00
Johnny
a4b264143a Merge pull request #245 from aftechro/tickets.php
Update tickets.php
2022-01-06 19:14:56 -05:00
Johnny
f82ba721ba Merge pull request #246 from aftechro/client_tickets.php
Update client_tickets.php
2022-01-06 19:13:33 -05:00
Johnny
5170decf72 Merge pull request #240 from wrongecho/ticket-status
Update ticket status in database after a ticket reply.
2022-01-06 19:12:47 -05:00
AFTECH.RO
1c487b225c Update client_tickets.php
- re-arranged the table items display
2022-01-06 23:40:40 +00:00
AFTECH.RO
97f49826bf Update tickets.php
- open ticket when click on both ticket number and subject
- re-arranged the table elements display 
- added from email address of within the company (can be left From email or from Contact of the company - or both :D )
2022-01-06 23:23:47 +00:00
Marcus Hill
d37dd77637 Update ticket status in database after a ticket reply. 2022-01-06 22:59:23 +00:00
johnnyq
8e8b28df40 Fixed Querying wihtin Invoice status 2022-01-06 11:21:10 -05:00
johnnyq
0047198bcd Added hidden status variable upon search form POSt under tickets to allow querying within a status 2022-01-05 22:40:26 -05:00
johnnyq
c6bafa9420 Enhanced @wrongcho Link ticket assets Merge 2022-01-05 22:28:29 -05:00
johnnyq
16344aa1a6 update DB Structure set to primary keys for documents_tagged move client_id last for consistancy as its a foriegn key for document_tags 2022-01-05 21:38:47 -05:00
Johnny
62470c1c45 Merge pull request #239 from wrongecho/doc-tags
Add tag functionality to documents
2022-01-05 21:27:31 -05:00
Johnny
733e56cd8c Merge pull request #236 from wrongecho/client-bugs
Client bugs
2022-01-05 21:25:09 -05:00
Johnny
3455d2c576 Merge pull request #235 from wrongecho/readme-typo
Fix readme typos/slight rewording
2022-01-05 21:23:50 -05:00
Marcus Hill
77d7e7ba0d Add tag functionality to documents 2022-01-05 21:58:10 +00:00
Marcus Hill
93853b77b4 Add confirmation for client deletion from the client summary banner 2022-01-05 14:27:20 +00:00
Marcus Hill
a48e3029f1 Ensure canned_date is defined before it is referenced, to prevent errors 2022-01-05 14:21:06 +00:00
Marcus Hill
a4497dd901 Require primary contact be populated when client is created. Otherwise, records such as tickets loop/fail to be created (due to no contact) 2022-01-05 14:18:18 +00:00
Marcus Hill
e298883e51 Fix readme typos/slight rewording 2022-01-05 14:05:39 +00:00
Johnny
e6c2f90e02 Merge pull request #233 from wrongecho/tickets
Tidy/Bugfix tickets
2022-01-05 00:47:23 -05:00
Johnny
6c6150011a Merge pull request #234 from wrongecho/alert-type
Bug fix: Default alert type
2022-01-05 00:46:54 -05:00
Johnny
656bb3c5d5 Merge pull request #231 from wrongecho/ticket-assets
Link ticket assets
2022-01-05 00:46:32 -05:00
Marcus Hill
51a4469cfa Set default alert type to primary, as sometimes we set alert_message in session, but not alert_type, causing errors 2022-01-04 22:38:50 +00:00
Marcus Hill
913d41e4b3 Tidy/Fix undefine variable errors, improve open/closed ticket filtering, still needs some work as open/close state is lost after search 2022-01-04 21:55:45 +00:00
Marcus Hill
f6900ae993 Allow linking of asset to a ticket via edit modal 2022-01-04 20:22:27 +00:00
Marcus Hill
57517f5122 Merge branch 'master' of https://github.com/wrongecho/itflow 2022-01-04 17:35:38 +00:00
Marcus Hill
b5cee625ce Merge branch 'master' of https://github.com/johnnyq/itflow 2022-01-04 17:35:05 +00:00
wrongecho
670795431a Merge branch 'johnnyq:master' into master 2022-01-04 17:31:51 +00:00
johnnyq
7112463e41 Commit Tidy allow public_cert to be null and move public_cert before notes 2022-01-04 11:35:34 -05:00
Johnny
c59e2e938c Merge pull request #229 from wrongecho/config-writeable
Check that config.php is writable at the start of setup.
2022-01-04 11:25:27 -05:00
Johnny
82ba4d3b5a Merge pull request #230 from wrongecho/cert-add-key
Add support for storing client certificate public key
2022-01-04 11:24:00 -05:00
Marcus Hill
21a22cb309 Ignore 2022-01-04 03:33:47 +00:00
Marcus Hill
ae98902a96 Add support for storing client certificate public key 2022-01-04 03:32:50 +00:00
Marcus Hill
dfbf0c788a Check that config.php is writable at the start of setup. 2022-01-04 03:21:04 +00:00
johnnyq
de883f9ff5 Fixed Add Recurring and Edit Recurring Invoices going to a blank screen after submit this was due to a missing history_status var, Removed Activate and Deactivate from recurring list and the buttons from recurring details as this can be modified using edit recurring, Removed Redundant Force Send action on recurring list views, this can be accessed by going to the recurring details. 2022-01-02 13:39:25 -05:00
johnnyq
b8a1af2e0f Show Ticket Reply Modified date if applicable 2022-01-02 01:50:18 -05:00