lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
17737 commits 1 branch 0 tags 220 MiB
Commit graph

68 commits

Author SHA1 Message Date
snipe
c3531e9eba Nicer formatting on smaller screens 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-29 10:11:00 +01:00
snipe
91fcff5faf Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-26 17:32:52 +01:00
snipe
0cfef59568 Updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-23 01:22:25 +01:00
snipe
d953d1a889 Use translation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-23 01:21:54 +01:00
snipe
4aa06f6a75 Update dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-23 00:30:06 +01:00
snipe
07a9bded95 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-22 23:50:28 +01:00
snipe
b5a960e933 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-19 15:27:41 +01:00
Daniel O'Connor
72b2b2d819 Refactor to translatable placeholder text 2025-04-17 23:30:08 +00:00
snipe
7d4e77a7c8 Updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-16 15:52:05 +01:00
snipe
ffbab554be Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-15 19:30:19 +01:00
snipe
0d6a83197a Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2025-04-09 21:29:31 +01:00
snipe
6d784e36d7 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-09 21:29:27 +01:00
akemidx
1307146831 changing where translations live. coalescing 2025-04-09 16:21:48 -04:00
akemidx
7701c6097f adding username split 2025-04-08 13:21:32 -04:00
snipe
43c15ef134
Merge branch 'develop' into feature/locations_with_companies 2025-04-08 09:18:48 +01:00
akemidx
443a5c2348 chaning username dropdown to be usernames and not emails 2025-04-07 19:25:32 -04:00
snipe
a59d69cb0d Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:10:05 +01:00
Marcus Moore
c798df2920
Replace Form::label on label settings page 2025-03-04 16:34:22 -08:00
snipe
d556d1c6e7
Merge pull request #16150 from Godmartinz/add-translations-to-settings 
Adds Translation strings to General and Branding Settings
 2025-03-04 12:48:21 +00:00
Godfrey M
cc0b9f404a merged develop, fix conflicts 2025-02-27 15:38:31 -08:00
James M
149474bfe3
Update general.php 
FIX: Spelling error
 2025-02-27 12:42:47 -07:00
James M
112112d258 Feat: #14926 LDAP Active Flag - Add config option to make False = Enable 2025-02-27 10:52:12 -07:00
snipe
c0f0f43dd7
Merge pull request #16188 from Godmartinz/translations-for-labels-n-ldap 
Adds translations to LDAP  and Label settings pages
 2025-02-18 19:56:14 +00:00
snipe
6de08f46fd Few more tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 19:26:36 +00:00
snipe
3554270366 Updated LDAP sync text 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 19:25:40 +00:00
Godfrey M
c3310a0772 adds translations to LDAP settings page 2025-02-05 10:38:16 -08:00
Godfrey M
2163312997 adds translations for branding and general settings 2025-01-29 10:35:26 -08:00
Godfrey M
0dfb71cfe5 added some translations to branding and general setrting 2025-01-28 11:56:10 -08:00
snipe
b6f05bff1f
Merge branch 'develop' into feature/locations_with_companies 2025-01-17 17:18:17 +00:00
snipe
a7543b407f Added a few more words 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-13 17:07:22 +00:00
snipe
98b1ba1e39 Moved keywords in lang file 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-13 17:04:48 +00:00
Nebel
9f0581275b
Merge branch 'develop' into feature/custom-data-options-for-2d-barcode 2025-01-13 15:49:32 +01:00
Godfrey M
94f44d1b77 fix label type values in db and defaults. update help text 2025-01-07 10:00:52 -08:00
Godfrey M
833af55806 Merge branch 'develop' into barcode_settings_hide 2024-12-12 12:05:29 -08:00
NebelKreis
52e4414bc5 Feature: Added asset ID option to 2D barcode in label generation 2024-11-05 13:41:34 +01:00
NebelKreis
f96b7c5056 Feature: Added data type context for select options with "URL:" and "Data:" labels, including translations 2024-11-05 13:40:33 +01:00
Tobias Regnery
1318dc6111 Add a backward compatibility setting for locations with companies 
Now that locations have a company_id they get restricted to the users company with FullMultipleCompanySupport.
This breaks backward compatibility, because before everyone can handle locations without restrictions.
Add a setting right below FullMultipleCompanySupport so that everyone can switch to the desired behaviour.
The default is off and the existing behaviour is preserved.
 2024-11-04 10:03:38 +01:00
akemidx
5cb940c2ee Merge branch 'refs/heads/upstream/dev' into feature/sc-26415 2024-10-16 18:32:36 -04:00
snipe
4361a10818 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:15:30 +01:00
akemidx
700647c53f setting created 2024-10-02 18:15:52 -04:00
Godfrey M
bbb9babf27 one more finger 2024-09-17 16:40:18 -07:00
Godfrey M
e5daf35f65 fat finger fix 2024-09-17 16:39:55 -07:00
Godfrey M
87c72953b2 udpated translation 2024-09-17 16:37:17 -07:00
snipe
ec0b9b198f
Merge pull request #15296 from uberbrady/expose_restore_sanitize 
Expose the 'sanitize' system for backup restores to the web GUI
 2024-08-22 12:43:07 +01:00
snipe
de29c1d8a0
Merge pull request #15314 from Glukose1/features/add_setting_due_for_checkin_in_days 
Added #15312: Add checkin due in days setting
 2024-08-16 10:21:36 +01:00
Glukose1
d8df52cc8f Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field. 2024-08-15 12:20:51 +02:00
Brady Wetherington
cc5ad456e6 Expose the 'sanitize' system for backup restores to the web GUI 2024-08-14 15:59:21 +01:00
Godfrey M
46a6a84ecb adds migration and translations 2024-08-06 11:07:39 -07:00
snipe
c4e7448d31 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:56 +01:00
snipe
be17ef4047 Added option to restore from default demo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:06 +01:00