mirror of
https://gitea.mueller.network/extern/django-helpdesk.git
synced 2025-08-07 14:09:06 +02:00
Commit Graph
Select branches
Hide Pull Requests
main
#100
#100
#1001
#1003
#1006
#1007
#1009
#101
#101
#1011
#1013
#1014
#1017
#102
#1022
#1024
#1026
#1029
#103
#103
#1030
#1032
#1033
#1034
#1035
#1036
#1037
#1038
#104
#104
#1041
#1045
#1046
#1047
#1048
#1050
#1053
#1055
#1056
#1058
#106
#106
#1062
#1067
#1070
#1072
#1076
#108
#108
#1080
#1081
#1082
#1083
#1088
#1089
#1090
#1091
#1095
#1098
#1099
#1104
#1111
#1112
#1113
#1116
#1117
#1119
#112
#112
#1120
#1121
#1123
#1124
#1127
#1128
#113
#113
#1131
#1133
#1134
#1139
#1140
#1143
#1144
#1145
#1146
#1147
#1150
#1152
#1153
#1154
#1156
#1157
#1159
#1161
#1164
#1165
#1166
#1167
#1169
#1172
#1173
#1176
#1177
#1178
#118
#118
#1181
#1182
#1185
#1189
#1190
#1190
#1193
#1194
#1195
#1197
#1198
#1199
#1201
#1203
#1204
#1207
#1209
#1210
#1213
#1221
#1225
#1227
#1232
#1233
#1234
#1237
#1238
#1239
#124
#124
#1241
#1242
#1245
#1249
#1250
#1251
#1252
#1253
#1254
#1256
#1258
#1260
#1262
#1264
#1265
#1266
#1267
#1268
#1269
#127
#127
#1270
#1272
#1273
#1274
#1275
#1276
#1277
#1278
#1280
#1282
#1284
#1285
#1287
#1288
#1289
#1292
#1293
#1293
#1295
#131
#131
#132
#132
#133
#133
#136
#136
#137
#137
#138
#138
#139
#139
#144
#144
#153
#153
#154
#154
#156
#156
#157
#157
#158
#158
#159
#159
#166
#166
#168
#168
#169
#170
#170
#172
#172
#173
#173
#174
#174
#186
#186
#187
#189
#190
#191
#192
#206
#207
#208
#212
#214
#215
#217
#218
#220
#222
#226
#227
#228
#230
#231
#232
#235
#236
#237
#238
#239
#239
#240
#240
#242
#244
#247
#247
#25
#256
#257
#257
#259
#259
#26
#260
#261
#262
#268
#268
#27
#27
#270
#270
#271
#272
#273
#274
#281
#281
#284
#287
#29
#292
#296
#296
#298
#30
#30
#308
#314
#319
#32
#320
#321
#321
#322
#323
#328
#329
#330
#331
#332
#333
#333
#334
#34
#340
#344
#344
#349
#35
#350
#351
#352
#354
#356
#358
#361
#361
#363
#363
#364
#366
#367
#369
#370
#373
#374
#378
#378
#379
#379
#38
#380
#381
#382
#385
#387
#388
#39
#392
#393
#393
#394
#395
#397
#398
#399
#401
#402
#405
#406
#407
#409
#409
#410
#411
#412
#412
#415
#416
#417
#419
#420
#423
#426
#428
#429
#430
#432
#435
#436
#438
#440
#441
#442
#443
#445
#446
#447
#451
#452
#453
#454
#455
#457
#459
#462
#462
#463
#464
#465
#468
#469
#471
#473
#475
#476
#477
#484
#485
#486
#487
#490
#491
#494
#497
#498
#499
#501
#506
#507
#515
#517
#518
#519
#522
#524
#526
#527
#529
#53
#53
#532
#540
#542
#544
#545
#546
#547
#55
#550
#553
#554
#558
#566
#573
#574
#578
#578
#583
#586
#587
#587
#593
#594
#595
#603
#604
#61
#61
#627
#630
#631
#632
#634
#635
#636
#64
#64
#640
#645
#646
#649
#650
#651
#651
#652
#653
#660
#661
#662
#666
#671
#675
#676
#679
#680
#683
#685
#69
#69
#692
#693
#694
#696
#699
#70
#70
#705
#706
#707
#711
#715
#716
#717
#720
#722
#722
#726
#727
#728
#729
#730
#731
#733
#735
#736
#738
#742
#743
#746
#747
#748
#749
#751
#757
#759
#76
#76
#761
#762
#764
#765
#766
#769
#770
#772
#777
#778
#779
#780
#782
#784
#787
#790
#791
#792
#793
#794
#796
#797
#798
#801
#803
#804
#805
#806
#808
#812
#813
#815
#816
#817
#822
#830
#831
#833
#835
#836
#837
#838
#839
#84
#84
#840
#843
#844
#845
#847
#85
#85
#850
#853
#854
#855
#856
#859
#860
#862
#863
#869
#876
#879
#88
#88
#880
#881
#882
#883
#884
#885
#886
#887
#890
#891
#892
#893
#894
#895
#896
#898
#901
#904
#905
#906
#907
#909
#911
#913
#915
#919
#920
#923
#924
#925
#927
#932
#933
#935
#937
#939
#940
#941
#944
#946
#947
#948
#949
#950
#951
#958
#959
#961
#963
#964
#965
#967
#970
#972
#974
#978
#98
#98
#980
#981
#984
#985
#987
#989
#990
#991
#996
#999
0.1.15
0.1.16
0.1.17
0.1.18
0.2.0
0.2.1
0.2.10
0.2.11
0.2.12
0.2.13
0.2.14
0.2.15
0.2.16
0.2.17
0.2.18
0.2.19
0.2.20
0.2.21
0.2.22
0.2.23
0.2.3
0.2.4
0.2.5
0.2.6
0.2.7
0.2.8
0.2.9
0.3.0
0.3.0b1
0.3.0b3
0.3.1
0.3.2
0.3.3
0.3.4
0.3.5
0.4.0
0.4.1
0.5.0
v1.0.0
v1.0.0-docs
v1.1.0
v1.2.0
v1.3.0
v1.3.1
v1.5.0
v1.5.1
v1.6.0
v1.6.1
v1.6.2
v1.7.0
Select branches
Hide Pull Requests
main
#100
#100
#1001
#1003
#1006
#1007
#1009
#101
#101
#1011
#1013
#1014
#1017
#102
#1022
#1024
#1026
#1029
#103
#103
#1030
#1032
#1033
#1034
#1035
#1036
#1037
#1038
#104
#104
#1041
#1045
#1046
#1047
#1048
#1050
#1053
#1055
#1056
#1058
#106
#106
#1062
#1067
#1070
#1072
#1076
#108
#108
#1080
#1081
#1082
#1083
#1088
#1089
#1090
#1091
#1095
#1098
#1099
#1104
#1111
#1112
#1113
#1116
#1117
#1119
#112
#112
#1120
#1121
#1123
#1124
#1127
#1128
#113
#113
#1131
#1133
#1134
#1139
#1140
#1143
#1144
#1145
#1146
#1147
#1150
#1152
#1153
#1154
#1156
#1157
#1159
#1161
#1164
#1165
#1166
#1167
#1169
#1172
#1173
#1176
#1177
#1178
#118
#118
#1181
#1182
#1185
#1189
#1190
#1190
#1193
#1194
#1195
#1197
#1198
#1199
#1201
#1203
#1204
#1207
#1209
#1210
#1213
#1221
#1225
#1227
#1232
#1233
#1234
#1237
#1238
#1239
#124
#124
#1241
#1242
#1245
#1249
#1250
#1251
#1252
#1253
#1254
#1256
#1258
#1260
#1262
#1264
#1265
#1266
#1267
#1268
#1269
#127
#127
#1270
#1272
#1273
#1274
#1275
#1276
#1277
#1278
#1280
#1282
#1284
#1285
#1287
#1288
#1289
#1292
#1293
#1293
#1295
#131
#131
#132
#132
#133
#133
#136
#136
#137
#137
#138
#138
#139
#139
#144
#144
#153
#153
#154
#154
#156
#156
#157
#157
#158
#158
#159
#159
#166
#166
#168
#168
#169
#170
#170
#172
#172
#173
#173
#174
#174
#186
#186
#187
#189
#190
#191
#192
#206
#207
#208
#212
#214
#215
#217
#218
#220
#222
#226
#227
#228
#230
#231
#232
#235
#236
#237
#238
#239
#239
#240
#240
#242
#244
#247
#247
#25
#256
#257
#257
#259
#259
#26
#260
#261
#262
#268
#268
#27
#27
#270
#270
#271
#272
#273
#274
#281
#281
#284
#287
#29
#292
#296
#296
#298
#30
#30
#308
#314
#319
#32
#320
#321
#321
#322
#323
#328
#329
#330
#331
#332
#333
#333
#334
#34
#340
#344
#344
#349
#35
#350
#351
#352
#354
#356
#358
#361
#361
#363
#363
#364
#366
#367
#369
#370
#373
#374
#378
#378
#379
#379
#38
#380
#381
#382
#385
#387
#388
#39
#392
#393
#393
#394
#395
#397
#398
#399
#401
#402
#405
#406
#407
#409
#409
#410
#411
#412
#412
#415
#416
#417
#419
#420
#423
#426
#428
#429
#430
#432
#435
#436
#438
#440
#441
#442
#443
#445
#446
#447
#451
#452
#453
#454
#455
#457
#459
#462
#462
#463
#464
#465
#468
#469
#471
#473
#475
#476
#477
#484
#485
#486
#487
#490
#491
#494
#497
#498
#499
#501
#506
#507
#515
#517
#518
#519
#522
#524
#526
#527
#529
#53
#53
#532
#540
#542
#544
#545
#546
#547
#55
#550
#553
#554
#558
#566
#573
#574
#578
#578
#583
#586
#587
#587
#593
#594
#595
#603
#604
#61
#61
#627
#630
#631
#632
#634
#635
#636
#64
#64
#640
#645
#646
#649
#650
#651
#651
#652
#653
#660
#661
#662
#666
#671
#675
#676
#679
#680
#683
#685
#69
#69
#692
#693
#694
#696
#699
#70
#70
#705
#706
#707
#711
#715
#716
#717
#720
#722
#722
#726
#727
#728
#729
#730
#731
#733
#735
#736
#738
#742
#743
#746
#747
#748
#749
#751
#757
#759
#76
#76
#761
#762
#764
#765
#766
#769
#770
#772
#777
#778
#779
#780
#782
#784
#787
#790
#791
#792
#793
#794
#796
#797
#798
#801
#803
#804
#805
#806
#808
#812
#813
#815
#816
#817
#822
#830
#831
#833
#835
#836
#837
#838
#839
#84
#84
#840
#843
#844
#845
#847
#85
#85
#850
#853
#854
#855
#856
#859
#860
#862
#863
#869
#876
#879
#88
#88
#880
#881
#882
#883
#884
#885
#886
#887
#890
#891
#892
#893
#894
#895
#896
#898
#901
#904
#905
#906
#907
#909
#911
#913
#915
#919
#920
#923
#924
#925
#927
#932
#933
#935
#937
#939
#940
#941
#944
#946
#947
#948
#949
#950
#951
#958
#959
#961
#963
#964
#965
#967
#970
#972
#974
#978
#98
#98
#980
#981
#984
#985
#987
#989
#990
#991
#996
#999
0.1.15
0.1.16
0.1.17
0.1.18
0.2.0
0.2.1
0.2.10
0.2.11
0.2.12
0.2.13
0.2.14
0.2.15
0.2.16
0.2.17
0.2.18
0.2.19
0.2.20
0.2.21
0.2.22
0.2.23
0.2.3
0.2.4
0.2.5
0.2.6
0.2.7
0.2.8
0.2.9
0.3.0
0.3.0b1
0.3.0b3
0.3.1
0.3.2
0.3.3
0.3.4
0.3.5
0.4.0
0.4.1
0.5.0
v1.0.0
v1.0.0-docs
v1.1.0
v1.2.0
v1.3.0
v1.3.1
v1.5.0
v1.5.1
v1.6.0
v1.6.1
v1.6.2
v1.7.0
-
20f99484ea
Update quicktest configuration for Python 2 tests, to address #813
Garret Wassermann
2020-04-15 05:18:37 -04:00 -
c71d8879ec
Update copyright year in README
Garret Wassermann
2020-04-15 05:17:08 -04:00 -
b9933a8c9c
Merge pull request #808 from ilikerobots/patch-2
Garret Wassermann
2020-04-15 05:10:41 -04:00 -
4fbcdfe08b
fix for unpack requires a string argument of length 44 on py27
ilikerobots
2020-04-15 10:42:15 +03:00 -
266775dbf6
Update get_email.py
Mike Hoolehan
2020-03-18 09:11:48 +02:00 -
0e9358e61b
Merge pull request #803 from auto-mat/teams
Garret Wassermann
2020-03-04 01:02:40 -05:00 -
2f4d91c22d
Fill followup user field if authenticated user submits ticket
Andrew Denisenko
2020-03-03 23:39:02 +02:00 -
4acbb32ef5
Merge pull request #1 from auto-mat/kb_forms
Timothy Hobbs
2020-02-27 11:19:11 +00:00 -
81f835b77b
fix KBItem choose form
Petr Dlouhý
2020-02-27 11:54:04 +01:00 -
29e73158b4
make question stronger
Petr Dlouhý
2020-02-26 10:49:08 +01:00 -
782dd86680
add doctype to iframes
Petr Dlouhý
2020-02-26 10:29:53 +01:00 -
64db14148f
add KBCategory.public in admin list_display
Petr Dlouhý
2020-02-26 10:24:07 +01:00 -
e448491bf1
more blocks to the KB_category_base template, HTML validity fixes
Petr Dlouhý
2020-02-26 10:23:11 +01:00 -
93e82f5469
allow KBItems to be disabled for users
Petr Dlouhý
2020-02-25 14:46:21 +01:00 -
d0aafd6135
add KBitem.order to allow ordering items
Petr Dlouhý
2020-02-25 14:43:10 +01:00 -
5a594b7436
add KBCategory.name, improve KBCategory admin
Petr Dlouhý
2020-02-25 14:25:24 +01:00 -
07d6ee7f87
fix typo
Petr Dlouhý
2020-02-25 14:25:52 +01:00 -
cdddc79998
make Knowledge Base templates more flexibly overidable
Petr Dlouhý
2020-02-25 14:26:03 +01:00 -
1643a45457
fix<process_email>: free the log file handler after it's not used anymore
Arkadiy Korotaev
2020-02-12 20:53:00 +01:00 -
28531144db
Use default str for displaying kbitems in filter view
Timothy Hobbs
2020-02-11 17:11:41 +01:00 -
3d7860b5a3
pycodestyle fixes
Timothy Hobbs
2020-02-11 16:47:33 +01:00 -
bb9d886eea
Fix query by uncatigorized
Timothy Hobbs
2020-02-11 16:44:18 +01:00 -
74450e900a
Add team to kbitem admin table
Timothy Hobbs
2020-02-11 15:35:40 +01:00 -
2a3272914c
Show kbitem categories in kbitem string representation
Timothy Hobbs
2020-02-11 15:20:16 +01:00 -
4236c649c0
Merge pull request #801 from koriaf/master
Garret Wassermann
2020-02-06 15:50:33 -05:00 -
354debb618
fix<public>: Public ticket creation form improvements
Arkadiy Korotaev
2020-02-06 10:10:07 +01:00 -
f8c652d506
Better filtering + optional columns in ticket list view
Timothy Hobbs
2020-02-03 14:06:45 +01:00 -
c20dafe952
Use temporarilly fixed version of pinax-teams
Timothy Hobbs
2020-01-31 18:40:01 +01:00 -
cd0af7e0f5
Document new teams code
Timothy Hobbs
2020-01-27 20:01:57 +01:00 -
5b0d44ec3a
Assign KBItems to teams
Timothy Hobbs
2020-01-27 19:45:15 +01:00 -
eea76a5eb7
Do not include resolved tickets in default ticket query
Timothy Hobbs
2020-01-27 17:56:49 +01:00 -
ecbb91b861
Private kb categories
Timothy Hobbs
2020-01-27 17:37:59 +01:00 -
0395f26d6c
Don't show vote counts if there are no votes
Timothy Hobbs
2020-01-27 17:02:20 +01:00 -
e20b6d39ae
Merge pull request #798 from auto-mat/email-fix
Garret Wassermann
2020-01-23 10:15:37 -05:00 -
9963a3fe5d
Fix utf decoding bug in email parsing code
Timothy Hobbs
2020-01-23 15:30:08 +01:00 -
af2d0d59b7
Update requirements.txt for django
Garret Wassermann
2020-01-20 15:37:08 -05:00 -
6e5e8cb21f
Merge pull request #797 from auto-mat/iframe_submit
Garret Wassermann
2020-01-20 15:34:20 -05:00 -
2f8b4acf64
Fix pycodestyle errors
Timothy Hobbs
2020-01-20 14:17:23 +01:00 -
90621f575d
Fix ironic ticket creation loop when submitter email == queue email
Timothy Hobbs
2020-01-17 18:11:52 +01:00 -
df94b56b07
Fix success view
Timothy Hobbs
2020-01-16 18:23:41 +01:00 -
cd019d1128
Improvements to iframe workflow
Timothy Hobbs
2020-01-14 17:41:55 +01:00 -
07a42e07f8
Made iframe ticket submit view CSRF exempt. Hopefully this is secure!
Timothy Hobbs
2020-01-14 16:02:00 +01:00 -
4c1fda5991
Fix iframe views so they actually can be displayed
Timothy Hobbs
2020-01-13 21:15:22 +01:00 -
5da7069dbd
Add submitter email to ticket list
Timothy Hobbs
2020-01-13 15:43:47 +01:00 -
ebd876d0e2
Remove deprecated ticket_list_table.html file
Timothy Hobbs
2020-01-13 15:43:33 +01:00 -
aea091b30c
Remove duplicate entries from django ticket query
Timothy Hobbs
2020-01-10 18:04:33 +01:00 -
a1b9d18557
Update Czech translation
Timothy Hobbs
2020-01-10 15:01:52 +01:00 -
0b50b14449
Add kb tests
Timothy Hobbs
2020-01-09 17:35:05 +01:00 -
b20f600db2
KB UX improvements
Timothy Hobbs
2020-01-08 22:57:08 +01:00 -
c254336c57
Fix to voting code, downvoted_by field should be readonly
Timothy Hobbs
2020-01-08 22:30:12 +01:00 -
05bd852799
Fix pycodestyle errors
Timothy Hobbs
2020-01-08 20:38:08 +01:00 -
6a8ebd56a0
Add iframe view of KB categories
Timothy Hobbs
2020-01-08 19:36:48 +01:00 -
6579ac0e6f
Associate tickets with KB items
Timothy Hobbs
2020-01-08 18:39:41 +01:00 -
7fe6444f8f
Redo KB categories as accordion view
Timothy Hobbs
2020-01-07 13:33:06 +01:00 -
c95b24780e
Fix voting for logged in users. Voting still broken for anon users
Timothy Hobbs
2020-01-07 13:26:02 +01:00 -
5f29bb632e
Associate queues with KB categories
Timothy Hobbs
2020-01-06 14:25:37 +01:00 -
606098d947
Fix field hiding and setting code for ticket submition qargs
Timothy Hobbs
2020-01-06 14:13:31 +01:00 -
8f59bfcc3c
Update integration docs with info about iframe
Timothy Hobbs
2020-01-06 14:11:44 +01:00 -
133075f045
Fix #698
Timothy Hobbs
2019-12-16 15:03:07 +01:00 -
38cedca541
Can now hide custom fields using query param in public ticket form
Timothy Hobbs
2019-12-12 17:22:57 +01:00 -
fbae218281
Add ability to autoset custom fields in public ticket form
Timothy Hobbs
2019-12-12 17:17:17 +01:00 -
810184298f
Include custom fields in public ticket form
Timothy Hobbs
2019-12-12 16:41:55 +01:00 -
aadfe08504
Add iframe supporting view for submitting tickets
Timothy Hobbs
2019-12-12 15:22:12 +01:00 -
24b8e45f66
Add ability to hide fields in public ticket submission form using kwargs
Timothy Hobbs
2019-12-06 15:44:20 +01:00 -
3b5a7fe49a
Django <2 is no longer supported
Timothy Hobbs
2019-12-06 15:05:57 +01:00 -
d32d23e4e2
Add OR syntax to search
Timothy Hobbs
2019-11-01 17:03:17 +01:00 -
2fbd4818c1
filtering should not be mandatory
Timothy Hobbs
2019-10-31 14:40:12 +01:00 -
ef9c4c589a
Fix linting errors
Timothy Hobbs
2019-10-31 12:43:35 +01:00 -
b96d725239
Refactor query code into customizable class
Timothy Hobbs
2019-10-30 19:34:58 +01:00 -
6eee6d196c
Add timeline view for ticket queries
Timothy Hobbs
2019-10-21 19:21:22 +02:00 -
c4a1b9ed66
Move Query Results above Query Selection
Timothy Hobbs
2019-10-18 20:49:24 +02:00 -
627f2ba21b
Add search button next to user emails
Timothy Hobbs
2019-10-18 20:48:38 +02:00 -
8985fc759d
Remove hardcoded pk from test suit
Timothy Hobbs
2019-10-18 17:38:23 +02:00 -
393bbb5942
Merge pull request #796 from umgelurgel/bug/fix-demo-fixture-model-namegs
Garret Wassermann
2020-01-13 16:50:02 -05:00 -
867b1ebc59
Update the model name in the fixtures.
umgelurgel
2020-01-13 20:54:47 +01:00 -
ebf765e10e
Merge pull request #794 from koriaf/master
Garret Wassermann
2020-01-11 16:47:16 -05:00 -
66eef0a6b1
Merge pull request #793 from askvortsov1/master
Garret Wassermann
2020-01-07 10:04:10 -05:00 -
896307582a
fix<tickets>: Force HELPDESK_PUBLIC_TICKET_QUEUE for anon tickets
Arkadiy Korotaev
2020-01-07 13:47:36 +01:00 -
377e1c3250
Added better support for custom user models by not requiring a first_name attribute
Alexander Skvortsov
2020-01-06 22:18:48 -05:00 -
84456aca23
Fixed syntax error
Alexander Skvortsov
2020-01-06 20:23:35 -05:00 -
c143cb35a8
Merge pull request #792 from koriaf/master
Garret Wassermann
2020-01-04 14:29:43 -05:00 -
f72fbfa024
fix<ticket-search>: avoid exception of using function get_tickets_in_queues as property
Arkadiy Korotaev
2020-01-04 08:50:02 +01:00 -
65943e8623
Merge pull request #791 from stilet/bugfix_time_spent
Garret Wassermann
2019-12-25 03:40:20 -05:00 -
6ae7b60ef4
fix error format time_spent
Leonid
2019-12-25 11:21:47 +03:00 -
39de3ecfcc
Merge and sync with 0.2.x branch
Garret Wassermann
2019-12-24 07:50:37 -05:00 -
62e73f8a31
Bump version to 0.2.19
0.2.19
Garret Wassermann
2019-12-24 04:03:33 -05:00 -
2d129d0e31
Backport patch that will hopefully address #781
Garret Wassermann
2019-12-24 04:02:02 -05:00 -
860a30486c
Comments pass PEP-8
Garret Wassermann
2019-12-17 22:38:03 -05:00 -
103b762779
Disable broken test_autofill, unclear why it is giving integrity errors when it was working just fine not long ago, is this from a django change?
Garret Wassermann
2019-12-17 22:35:32 -05:00 -
909ecc400b
Merge pull request #790 from koriaf/master
Garret Wassermann
2019-12-17 20:45:09 -05:00 -
015b226766
fix<migrations>: correct import of b64decode in migration 0020
Arkadiy Korotaev
2019-12-17 19:25:45 +01:00 -
b6e9a2cb80
Update to jQuery 3.4.1
Garret Wassermann
2019-12-17 09:28:38 -05:00 -
b356b867bf
Update to DataTables 1.10.20
Garret Wassermann
2019-12-17 09:24:52 -05:00 -
3719cde63b
Update to Font Awesome 5.12.0
Garret Wassermann
2019-12-17 09:22:04 -05:00 -
cec4536e61
Update to Bootstrap CSS 4.4.1
Garret Wassermann
2019-12-17 09:19:05 -05:00 -
7dbf1c3b68
Possibly fix test_autofill test case integrity fail
Garret Wassermann
2019-12-17 09:11:37 -05:00 -
1784d5cf60
Follow recommendation to use == instead of keyword is
Garret Wassermann
2019-12-17 08:41:30 -05:00 -
0f52aecb5c
Update the CONTRIBUTING.rst file to match the new branch naming scheme
Garret Wassermann
2019-12-17 08:34:49 -05:00 -
105f008719
Test against python 3.8 too
Garret Wassermann
2019-12-17 08:27:05 -05:00 -
d3443edc5b
Merge develop branch for the 0.3.x release
Garret Wassermann
2019-12-17 08:23:16 -05:00