3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-03 07:01:26 +00:00
Commit Graph

333 Commits

Author SHA1 Message Date
4adbd7af4c Merge branch 'develop' into snipeit_v7_laravel10 2024-05-22 21:02:11 +01:00
db9c435ae0 removed extra div tags 2024-05-20 10:48:57 -07:00
f633dbba64 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-20 12:55:29 +01:00
3594ed67d1 Removed back buttons on settings index
Signed-off-by: snipe <snipe@snipe.net>
2024-05-06 20:48:32 +01:00
65e21faa3e Merge branch 'develop' into snipeit_v7_laravel10
Hopefully, last merge?
2024-04-02 20:34:04 +01:00
b5b8777c94 Extract translation string 2024-03-26 12:23:57 -07:00
bd506820b7 Display error message 2024-03-25 17:59:39 -07:00
feb78d00cf conditionally shows label fields if on old label engine only 2024-03-06 11:25:49 -08:00
b67ceab849 fields appear in preview, but not bulk generate labels 2024-02-27 11:29:19 -08:00
550f9e2afa removes visibility checkmarks for certain fields when in new label engine 2024-02-22 16:19:28 -08:00
c0215baca5 minor changes 2024-02-22 11:41:04 -08:00
c62758c5b5 adds custom field select to default label view 2024-02-22 11:36:39 -08:00
8f2843bfcf Merge branch 'develop' into snipeit_v7_laravel10
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
2024-02-21 20:22:28 +00:00
32c360f032 Re-added UI for load_remote
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 18:23:52 +00:00
8a2f3405d5 Merge branch 'develop' into snipeit_v7_laravel10
A lot of changes here, but hopefully this works?
2024-01-29 22:12:58 +00:00
e175cdbfd7 adds table overflow scroll 2024-01-24 12:13:40 -08:00
f734e196e5 Merge branch 'develop' into snipeit_v7_laravel10 2024-01-08 18:57:55 +00:00
4b071745fa prevents tables and table data from overflowing 2023-12-19 09:49:40 -08:00
c0dba95426 testing ldap test table fix 2023-12-19 09:32:26 -08:00
b01d53a247 one more 2023-12-11 18:43:46 -06:00
65dae836c6 Set default sorting on backups to latest first
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 00:35:08 +00:00
f93e7b91ff that's all folks 2023-12-06 16:20:30 -06:00
04069bab82 remove comment 2023-12-05 20:50:07 -06:00
080d196138 buttons work now after style tags removed 2023-12-05 16:41:25 -06:00
d3967b37cd this is a start, buttons not working? 2023-12-05 14:52:14 -06:00
0089ea2321 Merge pull request #13882 from marcusmoore/fixes/jquery-validation
Fix client side validation in the v7 branch
2023-12-05 17:26:48 +00:00
08e4ea384e Update additional partials for validation 2023-11-14 12:23:46 -08:00
4546e87eb5 Merge pull request #13680 from marcusmoore/feature/sc-23769
Changed data source input to select in new label engine
2023-11-13 20:38:42 +00:00
aa2a25dc19 Display the form errors correctly
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 15:30:49 +00:00
a47e36c1e5 Add custom fields as options 2023-09-27 16:51:53 -07:00
619712b927 Fixed table
Signed-off-by: snipe <snipe@snipe.net>
2023-09-25 13:45:46 +01:00
359cd2a267 A few more config options
Signed-off-by: snipe <snipe@snipe.net>
2023-09-25 13:28:13 +01:00
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
7787ca328c Try to prevent the browser from pre-filling the LDAP password
Signed-off-by: snipe <snipe@snipe.net>
2023-08-28 18:36:06 +01:00
20e9f05a64 Tighter layout
Signed-off-by: snipe <snipe@snipe.net>
2023-08-26 17:43:02 +01:00
da38945a53 Small fixes to checkbox layout in general settings blade
Signed-off-by: snipe <snipe@snipe.net>
2023-08-22 14:10:39 +01:00
ba0643f6a4 Added name display format, tweaked some
Signed-off-by: snipe <snipe@snipe.net>
2023-08-21 20:13:28 +01:00
74384f14e4 Use clearer translation (from original PR)
Signed-off-by: snipe <snipe@snipe.net>
2023-08-16 01:25:13 +01:00
0763b5135d Fixed checkboxes
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 20:28:16 +01:00
fa6c8d864e Restore label engine checkbox
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 20:04:19 +01:00
c957f136aa More label tweaks
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 20:03:40 +01:00
6b02184e99 Fixed weird layout with checkbox
Signed-off-by: snipe <snipe@snipe.net>
2023-08-15 18:48:20 +01:00
e41368daac Merge pull request #12050 from cram42/develop
New Label Engine
2023-08-15 17:58:57 +01:00
9820ab34d7 Use today’s date for date format selectlist
Signed-off-by: snipe <snipe@snipe.net>
2023-08-14 22:44:29 +01:00
5bda73f151 Ugh - messing with the blade layout
Signed-off-by: snipe <snipe@snipe.net>
2023-08-08 08:18:40 +01:00
b1464e028c Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
fe92667812 Use actions text in backups table
Signed-off-by: snipe <snipe@snipe.net>
2023-05-16 16:02:48 -07:00
27e0484072 I lied. Missed one
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 03:12:22 -07:00
ec76de607b Final google login tweaks
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 03:08:29 -07:00
ed370a0104 Added translations
Signed-off-by: snipe <snipe@snipe.net>
2023-05-10 02:47:28 -07:00