snipe
|
3de656f5c6
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2023-09-28 19:20:27 +01:00 |
|
snipe
|
3b4004ac18
|
Merge pull request #13677 from snipe/feature/sc-14880
Set modal focus to modal-name field
|
2023-09-28 19:18:16 +01:00 |
|
snipe
|
0bf423cda9
|
Set modal focus to modal-name field
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 19:16:40 +01:00 |
|
snipe
|
96c6c93197
|
Merge pull request #13674 from snipe/bug/sc-23774
Fixed bug where license checkout/checkin notes were not being saved
|
2023-09-28 18:37:47 +01:00 |
|
snipe
|
6fa0d42bc2
|
Fixed bug where license checkout/checkin notes were not being saved
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 15:40:18 +01:00 |
|
snipe
|
cfe6b07b3a
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2023-09-28 15:15:50 +01:00 |
|
snipe
|
7512400b56
|
Merge pull request #13672 from snipe/feature/sc-23772
Fixed #13662 - added clipboard.js
|
2023-09-28 15:13:42 +01:00 |
|
snipe
|
1acb14a39f
|
Moved dragtable css
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 15:12:44 +01:00 |
|
snipe
|
bb7a41628a
|
Fixed #13662 - added clipboard.js
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 15:06:55 +01:00 |
|
snipe
|
68c9fac971
|
Merge remote-tracking branch 'origin/develop'
|
2023-09-28 14:25:31 +01:00 |
|
snipe
|
402ff58628
|
Merge pull request #13671 from snipe/bug/sc-23773
Fixed #13670 - order number missing from license import
|
2023-09-28 14:24:49 +01:00 |
|
snipe
|
492fb15036
|
Fixed #13670 - order number missing from license import
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 14:24:07 +01:00 |
|
snipe
|
ac7f85fea9
|
Merge remote-tracking branch 'origin/develop'
|
2023-09-28 03:32:57 +01:00 |
|
snipe
|
cc4cb14e9d
|
Merge pull request #13667 from snipe/bug/sc-23771
Fixed #13658 for asset history with encrypted fields
|
2023-09-28 03:29:06 +01:00 |
|
snipe
|
ee72c92d4f
|
Fix for asset history with enfrypted fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 03:00:49 +01:00 |
|
snipe
|
3aeea007b2
|
Merge remote-tracking branch 'origin/develop'
|
2023-09-26 15:26:21 +01:00 |
|
snipe
|
048ad57418
|
Merge pull request #13657 from snipe/fixes/revert_column_sorting_temp
Commented out sortable columns
|
2023-09-26 15:25:58 +01:00 |
|
snipe
|
7bcb28d8fd
|
Commented out sortable columns
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-26 15:24:20 +01:00 |
|
snipe
|
660abeca9e
|
Merge pull request #13638 from marcusmoore/bug/sc-20704
Fixed exception being thrown when selected import was deleted
|
2023-09-26 15:00:35 +01:00 |
|
snipe
|
0c31d5749c
|
Merge remote-tracking branch 'origin/develop'
|
2023-09-26 14:47:25 +01:00 |
|
snipe
|
1509339b68
|
Merge pull request #13655 from snipe/bug/sc-23759
Fixed bug where checkout to location would throw an error if FMCS was enabled
|
2023-09-26 14:37:36 +01:00 |
|
snipe
|
81ae32d3f9
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-26 14:33:51 +01:00 |
|
snipe
|
279e6c7e4f
|
Check for null company ID
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-26 14:33:42 +01:00 |
|
snipe
|
16498fdcf8
|
Merge remote-tracking branch 'origin/develop'
|
2023-09-25 13:46:33 +01:00 |
|
snipe
|
81a982fd77
|
Merge pull request #13650 from snipe/features/more_info_in_settings
Features/more info in settings
|
2023-09-25 13:46:00 +01:00 |
|
snipe
|
619712b927
|
Fixed table
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-25 13:45:46 +01:00 |
|
snipe
|
359cd2a267
|
A few more config options
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-25 13:28:13 +01:00 |
|
snipe
|
13bee63fe9
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-09-25 10:59:09 +01:00 |
|
snipe
|
f6317695f9
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-25 10:58:14 +01:00 |
|
snipe
|
e4696138ba
|
Merge pull request #13647 from snipe/localization/new_translations
Localization/new translations
|
2023-09-25 10:57:02 +01:00 |
|
snipe
|
bd0863d9c7
|
Added new translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-25 10:54:46 +01:00 |
|
snipe
|
28cd0085b7
|
Added Khmer as an available language
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-25 10:54:32 +01:00 |
|
snipe
|
456d55c3bd
|
Added some mail settings to /settings for easier reference
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-21 16:14:47 +01:00 |
|
Marcus Moore
|
5a88a64ebd
|
Remove unnecessary redirect
|
2023-09-20 17:35:34 -07:00 |
|
Marcus Moore
|
b1199100a0
|
Display error message if import file deleted before it can be selected
|
2023-09-20 17:22:12 -07:00 |
|
snipe
|
7c908fecd9
|
Merge pull request #12992 from spencerrlongg/features/12853
Adds tag for docker builds
|
2023-09-20 19:36:22 +01:00 |
|
snipe
|
cdd0de15b5
|
Merge pull request #13634 from marcusmoore/chore/add-factories-to-autolabeler
Added factories to autolabeler action
|
2023-09-20 17:51:34 +01:00 |
|
snipe
|
46981da400
|
Merge pull request #13635 from marcusmoore/bug/sc-23715
Added unique() to some factory properties
|
2023-09-20 17:51:22 +01:00 |
|
Marcus Moore
|
90e75a3e2c
|
Add unique() to some factory properties
|
2023-09-19 17:02:18 -07:00 |
|
Marcus Moore
|
cd538a4ad8
|
Add factories to autolabeler action
|
2023-09-19 16:07:26 -07:00 |
|
snipe
|
5a5b07f5a5
|
Merge remote-tracking branch 'origin/develop'
|
2023-09-19 10:22:59 +01:00 |
|
snipe
|
439c2e095d
|
Merge pull request #13629 from snipe/bug/sc-23745
Fixed #13628 - removed duplicate favicon tag
|
2023-09-19 10:22:36 +01:00 |
|
snipe
|
14c0517927
|
Fixed #13628 - removed duplicate favicon tag
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-19 10:21:38 +01:00 |
|
snipe
|
d84d26febf
|
Merge remote-tracking branch 'origin/develop'
|
2023-09-18 22:31:41 +01:00 |
|
snipe
|
753a5f789e
|
Merge pull request #13623 from snipe/fixes/dependabot_target
Made develop the target branch for dependabot
|
2023-09-18 22:31:11 +01:00 |
|
snipe
|
d7790cd16b
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-18 22:24:15 +01:00 |
|
snipe
|
8ecc0651ed
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2023-09-18 22:23:58 +01:00 |
|
snipe
|
a8b2089275
|
Merge pull request #13627 from snipe/fixes/dependabot_13616
Replaces #13616 - Bump docker/metadata-action from 4 to 5
|
2023-09-18 22:20:06 +01:00 |
|
snipe
|
a46a11d554
|
Replaces #13616 - Bump docker/metadata-action from 4 to 5
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-18 22:19:31 +01:00 |
|
snipe
|
d444b620c5
|
Merge pull request #13626 from snipe/fixes/dependabot_13617
Replaces #13617 - Bump docker/setup-buildx-action from 2 to 3
|
2023-09-18 22:18:04 +01:00 |
|