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

2460 commits

Author SHA1 Message Date
Ivan Nieto Vivanco
a87478d3ac Set the actual field we are evaluating as required (months) 2022-01-26 23:02:27 -06:00
Ivan Nieto Vivanco
34819ec5cf Fixes the appearance of some error messages 2022-01-26 23:00:52 -06:00
Ivan Nieto Vivanco
44349db597 Fixes the appearance of some error messages 2022-01-26 22:58:02 -06:00
snipe
b153138d1e
Merge pull request #10534 from inietov/feature/add_remaining_address_field_to_user_import_develop 
Add Zip field in the User Importer for develop [sc-18556]
 2022-01-26 16:58:37 -08:00
Ivan Nieto Vivanco
7383ec7f1e Add an early return if the model id is not set (for new Asset Models) 2022-01-21 11:45:45 -06:00
Ivan Nieto Vivanco
c86ed892ab Add Zip field in the User Importer 2022-01-19 13:52:15 -06:00
Ivan Nieto Vivanco
1fc71a4111 Add Zip field in the User Importer 2022-01-19 13:35:54 -06:00
Ivan Nieto Vivanco
9ae03f21dc Adds condition to only charge custom field's livewire when the model is updated 2022-01-15 12:14:34 -06:00
snipe
af2e407543 Normalize array format in en language to the new shitty way 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 21:30:35 -08:00
snipe
ddfa5776c5 Updated language strings 
This absolutely sucks. Something changed in CrowdIn or something else, which results in this push being *thousands* of files because someone somewhere decided that `return [];` was vastly inferior to `return array();`

I'll try to fix it. :(

FML

Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 21:27:29 -08:00
snipe
da47f62d17 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 21:20:38 -08:00
Ivan Nieto Vivanco
949fe2a14a Adds last_audit_date and next_audit_date in the asset importer 2022-01-13 15:14:20 -06:00
snipe
67ba8a6281 Removed extra spaces 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 23:18:39 -08:00
snipe
9368ddeaf0 Added badge count on requestable assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 23:17:54 -08:00
snipe
f206d4ed4e Fixed double div in current purchase value 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 22:26:56 -08:00
snipe
224d0b2fd2 Small language file additions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 22:21:00 -08:00
snipe
43c57c8461 Merge master into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Http/Controllers/BulkAssetModelsController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ModalController.php
#	app/Http/Transformers/GroupsTransformer.php
#	config/version.php
#	package-lock.json
#	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/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/assets/less/overrides.less
#	resources/lang/en/admin/hardware/message.php
#	resources/lang/en/admin/settings/general.php
#	resources/views/partials/bootstrap-table.blade.php
#	routes/web.php
 2022-01-12 20:51:33 -08:00
snipe
df0da0f3bc Fixed escaped string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 11:20:31 -08:00
Alex Janes
d2bb3e6377
Merge branch 'develop' into features/quickscan_checkin 2022-01-11 16:40:20 -05:00
Alex Janes
edef640d35
Merge branch 'develop' into features/lock_logins_to_saml 2022-01-11 09:05:14 -05:00
snipe
d9624b59b4
Merge pull request #10264 from nuraeil/added-localized-strings 
Added #10242: Improved localized strings
 2022-01-10 14:48:52 -08:00
snipe
b98c97b00e
Merge pull request #10265 from uberbrady/remove_old_ldap 
Remove old ldap
 2022-01-10 14:34:34 -08:00
snipe
b18b3812df Back to master: Added some BS tables style overrides for mobile 
This repeats 06e8e826, which alone improves the mobile view immensely,
on master.
 2022-01-10 15:23:43 -06:00
Wächtler, Yannick
f906dbd81e Added missed translation strings, fixed the column width for the date selector (too small in certain languages) 2022-01-10 09:21:23 +01:00
Nuraeil
5bb2f6fa0f
Merge branch 'develop' into added-localized-strings 2022-01-09 17:40:54 +01:00
Wächtler, Yannick
b77e7f88d4 fix(bootstrap-table): adds locale env to table init, adds bootstrap-table-locale-all to webpack-mix 2022-01-09 17:35:28 +01:00
snipe
0f5bb0e65d Localize bakcup restore strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-07 16:50:19 -08:00
Wächtler, Yannick
c3ab4c7512 Fixed the tables not displaying the correct language 2022-01-06 14:29:10 +01:00
Wächtler, Yannick
04d649122b Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO 2022-01-06 12:35:37 +01:00
Nuraeil
271c364ef8
Merge pull request #9 from snipe/develop 
Merge snipe/snipe-it:develop into nuraeil/snipe-it:added-localized-strings
 2022-01-04 10:48:51 +01:00
Brady Wetherington
3c7f2e89ec Merge branch 'develop' into remove_old_ldap 
Had to re-do the composer install because the conflicts were too complicated.
 2022-01-03 12:56:58 -08:00
Alex Janes
5fe2083688 Adjusted the phrasing around auto-incrementing asset tags. 2021-12-31 16:33:30 -05:00
snipe
8be6d10dbe Fixed #10467 - Safari only font-awesome bug 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-24 12:30:34 -08:00
snipe
f4ef828332 Fixex js table export 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-24 11:17:36 -08:00
Alex Janes
ea93f82bde added the notes field to allow users to quickly add notes to multiple checkins at once 2021-12-23 17:37:48 -05:00
snipe
312200bf44 Removed duplicate "department" entry in importer, pulls #10460 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-21 13:37:20 -08:00
Ivan Nieto Vivanco
e03a8cc721 Delete an extra entry for Departments when importing Users via GUI 2021-12-21 14:42:51 -06:00
Alex Janes
2e5820e29d small phrase change 2021-12-20 23:31:10 -05:00
Alex Janes
b01a4468c7 refactored from bulkcheckin to quickscancheckin 2021-12-20 23:27:36 -05:00
snipe
48d3bfef03
Merge pull request #10421 from Robert-Azelis/patch-5 
Create new user account from asset form - additional fields
 2021-12-20 17:05:38 -08:00
Alex Janes
55b8d080b9 more lang changes 2021-12-20 19:39:06 -05:00
Alex Janes
fcc9815c6e Revert "Added phrase to all language files to prevent errors (translation still needs to happen)" 
This reverts commit 87ef37b0b4.
 2021-12-20 18:05:21 -05:00
Alex Janes
cb14abfc54 Revert "fixed zh-CN file format" 
This reverts commit 20f66a1b55.
 2021-12-20 18:05:09 -05:00
Alex Janes
3841c3560b changed a page title 2021-12-20 16:52:00 -05:00
Alex Janes
20f66a1b55 fixed zh-CN file format 2021-12-20 14:05:13 -05:00
Alex Janes
08cb8c354b more cleanup to fit formatting convention 2021-12-19 19:11:24 -05:00
Alex Janes
87ef37b0b4 Added phrase to all language files to prevent errors (translation still needs to happen) 2021-12-19 18:50:55 -05:00
Alex Janes
29da4f4325 Removed a bunch of redundant code I created from the API 2021-12-19 18:39:57 -05:00
Alex Janes
bc4fe88ac0 First version of bulk checkin 2021-12-19 16:53:31 -05:00
Alex Janes
ead142cdf7 Corrected a tiny HTML typo in the SAML view. (Unrelated to this PR) 2021-12-18 12:00:07 -05:00