snipe
|
16ae23dbeb
|
Updated validation strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-18 00:25:00 +01:00 |
|
snipe
|
05e278d08b
|
Added qty to email
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-17 20:58:21 +01:00 |
|
snipe
|
c21821a864
|
Added new form fields
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-17 20:58:12 +01:00 |
|
snipe
|
239824681d
|
Merge pull request #15075 from akemidx/checkintranslation
FIXED: Missing Translation on a Tooltip
|
2024-07-17 18:16:02 +01:00 |
|
snipe
|
65dcb2a9bd
|
Merge pull request #15085 from snipe/small_tweaks_to_oauth_page
Small layout tweaks to oauth page
|
2024-07-16 21:36:17 +01:00 |
|
snipe
|
a3b2912e89
|
Updated string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:16:23 +01:00 |
|
snipe
|
7f412ec3f5
|
Missing string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:14:41 +01:00 |
|
snipe
|
94e881e5f0
|
Cleared up language
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:11:03 +01:00 |
|
snipe
|
d53a032402
|
More consistent UI for indented checkboxes
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:07:03 +01:00 |
|
snipe
|
70d95877d8
|
Translations for license checkout errors
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:02:58 +01:00 |
|
snipe
|
bb00edda4e
|
Added basic jquery validation translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 20:54:48 +01:00 |
|
Godfrey M
|
aaa2858337
|
battling with handling depreciation percentage and amount
|
2024-07-16 12:25:19 -07:00 |
|
snipe
|
4895023f3b
|
Translate import button
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 19:56:02 +01:00 |
|
snipe
|
0ed637f0ce
|
Translate importer header
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 19:41:47 +01:00 |
|
snipe
|
45bf428092
|
Translated “seat” for license seat view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 19:04:51 +01:00 |
|
snipe
|
e6f2c457a8
|
Handle localization better, clearer indenting on addresses
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 19:01:50 +01:00 |
|
snipe
|
04f723327e
|
Fixed translation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 19:01:23 +01:00 |
|
snipe
|
4a9bd95ed3
|
Added language support for select2
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 18:40:10 +01:00 |
|
snipe
|
eb9e276ba7
|
Fixed #15094 - wrong translation string for model on checkout
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 17:14:13 +01:00 |
|
MrM
|
e49c96a35e
|
Added EULAs in print user's assets
Added EULAs when we want to print all assets assigned to a users and ask him/her to sign.
|
2024-07-14 19:10:33 +02:00 |
|
snipe
|
2d1aeca949
|
Re-use existing string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-13 18:24:56 +01:00 |
|
snipe
|
e06e4db4b7
|
Small layout tweaks to oauth page
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-13 18:16:03 +01:00 |
|
akemidx
|
ad818cf886
|
missing translation
|
2024-07-11 17:13:47 -04:00 |
|
snipe
|
5697370dfe
|
Merge pull request #14722 from Godmartinz/unaccepted_reminder_command
Adds a command to resend acceptance emails
|
2024-07-11 20:37:04 +01:00 |
|
snipe
|
78d24eb451
|
Merge pull request #15069 from TelecomsSansFrontieres/fix_print-all-assets
Fixed inconsistent attributes order in Print All Assigned report
|
2024-07-11 17:30:41 +01:00 |
|
snipe
|
1527679f4b
|
Handle deletions on the observer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 17:26:43 +01:00 |
|
snipe
|
23f1489b2b
|
Added history tab
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:46:49 +01:00 |
|
snipe
|
58bc84436c
|
Fixed incorrect jquery validation class
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:23:05 +01:00 |
|
snipe
|
2415408a50
|
Prevent ludicrious amount of min_qty
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:22:41 +01:00 |
|
snipe
|
67d6f7119d
|
Prevent a ludicrous amount of consumables
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:22:04 +01:00 |
|
snipe
|
d9a114090b
|
Added buttons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:18:33 +01:00 |
|
snipe
|
e123eeea9e
|
Added error message if category type is invalid
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:00:20 +01:00 |
|
snipe
|
da2b64c96d
|
Added string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 15:24:08 +01:00 |
|
Florent Bervas
|
d9a53460ff
|
Fix design inconsistency between assets and assigned assets in Print All Assigned report
|
2024-07-11 09:41:58 +00:00 |
|
snipe
|
8be44f9cf2
|
Check for time until depreciated
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 10:07:58 +01:00 |
|
snipe
|
71a5d07698
|
Fixes #15056 - only try to load avatars if one exists or default is set
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-10 08:56:14 +01:00 |
|
Godfrey M
|
624632d0ca
|
removed push and endpush
|
2024-07-09 11:41:31 -07:00 |
|
snipe
|
f4ffbcf76e
|
Fixed wonky layout on accessory files
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-09 13:38:50 +01:00 |
|
snipe
|
5597992d63
|
Fixed API key missing translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-09 13:17:46 +01:00 |
|
snipe
|
09cc9b92d1
|
Fixed #15050 - erroneous deleted remark
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-08 22:13:07 +01:00 |
|
snipe
|
9c304f238a
|
Merge pull request #15029 from snipe/fixes/small_docblock_fixes
General cleanup - Docblock fixes, adding type hinting, added tests, added asset model form validator
|
2024-07-08 17:43:50 +01:00 |
|
snipe
|
4c19b4d831
|
Added aria-hidden="true" to error icon for accessibility
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-08 17:39:38 +01:00 |
|
snipe
|
f3bf74a540
|
Updated language files
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-08 15:51:19 +01:00 |
|
snipe
|
86c0a3ecad
|
Added localization for bootstrap-tables
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-08 15:12:37 +01:00 |
|
snipe
|
d834ef5104
|
Updated string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 21:52:37 +01:00 |
|
snipe
|
ae9085b11f
|
Modernize use statements, switch to auth()
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 20:49:22 +01:00 |
|
snipe
|
3f20e29901
|
Moved gthe settings for remote loading to the branding section
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 16:55:47 +01:00 |
|
snipe
|
44bcc157e5
|
Updated icon
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 13:23:46 +01:00 |
|
snipe
|
278bf3da13
|
Updated language
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 13:23:38 +01:00 |
|
snipe
|
e372527d13
|
Added default_avatar to settings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 13:22:36 +01:00 |
|
snipe
|
96be1e1275
|
Removed duplicate locale directive
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 02:14:10 +01:00 |
|
snipe
|
708d7b5fc5
|
Use icons for consistency
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-03 23:43:44 +01:00 |
|
snipe
|
62b5a159a9
|
Added files column
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-03 23:31:09 +01:00 |
|
snipe
|
a6d04509a5
|
Merge pull request #15016 from snipe/improved_user_merge
Fixed #15005 - Improvements on user merge
|
2024-07-03 23:19:50 +01:00 |
|
snipe
|
0071596274
|
Added upload count
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-03 23:18:43 +01:00 |
|
spencerrlongg
|
a6690493b0
|
resolved
|
2024-07-03 16:12:55 -05:00 |
|
snipe
|
00fc392a12
|
Added missing traslations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-03 12:41:04 +01:00 |
|
snipe
|
f22e99aec8
|
Merge pull request #14983 from snipe/fixes/use_more_modern_request_syntax_in_blades
Use more modern reference for input text
|
2024-07-02 08:43:34 +01:00 |
|
Marcus Moore
|
3a8f825de5
|
Link user table counts to section in user show
|
2024-07-01 14:06:05 -07:00 |
|
Marcus Moore
|
d481850d4c
|
Add @can around Edit Your Profile button on view assets page
|
2024-07-01 10:11:27 -07:00 |
|
snipe
|
d687b20467
|
Use more modern reference for input text
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-27 15:05:47 +01:00 |
|
snipe
|
7dbcedad40
|
Merge pull request #14981 from uberbrady/fix_backup_translations
Fixed #14976, #14975, #14973 - Translation strings aren't always working
|
2024-06-27 14:36:52 +01:00 |
|
snipe
|
54fb91c03b
|
Merge pull request #14831 from marcusmoore/chore/sc-23725/livewire3
Updated Livewire to v3
|
2024-06-27 13:21:52 +01:00 |
|
Brady Wetherington
|
6df9742664
|
Built a workaround for backup notification translations
|
2024-06-27 13:17:16 +01:00 |
|
snipe
|
f23a221750
|
Merge pull request #14942 from snipe/updates/start_moving_from_collective_forms
WIP - First start at switching to regular html labels
|
2024-06-27 13:12:29 +01:00 |
|
snipe
|
43773954cd
|
Merge pull request #14966 from Godmartinz/css_issue
Fixed importer table background color
|
2024-06-26 13:33:14 +01:00 |
|
snipe
|
251f2d82b3
|
Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-26 12:53:03 +01:00 |
|
snipe
|
adee99db34
|
Fixes #14968 - translate forbidden page
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-26 11:21:56 +01:00 |
|
Godfrey M
|
eda2eb2283
|
fixes all dark modes
|
2024-06-25 10:24:35 -07:00 |
|
Godfrey M
|
a7123a04ba
|
fixes importer background color
|
2024-06-25 10:19:18 -07:00 |
|
Marcus Moore
|
d4861a74df
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# composer.lock
|
2024-06-25 10:15:50 -07:00 |
|
snipe
|
bca6dd41d2
|
Added avif to translation string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-25 13:39:36 +01:00 |
|
snipe
|
4d55765e28
|
Added checkbox to settings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-24 14:02:53 +01:00 |
|
snipe
|
aa5fe52e89
|
Added gate in blade
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-24 14:01:56 +01:00 |
|
snipe
|
ce107dd688
|
New strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-24 14:01:39 +01:00 |
|
snipe
|
ba4c51dd68
|
Removed duplicate key
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-24 14:01:25 +01:00 |
|
snipe
|
294fb1f774
|
Merge pull request #14925 from snipe/fixes/added_2fa_string
Additional translation strings
|
2024-06-24 12:11:45 +01:00 |
|
snipe
|
5fb3cea0bb
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-24 11:41:20 +01:00 |
|
snipe
|
f47bc5ea7d
|
Updated hardware checkin
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-23 19:40:52 +01:00 |
|
snipe
|
427615f627
|
Fiest start at switching to regular html labels
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-23 18:24:23 +01:00 |
|
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 |
|
snipe
|
877adb082c
|
Fixed translation string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-03 16:40:52 +01:00 |
|
snipe
|
cff382605c
|
Fixed some missing strings and checks
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-01 04:01:04 +01:00 |
|
snipe
|
694e3b7f3a
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-01 00:42:16 +01:00 |
|
snipe
|
a15ed6eaee
|
Wrap disabled <a> links in a span for tooltips
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 19:29:29 +01:00 |
|
snipe
|
3005565bba
|
Slight tweak to language
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 19:29:12 +01:00 |
|
snipe
|
1d97d95c10
|
UI and styling tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:48:34 +01:00 |
|
snipe
|
4a1b1675cb
|
Use storage helper
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:48:09 +01:00 |
|
snipe
|
8c5249ba4b
|
Disable buttons on view page if model is invalid
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:47:53 +01:00 |
|
snipe
|
b936591240
|
Warn and disable on checkout if model is invalid
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:47:34 +01:00 |
|
snipe
|
76e664d647
|
Warn and disable the checkout button if model is invalid
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:47:18 +01:00 |
|
snipe
|
0253c2a756
|
Lauout tweaks, warn and disable button if model is invalid
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:46:57 +01:00 |
|
snipe
|
d27613f55c
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:46:41 +01:00 |
|
Marcus Moore
|
1736bf5510
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# app/Livewire/LoginForm.php
# package.json
# resources/views/livewire/login-form.blade.php
|
2024-05-30 16:56:50 -07:00 |
|
Marcus Moore
|
1a1b891309
|
Remove unused Login Livewire component
|
2024-05-30 16:49:05 -07:00 |
|
Marcus Moore
|
2eaac3d381
|
Fix select2 re-renders
|
2024-05-30 16:20:04 -07:00 |
|
Marcus Moore
|
f03249898a
|
Update id syntax in custom fields component
|
2024-05-30 16:12:52 -07:00 |
|
Godfrey M
|
0ee441a976
|
adds hidden as well
|
2024-05-30 11:19:06 -07:00 |
|
Godfrey M
|
cf8de3baa9
|
fix checkin option from appearing
|
2024-05-30 11:11:35 -07:00 |
|
snipe
|
aadee068b3
|
Merge pull request #14740 from Godmartinz/redirect_back_to_asset
Added Redirect options to asset check in/out
|
2024-05-30 14:14:04 +01:00 |
|
snipe
|
a46e2ebfd8
|
Small tweaks to user export, user view translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-30 13:59:00 +01:00 |
|