Commit Graph

Select branches

Hide Pull Requests

Before-Multi-Company-Removal

develop

duplicate-numbering-racecondition

master

revert-1176-Whit3XLightning-patch-2

ticket-task-approvals

undefined-asset-handling

#1000

#1001

#1002

#1003

#1004

#1005

#1006

#1007

#1008

#1009

#1010

#1011

#1012

#1013

#1014

#1015

#1016

#1019

#102

#1020

#1021

#1022

#1023

#1024

#1025

#1027

#1028

#1029

#1030

#1031

#1032

#1033

#1034

#1035

#1037

#1038

#1040

#1041

#1042

#1043

#1045

#1046

#1047

#1048

#1049

#1050

#1051

#1052

#1053

#1054

#1055

#1056

#1057

#1058

#1059

#1060

#1061

#1062

#1063

#1064

#1065

#1066

#1067

#1068

#1069

#1070

#1071

#1072

#1073

#1074

#1075

#1076

#1077

#1078

#1079

#1080

#1081

#1082

#1083

#1084

#1085

#1086

#1087

#1088

#1089

#1090

#1091

#1092

#1093

#1094

#1095

#1096

#1097

#1098

#1099

#1100

#1101

#1102

#1103

#1104

#1105

#1106

#1107

#1111

#1112

#1113

#1114

#1115

#1116

#1117

#1118

#1119

#1120

#1121

#1122

#1123

#1124

#1125

#1126

#1127

#1128

#1129

#1130

#1131

#1132

#1133

#1134

#1135

#1136

#1137

#1138

#1139

#1140

#1141

#1142

#1143

#1144

#1145

#1146

#1147

#1148

#1149

#1150

#1151

#1152

#1153

#1154

#1155

#1156

#1157

#1158

#1159

#1160

#1161

#1162

#1163

#1164

#1165

#1166

#1167

#1169

#1170

#1171

#1172

#1173

#1174

#1175

#1176

#1177

#1178

#1179

#1180

#1181

#1182

#1183

#1184

#1185

#1186

#1187

#1188

#1189

#1190

#1191

#1192

#1193

#1194

#1195

#1196

#1197

#1198

#1200

#1201

#1202

#1203

#1204

#1205

#1206

#1207

#1208

#1209

#1210

#1211

#1212

#1213

#1214

#1215

#1216

#1218

#1220

#1221

#1222

#1223

#1224

#1225

#1226

#1227

#1229

#1230

#1231

#1232

#1233

#1234

#1235

#1236

#1237

#1238

#1239

#1240

#1241

#1242

#1243

#1244

#1245

#1246

#1247

#1249

#1250

#1252

#1253

#1254

#1255

#1256

#1258

#1259

#1261

#1262

#1263

#1264

#1264

#1265

#1266

#1267

#1268

#1269

#1269

#1271

#129

#198

#228

#229

#230

#231

#233

#234

#235

#236

#239

#240

#242

#243

#244

#245

#246

#247

#248

#249

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#260

#261

#262

#263

#265

#266

#267

#270

#271

#272

#274

#276

#277

#278

#279

#280

#281

#282

#283

#284

#285

#286

#290

#291

#296

#297

#299

#307

#308

#318

#319

#320

#326

#329

#330

#333

#334

#335

#337

#339

#340

#341

#342

#343

#344

#345

#347

#348

#349

#350

#354

#355

#356

#357

#358

#359

#360

#362

#363

#364

#365

#367

#368

#369

#371

#372

#373

#374

#375

#376

#378

#379

#380

#381

#382

#383

#386

#387

#389

#390

#391

#392

#393

#394

#396

#398

#399

#400

#401

#402

#404

#405

#406

#409

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#421

#422

#423

#424

#425

#426

#427

#428

#429

#430

#432

#434

#435

#436

#437

#438

#439

#441

#442

#443

#444

#445

#447

#448

#449

#450

#451

#452

#453

#454

#455

#456

#457

#459

#460

#462

#463

#465

#468

#469

#470

#471

#472

#473

#478

#479

#480

#481

#485

#486

#488

#489

#490

#491

#492

#493

#494

#495

#499

#500

#502

#503

#504

#505

#506

#516

#517

#518

#520

#521

#523

#526

#528

#529

#533

#534

#536

#540

#541

#542

#543

#544

#545

#546

#547

#549

#550

#551

#552

#553

#554

#556

#557

#558

#559

#560

#565

#566

#568

#569

#570

#571

#573

#574

#575

#577

#578

#579

#580

#583

#584

#585

#586

#587

#588

#589

#590

#592

#593

#594

#595

#596

#597

#598

#599

#600

#602

#603

#604

#606

#607

#608

#609

#610

#611

#612

#613

#614

#615

#616

#617

#618

#619

#620

#621

#622

#623

#624

#625

#626

#628

#629

#630

#631

#632

#633

#634

#635

#636

#641

#642

#643

#644

#647

#649

#650

#651

#652

#653

#654

#655

#656

#657

#658

#659

#660

#661

#662

#663

#664

#665

#666

#667

#668

#671

#672

#674

#675

#676

#677

#678

#679

#680

#681

#682

#683

#685

#686

#687

#688

#690

#691

#692

#693

#694

#695

#698

#699

#700

#701

#702

#705

#706

#708

#709

#710

#711

#712

#713

#714

#715

#716

#717

#718

#720

#724

#725

#726

#727

#728

#729

#730

#731

#732

#733

#734

#735

#736

#737

#738

#746

#747

#748

#749

#750

#751

#752

#753

#754

#755

#756

#757

#758

#759

#760

#761

#762

#763

#764

#765

#766

#767

#768

#769

#770

#771

#772

#774

#775

#776

#777

#778

#779

#780

#781

#782

#783

#784

#785

#786

#787

#788

#789

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#800

#801

#802

#803

#804

#804

#805

#806

#807

#808

#809

#810

#811

#812

#813

#814

#815

#815

#816

#817

#818

#819

#820

#821

#822

#823

#824

#825

#826

#827

#828

#829

#830

#831

#832

#833

#834

#835

#836

#837

#838

#839

#840

#841

#842

#843

#844

#845

#846

#847

#848

#849

#850

#851

#852

#853

#854

#855

#856

#857

#858

#859

#860

#861

#862

#863

#864

#865

#866

#867

#868

#870

#871

#872

#873

#874

#875

#876

#877

#878

#879

#880

#881

#882

#883

#884

#885

#886

#887

#888

#889

#890

#891

#892

#893

#894

#895

#897

#898

#900

#902

#903

#904

#905

#907

#908

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#920

#926

#927

#928

#929

#931

#932

#934

#935

#936

#938

#939

#940

#943

#944

#945

#947

#948

#949

#950

#951

#952

#953

#954

#955

#956

#957

#958

#959

#960

#961

#962

#964

#965

#966

#967

#968

#969

#970

#971

#972

#973

#974

#975

#976

#977

#978

#979

#980

#981

#982

#983

#984

#985

#986

#987

#988

#989

#990

#991

#992

#993

#996

#997

#998

#999

v25.01

v25.01.2

v25.01.3

v25.02

v25.02.1

v25.02.2

v25.02.3

v25.02.4

v25.03

v25.05

v25.06

v25.09

v25.10

v25.11

v25.12

v26.02

v26.3

Mono Color

• 03e8c5148c Removed unused user_name VARs from ticket details johnnyq 2022-01-13 15:15:49 -05:00
• b843f530d9 Fixed ticket details assigned to and closed by, do not show closed by if not closed, do not show time worked if no time was worked, added primary location Phone number under client if exists and other minor cleanups johnnyq 2022-01-13 15:13:08 -05:00
• 48dbb3ec4c More Define canned date if not set. Prevents undefined errors Same as a48e302 johnnyq 2022-01-13 14:07:51 -05:00
• 3a18c0a0e7 Updated DB Structure to include event_description johnnyq 2022-01-12 19:49:22 -05:00
• 6a7b709a49 Merge pull request #270 from wrongecho/ticketing Johnny 2022-01-12 19:44:52 -05:00
• c30260abe9 Merge pull request #271 from wrongecho/payments Johnny 2022-01-12 19:42:58 -05:00
• 2bee1d3869 Merge pull request #272 from wrongecho/global-search Johnny 2022-01-12 19:40:59 -05:00
• 37e97e14ef Added event description will add the rest tmrw, some other minor cleanups johnnyq 2022-01-12 19:07:27 -05:00
• 746c7baf7b Fix login decryption, fix client listing (ish) Marcus Hill 2022-01-12 23:07:28 +00:00
• c19983d985 Define canned date if not set. Prevents undefined errors Marcus Hill 2022-01-12 20:16:09 +00:00
• 7732264922 Remove edit/merge/delete options when a ticket is closed Marcus Hill 2022-01-12 19:10:40 +00:00
• 4897c46cd5 Add merge ticket functionality Marcus Hill 2022-01-12 19:01:17 +00:00
• e45202d133 Redirect user to tickets main page post deletion, rather than to a random ticket. Marcus Hill 2022-01-12 15:37:33 +00:00
• e5f2740786 Fixed ticket delete button so it deletes the ticket, not the client Marcus Hill 2022-01-12 15:36:55 +00:00
• d272214c2d Merge branch 'master' of github.com:johnnyq/itflow johnnyq 2022-01-11 17:30:34 -05:00
• ce202aab8d Merge pull request #267 from aftechro/ticket.php Johnny 2022-01-11 17:30:24 -05:00
• b4e93a52c0 Merge branch 'master' of github.com:johnnyq/itflow johnnyq 2022-01-11 17:15:59 -05:00
• c555e5a27b Merge pull request #265 from wrongecho/264_encryption-changes Johnny 2022-01-11 17:14:40 -05:00
• 2a4d42de09 Encryption changes Marcus Hill 2022-01-11 20:42:46 +00:00
• 0382dbbfb2 Small change re https Marcus Hill 2022-01-11 20:14:29 +00:00
• 2742410e4b http/https encryption cookie Marcus Hill 2022-01-11 19:44:21 +00:00
• fccae5dedb Typo in user id variable Marcus Hill 2022-01-11 19:22:06 +00:00
• 82107679cc More. Marcus Hill 2022-01-11 19:16:49 +00:00
• 8e0334aab1 More encryption updates Marcus Hill 2022-01-11 19:03:33 +00:00
• 6c6b7e2255 Correct password reset Marcus Hill 2022-01-11 18:40:08 +00:00
• c66f96ae1d More encryption related changes Marcus Hill 2022-01-11 18:28:55 +00:00
• d3d39ca8ad r Marcus Hill 2022-01-11 18:22:45 +00:00
• b9358fed4b Update ticket.php AFTECH.RO 2022-01-11 16:19:59 +00:00
• a93098ddd6 Update ticket.php AFTECH.RO 2022-01-11 16:16:59 +00:00
• f41d015e0d Update ticket.php AFTECH.RO 2022-01-11 15:56:15 +00:00
• 951b03f712 Allow for encryption scheme upgrade Marcus Hill 2022-01-11 14:03:34 +00:00
• 1dd55dbfe2 Add config_api_key column back for now, to avoid confusion Marcus Hill 2022-01-11 11:44:10 +00:00
• bbe689fb33 Remove comments as this is complete Marcus Hill 2022-01-11 00:40:15 +00:00
• 3d3dc2d54d Encryption updates Marcus Hill 2022-01-11 00:26:09 +00:00
• bd7087d09c Update encrypt Marcus Hill 2022-01-11 00:15:54 +00:00
• 51edb7a648 Allow backing up master key Marcus Hill 2022-01-11 00:13:18 +00:00
• aac50bdfdb More changes re encryption Marcus Hill 2022-01-10 22:55:08 +00:00
• 49d895040a Add per-user password encryption using master key Marcus Hill 2022-01-10 22:07:26 +00:00
• a56d701a8a Add initial user specific encryption of site master key Marcus Hill 2022-01-10 21:47:51 +00:00
• 13d83f6e3b Add session key setup Marcus Hill 2022-01-10 21:47:12 +00:00
• 00be27f8f4 Remove old AES key column Marcus Hill 2022-01-10 21:46:30 +00:00
• 4aaa39b3bb Rename column Marcus Hill 2022-01-10 21:25:43 +00:00
• 6f419001dd Add database column for user encrypt ciphertext Marcus Hill 2022-01-10 21:12:18 +00:00
• 6f244a1170 Merge branch 'master' of github.com:johnnyq/itflow johnnyq 2022-01-09 23:09:31 -05:00
• 4892e33201 Small Fixes johnnyq 2022-01-09 23:09:11 -05:00
• 8e821b6e13 Merge pull request #263 from wrongecho/ticket-reply-hide Johnny 2022-01-09 22:57:57 -05:00
• 19ba76d0d2 Merge pull request #262 from wrongecho/setup-notes Johnny 2022-01-09 22:57:18 -05:00
• 4f197a6287 Hide reply box if ticket is in a closed state Marcus Hill 2022-01-09 22:57:56 +00:00
• d88da60e88 Add GNU GPL notice to setup Marcus Hill 2022-01-09 22:46:52 +00:00
• d9c13c7e40 Remove additonal 'how to use' info Marcus Hill 2022-01-09 22:46:27 +00:00
• e1da5adbfa Merge pull request #258 from wrongecho/cookies Johnny 2022-01-09 12:56:30 -05:00
• c4d2334759 Merge pull request #259 from wrongecho/misc Johnny 2022-01-09 12:55:59 -05:00
• 41d2a0e327 Merge pull request #260 from wrongecho/api Johnny 2022-01-09 12:55:38 -05:00
• 56625c37a1 Make last respnse field sortable under tickets and client tickets johnnyq 2022-01-09 12:24:12 -05:00
• cb1f0a637c Client ID, not company! Marcus Hill 2022-01-09 16:05:35 +00:00
• 7db196ebaa Update README to clarify that company ID is required when using add asset API Marcus Hill 2022-01-09 16:03:28 +00:00
• b27edc9d38 Add HTML accept attribute to add file modal to suggest allowed filetypes to user Marcus Hill 2022-01-09 15:36:28 +00:00
• 33d76f556b Check file is CSV when importing assets Marcus Hill 2022-01-09 15:34:28 +00:00
• 7a5f8b425f Delete tag associations for document when it is deleted Marcus Hill 2022-01-09 14:47:34 +00:00
• 25b58c21c8 Add Secure flag (HTTPS only) to cookies Marcus Hill 2022-01-09 13:56:45 +00:00
• 8d5a8edada Add httponly setting to cookies in check_login before session starts there too. Extension of pull #253 Marcus Hill 2022-01-09 13:19:59 +00:00
• e9b7600781 Merge pull request #257 from johnnyq/add-license-1 Johnny 2022-01-08 16:33:08 -05:00
• 01c5ba5065 Create LICENSE Johnny 2022-01-08 16:32:45 -05:00
• 3b8df8f509 Merge pull request #256 from wrongecho/more-ticket-adjust Johnny 2022-01-08 16:19:17 -05:00
• 43a85fd21c Disable assignment when ticket is closed Marcus Hill 2022-01-08 21:17:59 +00:00
• cc52295698 Add note when ticket is closed (to easily show who closed it) Marcus Hill 2022-01-08 21:08:21 +00:00
• b7f2053648 Modified time counter under tickets to use type field text instread of time as it was setting the hour and to 12 AM johnnyq 2022-01-08 15:49:41 -05:00
• c87c45df85 Used card outline instead of a full card color to differentiate between public and private ticket replies, not sure if this is enough johnnyq 2022-01-08 15:38:28 -05:00
• c8e789396b Moved Ticket Reply on top of comments for now more than likely will place it inside a modal johnnyq 2022-01-08 15:18:32 -05:00
• 48116258b9 Remove the space between the icon and text on the details of ticket details as we are using Margin Right CSS for this johnnyq 2022-01-08 15:13:09 -05:00
• 5b9b29d0e9 minor db cleanup johnnyq 2022-01-08 15:08:11 -05:00
• 4a4150616c Merge pull request #255 from wrongecho/255_ticket-improvements Johnny 2022-01-08 15:06:24 -05:00
• b908a13d32 Small edits, link to docs Marcus Hill 2022-01-08 16:59:07 +00:00
• a83f3377bd Include time worked db field. Marcus Hill 2022-01-08 16:47:17 +00:00
• c98be4c344 Add support for public/internal updates, using the existing 'email update to client' checkbox Marcus Hill 2022-01-08 16:40:04 +00:00
• 8406779b3b Add time tracking to ticket Marcus Hill 2022-01-08 16:12:04 +00:00
• 19c90aac99 Add database field for specifying ticket reply type: public/internal Marcus Hill 2022-01-08 12:52:54 +00:00
• 1f6c617a5e Add db field for ticket smiley-based feedback: Good/OK/Bad Marcus Hill 2022-01-08 12:50:57 +00:00
• 5d1848694d Moved import CSV logging out of the loop I accidentally moved it there while fixing a merge conflict, Add more to the logging and some basic code ordering johnnyq 2022-01-07 22:41:16 -05:00
• 4636f98ad0 Move scheduled tickets to a more appropriate place in cron johnnyq 2022-01-07 22:30:34 -05:00
• c41daab0c9 Tidy DB file johnnyq 2022-01-07 22:19:46 -05:00
• 04ad831053 Merge pull request #254 from wrongecho/scheduled-tickets Johnny 2022-01-07 22:03:52 -05:00
• de152c84ca Add scheduled ticket functionality to cron Marcus Hill 2022-01-07 23:56:22 +00:00
• ee5ae53a41 Updated ticket details layout and added some additional functionality thanks to @aftechro johnnyq 2022-01-07 18:20:16 -05:00
• d83c5f4176 Add frontend/backend for adding scheduled new tickets Marcus Hill 2022-01-07 22:32:23 +00:00
• 10e58c5c64 DB Structure for scheduled tickets Marcus Hill 2022-01-07 21:44:26 +00:00
• 3de0ef51ec Small fix when I tryed to resolve a merge conflict johnnyq 2022-01-07 14:47:47 -05:00
• 00a7fdb6f7 Merge pull request #252 from wrongecho/files Johnny 2022-01-07 14:39:41 -05:00
• 8118b5fc0c Merge pull request #251 from wrongecho/ticket-user Johnny 2022-01-07 14:38:56 -05:00
• e7f7429bc9 Merge pull request #250 from wrongecho/asset-csv Johnny 2022-01-07 14:38:32 -05:00
• 96510364e2 Merge branch 'master' into asset-csv Johnny 2022-01-07 14:38:04 -05:00
• 1df39836fd Merge pull request #253 from wrongecho/cookie Johnny 2022-01-07 14:28:17 -05:00
• 5d27a1717b Merge pull request #249 from wrongecho/api Johnny 2022-01-07 14:27:24 -05:00
• adf1dbe76e Cleanups johnnyq 2022-01-07 14:25:35 -05:00
• 6609e5065a Set php session cookie to be httponly Marcus Hill 2022-01-07 19:10:29 +00:00
• d0483f2472 Allow csv file upload Marcus Hill 2022-01-07 18:36:55 +00:00
• c5e976d995 Add index.php files to upload directories to prevent file traversal Marcus Hill 2022-01-07 18:35:23 +00:00
• a392ac0d85 Fix user initials in ticket reply Marcus Hill 2022-01-07 16:17:04 +00:00
• 3eff9e3d48 Add count to asset import via csv Marcus Hill 2022-01-07 16:01:30 +00:00
• 87faebd90d Add functionality to for adding new assets via API Marcus Hill 2022-01-07 15:51:22 +00:00