snipe
|
9a0db72eb4
|
More strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 15:40:38 +01:00 |
|
snipe
|
e11a42cf68
|
Re-use login string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 15:32:00 +01:00 |
|
snipe
|
114769c2d9
|
Made requestable items more generic in translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 15:26:45 +01:00 |
|
snipe
|
9594596b8a
|
Fixed another hard-coded string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 15:22:27 +01:00 |
|
snipe
|
69cf697aa3
|
Added 2fa translation string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 15:20:52 +01:00 |
|
snipe
|
30c1e1e86a
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-20 14:32:46 +01:00 |
|
snipe
|
1113218c6c
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 14:23:15 +01:00 |
|
snipe
|
9e9c37c1e8
|
Fixed weird linebreaks
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 14:09:11 +01:00 |
|
snipe
|
6cbdbcb1f1
|
Merge pull request #14791 from Godmartinz/label-option-limit
Added some style changes in label field selector for the `DefaultLabel` template
|
2024-06-20 13:51:49 +01:00 |
|
snipe
|
c8835bf5db
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-20 13:40:37 +01:00 |
|
snipe
|
bd1f43f9ee
|
Added lastname.firstname as email format
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 13:36:48 +01:00 |
|
snipe
|
66ffe21ce2
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-20 13:09:54 +01:00 |
|
snipe
|
dd6d040da5
|
Added translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 12:56:43 +01:00 |
|
Marcus Moore
|
f0a11be0b8
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# composer.lock
|
2024-06-18 15:10:46 -07:00 |
|
snipe
|
d0299de898
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-18 11:25:55 +01:00 |
|
snipe
|
941582ac2a
|
Properly scope archived based on settings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-18 10:27:11 +01:00 |
|
Marcus Moore
|
a3dea99bbb
|
Fix category edit form component
|
2024-06-17 14:24:16 -07:00 |
|
Marcus Moore
|
fc351a1896
|
Remove .live from oauth clients
|
2024-06-17 13:03:27 -07:00 |
|
Marcus Moore
|
d9164281ab
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# resources/views/livewire/oauth-clients.blade.php
|
2024-06-17 12:57:04 -07:00 |
|
snipe
|
430808e180
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-17 15:52:13 +01:00 |
|
snipe
|
27063d5bae
|
Fix weird layout in admin oauth [sc-25673]
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 15:44:07 +01:00 |
|
snipe
|
5be86b9dbb
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-17 13:43:45 +01:00 |
|
snipe
|
891a0a0965
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2024-06-17 13:05:31 +01:00 |
|
snipe
|
50f0797850
|
Added aria hidden to icon
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 13:05:27 +01:00 |
|
snipe
|
d9cc3c3ec7
|
Removed extra divs
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 12:52:23 +01:00 |
|
snipe
|
d87da78eb5
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Users/UsersController.php
# config/version.php
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all-defer.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2024-06-17 11:18:33 +01:00 |
|
snipe
|
f3e82c2c80
|
Updated languages
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 10:59:17 +01:00 |
|
Marcus Moore
|
c3e6e1144f
|
Merge branch 'develop' into chore/sc-23725/livewire3
|
2024-06-12 15:12:40 -07:00 |
|
snipe
|
cacb5d62dc
|
Merge pull request #14800 from snipe/fixes/importer_tweaks
Importer tweaks
|
2024-06-12 12:51:11 +01:00 |
|
snipe
|
7e3d66ec53
|
Merge branch 'develop' into fixes/companyable_trait_on_users
|
2024-06-12 11:27:26 +01:00 |
|
snipe
|
1ca9bb5aa8
|
Merge pull request #14698 from Scarzy/features/asset_file_upload_from_api
Added #9413: Asset file upload from API
|
2024-06-12 11:18:06 +01:00 |
|
snipe
|
f8ab9f62f6
|
Merge pull request #14842 from Godmartinz/adjust-preview-window
Fixed label preview window position
|
2024-06-07 18:09:56 +01:00 |
|
Godfrey M
|
77e6058e4c
|
remembers chosen label
|
2024-06-06 13:55:15 -07:00 |
|
Godfrey M
|
4a60026162
|
moves preview down by field definitions
|
2024-06-06 13:42:06 -07:00 |
|
Godfrey M
|
3621292a0e
|
removes unnecessary height
|
2024-06-06 13:28:05 -07:00 |
|
Godfrey M
|
6df1c36011
|
oops
|
2024-06-06 13:24:02 -07:00 |
|
Godfrey M
|
44dae22a3c
|
adjust label preview window
|
2024-06-06 13:18:19 -07:00 |
|
snipe
|
871255f28c
|
Fixed #14812 - added consumables to individual inventory report
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 20:40:45 +01:00 |
|
Marcus Moore
|
60c7efae3c
|
Remove commented code
|
2024-06-05 11:48:10 -07:00 |
|
Marcus Moore
|
48fc6ca60e
|
Remove commented code
|
2024-06-05 11:46:57 -07:00 |
|
snipe
|
e054fc1ef1
|
Removed noisy import debugging, made nicer output
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:28:35 +01:00 |
|
snipe
|
f4d530b4b1
|
Removed filename column since it’s never worked
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:28:35 +01:00 |
|
snipe
|
9d56617caf
|
Moved expected checkin date on view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:28:35 +01:00 |
|
snipe
|
832ceeba56
|
Fixed missing endpush
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 09:57:10 +01:00 |
|
snipe
|
fa083098fc
|
Merge pull request #14819 from snipe/localization/new_strings_2024_06_03
Updated strings
|
2024-06-05 09:46:41 +01:00 |
|
Marcus Moore
|
b2a0e7958b
|
Inject alpine on label engine page
|
2024-06-04 17:03:36 -07:00 |
|
Marcus Moore
|
ef91c8123e
|
Remove unneeded re-render of select2
|
2024-06-04 15:49:57 -07:00 |
|
Marcus Moore
|
296cf3e34b
|
Update OauthClients component
|
2024-06-04 15:37:41 -07:00 |
|
Godfrey M
|
6202f6157a
|
fix select2 behavior
|
2024-06-04 08:41:00 -07:00 |
|
snipe
|
85cb7c92e7
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-03 20:44:40 +01:00 |
|