DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 11:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15695 commits 96 branches 267 tags 296 MiB
Commit graph

15695 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe d5e1dc54c6 Use translated strings for action log meta 
This is only partially complete and I mostly hate it

Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:35:45 +01:00
Marcus Moore 69263f0e5b
Migrate header row to component 2024-07-16 13:30:29 -07: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
Godfrey M 5bb47e290f validates percentage on store and new depreciations 2024-07-16 13:07:12 -07: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
Godfrey M 48821f8391 updates transformer, api controller 2024-07-16 12:58:23 -07: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
Marcus Moore 017530ba4b
Make updating hook more specific 2024-07-16 12:02:50 -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 78bd950daa Added select2 language files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 18:39:42 +01:00
snipe d3070a0be1 Merge remote-tracking branch 'origin/develop' 2024-07-16 17:24:16 +01:00
snipe a0d461d3e2
Merge pull request #15099 from snipe/fixes/15094_wrong_translation_string 
Fixed #15094 - wrong translation string for model on checkout
 2024-07-16 17:23:46 +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
snipe 0a70bcc0a9 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	CONTRIBUTORS.md
 2024-07-16 16:12:26 +01:00
snipe 35160f88e0 Corrected return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 16:09:08 +01:00
Marcus Moore c8dad528a8
Migrate a couple items out of mount 2024-07-15 16:15:58 -07:00
Marcus Moore 256e989ba1
Add test for importer 2024-07-15 15:49:18 -07:00
dependabot[bot] 0ddb447c4c
Bump codacy/codacy-analysis-cli-action from 4.4.1 to 4.4.5 
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action) from 4.4.1 to 4.4.5.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases)
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/v4.4.1...v4.4.5)

---
updated-dependencies:
- dependency-name: codacy/codacy-analysis-cli-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-15 08:39:24 +00: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
snipe 51242fcbb2 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-07-13 16:09:03 +01:00
snipe 99be9ddb47 Add @dbakan as a contributor 2024-07-13 16:08:56 +01:00
snipe be4317361d
Merge pull request #15082 from dbakan/fix/optimize-command 
Fixed #10224: fix route names for optimize command
 2024-07-13 16:08:32 +01:00
Daniel Albertsen a175b6a38b fix routes and tests 2024-07-13 16:36:14 +02:00
Daniel Albertsen 431da6c903 add test to ensure artisan optimize works 2024-07-13 16:36:14 +02:00
snipe ab6b8f520e Fixed field name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:25:37 +01:00
snipe 24e58d1455 Do not update users who already exist since that locale may have been overirrden manually 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:20:04 +01:00
snipe f91ad6b2db Use app()->getLocale() to determine imported user’s language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:15:44 +01:00
snipe eed253bd2f Use app helped instead of facade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:15:18 +01:00
snipe b68fcf1de5 Added unaccepted asset test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-12 12:19:40 +01:00
snipe 39810f9ba5 Merge remote-tracking branch 'origin/develop' 2024-07-12 11:05:10 +01:00
snipe d21ebc6f0d Fixed return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-12 11:04:56 +01:00
akemidx ad818cf886 missing translation 2024-07-11 17:13:47 -04:00
Marcus Moore 9793016603
Remove unneeded AuthorizesRequests 2024-07-11 13:32:16 -07:00
Marcus Moore 9e06f2d17f
Remove commented code 2024-07-11 13:22:10 -07:00
snipe fb7d533ff7
Merge pull request #15073 from marcusmoore/feature/livewire-url-prefix 
Allow setting a prefix for Livewire's update and asset urls
 2024-07-11 21:04:50 +01:00
Marcus Moore 9dd3827222
Allow setting a prefix for Livewire's update and asset urls 2024-07-11 12:43:29 -07: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 7464c3622e Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-07-11 19:07:54 +01:00
snipe 5132aa0254 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 19:07:30 +01:00