AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-02-28 02:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,651 Commits 7 Branches 16 Tags
afe378d2f371a233b34cf852aaf16fd284ebb816
Commit Graph

4651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johnny
6a7b709a49 Merge pull request #270 from wrongecho/ticketing 
Ticketing updates
 2022-01-12 19:44:52 -05:00
Johnny
c30260abe9 Merge pull request #271 from wrongecho/payments 
Payments
 2022-01-12 19:42:58 -05:00
Johnny
2bee1d3869 Merge pull request #272 from wrongecho/global-search 
Global search
 2022-01-12 19:40:59 -05:00
johnnyq
37e97e14ef Added event description will add the rest tmrw, some other minor cleanups 2022-01-12 19:07:27 -05:00
Marcus Hill
746c7baf7b Fix login decryption, fix client listing (ish) 2022-01-12 23:07:28 +00:00
Marcus Hill
c19983d985 Define canned date if not set. Prevents undefined errors 2022-01-12 20:16:09 +00:00
Marcus Hill
7732264922 Remove edit/merge/delete options when a ticket is closed 2022-01-12 19:10:40 +00:00
Marcus Hill
4897c46cd5 Add merge ticket functionality 2022-01-12 19:01:17 +00:00
Marcus Hill
e45202d133 Redirect user to tickets main page post deletion, rather than to a random ticket. 2022-01-12 15:37:33 +00:00
Marcus Hill
e5f2740786 Fixed ticket delete button so it deletes the ticket, not the client 2022-01-12 15:36:55 +00:00
johnnyq
d272214c2d Merge branch 'master' of github.com:johnnyq/itflow 2022-01-11 17:30:34 -05:00
Johnny
ce202aab8d Merge pull request #267 from aftechro/ticket.php 
Ticket.php
 2022-01-11 17:30:24 -05:00
johnnyq
b4e93a52c0 Merge branch 'master' of github.com:johnnyq/itflow 2022-01-11 17:15:59 -05:00
Johnny
c555e5a27b Merge pull request #265 from wrongecho/264_encryption-changes 
Encryption changes
 2022-01-11 17:14:40 -05:00
Marcus Hill
2a4d42de09 Encryption changes 2022-01-11 20:42:46 +00:00
Marcus Hill
0382dbbfb2 Small change re https 2022-01-11 20:14:29 +00:00
Marcus Hill
2742410e4b http/https encryption cookie 2022-01-11 19:44:21 +00:00
Marcus Hill
fccae5dedb Typo in user id variable 2022-01-11 19:22:06 +00:00
Marcus Hill
82107679cc More. 2022-01-11 19:16:49 +00:00
Marcus Hill
8e0334aab1 More encryption updates 2022-01-11 19:03:33 +00:00
Marcus Hill
6c6b7e2255 Correct password reset 2022-01-11 18:40:08 +00:00
Marcus Hill
c66f96ae1d More encryption related changes 2022-01-11 18:28:55 +00:00
Marcus Hill
d3d39ca8ad r 2022-01-11 18:22:45 +00:00
AFTECH.RO
b9358fed4b Update ticket.php 2022-01-11 16:19:59 +00:00
AFTECH.RO
a93098ddd6 Update ticket.php 
added more info to Details card
 2022-01-11 16:16:59 +00:00
AFTECH.RO
f41d015e0d Update ticket.php 
- added related tickets for same contact 
- future to do: when clock on related ticket number, open all tickets accordingly (open and closed)
 2022-01-11 15:56:15 +00:00
Marcus Hill
951b03f712 Allow for encryption scheme upgrade 2022-01-11 14:03:34 +00:00
Marcus Hill
1dd55dbfe2 Add config_api_key column back for now, to avoid confusion 2022-01-11 11:44:10 +00:00
Marcus Hill
bbe689fb33 Remove comments as this is complete 2022-01-11 00:40:15 +00:00
Marcus Hill
3d3dc2d54d Encryption updates 2022-01-11 00:26:09 +00:00
Marcus Hill
bd7087d09c Update encrypt 2022-01-11 00:15:54 +00:00
Marcus Hill
51edb7a648 Allow backing up master key 2022-01-11 00:13:18 +00:00
Marcus Hill
aac50bdfdb More changes re encryption 2022-01-10 22:55:08 +00:00
Marcus Hill
49d895040a Add per-user password encryption using master key 2022-01-10 22:07:26 +00:00
Marcus Hill
a56d701a8a Add initial user specific encryption of site master key 2022-01-10 21:47:51 +00:00
Marcus Hill
13d83f6e3b Add session key setup 2022-01-10 21:47:12 +00:00
Marcus Hill
00be27f8f4 Remove old AES key column 2022-01-10 21:46:30 +00:00
Marcus Hill
4aaa39b3bb Rename column 2022-01-10 21:25:43 +00:00
Marcus Hill
6f419001dd Add database column for user encrypt ciphertext 2022-01-10 21:12:18 +00:00
johnnyq
6f244a1170 Merge branch 'master' of github.com:johnnyq/itflow 2022-01-09 23:09:31 -05:00
johnnyq
4892e33201 Small Fixes 2022-01-09 23:09:11 -05:00
Johnny
8e821b6e13 Merge pull request #263 from wrongecho/ticket-reply-hide 
Hide reply box if ticket is in a closed state
 2022-01-09 22:57:57 -05:00
Johnny
19ba76d0d2 Merge pull request #262 from wrongecho/setup-notes 
Setup notes
 2022-01-09 22:57:18 -05:00
Marcus Hill
4f197a6287 Hide reply box if ticket is in a closed state 2022-01-09 22:57:56 +00:00
Marcus Hill
d88da60e88 Add GNU GPL notice to setup 2022-01-09 22:46:52 +00:00
Marcus Hill
d9c13c7e40 Remove additonal 'how to use' info 2022-01-09 22:46:27 +00:00
Johnny
e1da5adbfa Merge pull request #258 from wrongecho/cookies 
Secure Cookies
 2022-01-09 12:56:30 -05:00
Johnny
c4d2334759 Merge pull request #259 from wrongecho/misc 
Misc - small changes to document tagging/files
 2022-01-09 12:55:59 -05:00
Johnny
41d2a0e327 Merge pull request #260 from wrongecho/api 
Update README
 2022-01-09 12:55:38 -05:00
johnnyq
56625c37a1 Make last respnse field sortable under tickets and client tickets 2022-01-09 12:24:12 -05:00