Skip to content

Commit e7d28b0

Browse files
Merge branch 'release/3.1.4.43'
2 parents 36750d1 + ae0f75f commit e7d28b0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

files_reference.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ includes/.externals/tp.config.php 361da70add00e1069f22191dbb07503c
112112
includes/avatars/.htaccess df51d5d900c2228ec1349362838401e7
113113
includes/avatars/empty_file.txt d41d8cd98f00b204e9800998ecf8427e
114114
includes/config/.htaccess 51622ead2639d535e7a955a8a7a10613
115-
includes/config/include.php 3fba0236e26bfbfcceff473a84fd31b4
115+
includes/config/include.php 75850ec18629a31925cef6eb27e73065
116116
includes/config/index.html 5f1f28d1adcb7eac03989f0ca3e7068e
117117
includes/config/settings.sample.php c966188ae4f3174b907fc467c96ac036
118118
includes/core/load.js.php 9b884e1303702bda73cf9736074588e4
@@ -404,7 +404,7 @@ pages/export.js.php 0ab7cabbe675eb9491ddb3b532b27aba
404404
pages/export.php 31bf9614d6135ad9fd9db3ba3228ac06
405405
pages/favorites.js.php 20bb5e87ecd099cd9f1d465abb19f175
406406
pages/favourites.php 022d8a3f61713acc3d43cf9c2045709d
407-
pages/fields.js.php 4b98fe5a8cc9c2adaa88bceff523e77b
407+
pages/fields.js.php 4de8e656dcf7f6a337559e1ec701a138
408408
pages/fields.php e07454000628eb17229ec5f734a7eea0
409409
pages/folders.js.php e0cdd305f848fe97a08ad8e9abcadb26
410410
pages/folders.php 522b29ad368b3889c73c0fbf6ea6135d

includes/config/include.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
define('TP_VERSION', '3.1.4');
3030
define("UPGRADE_MIN_DATE", "1761078422");
31-
define('TP_VERSION_MINOR', '42');
31+
define('TP_VERSION_MINOR', '43');
3232
define('TP_TOOL_NAME', 'Teampass');
3333
define('TP_ONE_DAY_SECONDS', 86400);
3434
define('TP_ONE_WEEK_SECONDS', 604800);

pages/fields.js.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ function(data) {
295295
editionOngoing = button.data('edit');
296296

297297
if ($('#form-field-label').val() && $('#form-field-label').val() !== '' &&
298-
$('#form-field-type').val() && typ$('#form-field-type').val() !== '' &&
298+
$('#form-field-type').val() && $('#form-field-type').val() !== '' &&
299299
$('#form-field-roles').val() && $('#form-field-roles').val() !== null && $('#form-field-roles').val().length > 0 &&
300300
$('#form-field-order').val() && $('#form-field-order').val() !== ''
301301
) {

0 commit comments

Comments
 (0)