DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6933 commits 101 branches 268 tags 288 MiB
Commit graph

6933 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe f3f6a04c43 Use hash:: 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-30 20:46:20 -08:00
snipe fe2cd8b708 Switched back to sqlite for unit 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-30 20:45:54 -08:00
snipe e73373a75a Removed empty tests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-30 20:45:42 -08:00
snipe d08c1787a1 First steps at getting dusk working 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-30 20:09:29 -08:00
Nuraeil d3972888dc
Merge pull request #6 from snipe/develop 
Develop
 2021-11-30 06:37:17 +01:00
snipe 4c2d47e7c6
Merge pull request #10354 from inietov/fixes/customfields_with_date_format_doesnt_display_default_value 
Fixes Default Values - Date not applying
 2021-11-24 19:41:51 -08:00
snipe 29bbfad693 Applied escaping fix from master to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-24 19:38:27 -08:00
Ivan Nieto Vivanco 741eb28622 Add the call to defaultValue() function in custom fields with date format 2021-11-23 17:11:21 -06:00
snipe ef8f646ab2
Merge pull request #10349 from snipe/chore/sc-17719/add-sodium-as-a-requirement-in-upgrade-php 
Update upgrade.php with newer requires
 2021-11-22 15:32:51 -08:00
snipe 686e58806f Update upgrade.php with newer requires 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-22 15:31:23 -08:00
Matthew Nickson 9381ba2404
Merge branch 'develop' into sum_cost_by_quantity 2021-11-21 18:59:34 +00:00
Wächtler, Yannick 1b76185798 Added TODO: comments to pages, where there are non-localized strings, in order to keep track of them 2021-11-19 15:32:13 +01:00
Wächtler, Yannick 9164daf5bc Added localized strings for admin/settings 2021-11-19 15:23:48 +01:00
Wächtler, Yannick 6917d59185 Added localized strings for reports 2021-11-19 12:39:19 +01:00
Wächtler, Yannick 04fec144a0 Added localization strings for partials, added file structure 2021-11-19 12:12:11 +01:00
Nuraeil 6eb120d101
Merge pull request #5 from snipe/develop 
Develop
 2021-11-19 11:51:16 +01:00
snipe df0b240a05
Merge pull request #10288 from uberbrady/composer_install_under_phpv8 
[sc-17645] Composer install under phpv8
 2021-11-18 15:28:54 -08:00
snipe 3e83b2ff2f
Merge pull request #10334 from snipe/feature/sc-17704/make-all-currency-values-right-aligned 
Added text-right to presenters for money values
 2021-11-18 15:10:19 -08:00
snipe c49c5f4164 Added text-right to presenters for money values 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-18 15:09:17 -08:00
snipe 6d545ff11b
Merge pull request #10333 from snipe/bug/sc-17711/v6-bug-500-server-error-when-trying-to-checkin 
Fixed v6 bug 500 server error when trying to checkin
 2021-11-18 14:38:17 -08:00
snipe 250f6b6fb8 Fixed v6 bug 500 server error when trying to checkin [sc-17711] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-18 14:37:12 -08:00
Nuraeil 7084703b5a
Merge pull request #4 from snipe/develop 
Merge current develop into branch
 2021-11-18 21:30:45 +01:00
snipe f6d5d6cc09
Merge pull request #10316 from snipe/bug/sc-17684/v6-bug-error-when-editing-model-with-no-custom 
v6 bug - Error when editing model with no custom
 2021-11-17 18:38:48 -08:00
Wächtler, Yannick 5a2f8788a9 Fixed merge issue in view.blade.php and added translatable string 2021-11-16 19:34:20 +01:00
Wächtler, Yannick f2c3e51a83 Catching up to snipe-it/develop branch 2021-11-16 19:25:23 +01:00
Wächtler, Yannick 74ed790d20 Merge branch 'snipe-develop' into added-localized-strings 2021-11-16 08:51:06 +01:00
Wächtler, Yannick 6feb39f6b9 Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop 2021-11-16 08:50:45 +01:00
snipe bbb0d1be17 Possible fix for asset model editing when no custom fieldset is associated 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 21:09:35 -08:00
snipe 476e17055b Escape custom fields in API response 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:31:01 -08:00
snipe db45de5da2 Fixed old style user routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:26:07 -08:00
snipe 207c785b1d Added missing use statements for Laravel 8 routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:20:10 -08:00
snipe 8a747be3a0 Fixed routes for newer format (l8) 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:16:40 -08:00
snipe 65d1855b38 Display app_locked message on front-end 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 19:50:55 -08:00
snipe 46d2f8a81d Disallow file upload to backups on demo 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 19:42:02 -08:00
snipe 92b7aaf44b Log the user out upon successful restore 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 19:40:01 -08:00
snipe 8bf11e9417 Bummped hash fpr v6-pre-alpha 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 19:31:20 -08:00
snipe 174d23a42a Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 19:29:57 -08:00
snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	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/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
 2021-11-15 19:24:38 -08:00
snipe ce69e54202
Merge pull request #10297 from snipe/features/backup_importer_ui 
v6 Feature - Added backup restore from GUI
 2021-11-15 19:09:37 -08:00
snipe e75a5f13ec
Merge pull request #10303 from inietov/fixes/weird_field_showing_up 
Added the current_value string to correspondig 'en' language directory
 2021-11-15 14:29:34 -08:00
snipe cf4e13f4df
Merge pull request #10312 from andrewshulgin/patch-1 
Fixed: #10311: Docker: ldap_client_tls.{key,cert} are located in /var/www/html/storage instead of /var/lib/snipeit/keys
 2021-11-15 14:28:59 -08:00
snipe 8e7565cbe9
Merge pull request #10313 from snipe/snyk-fix-d1fb08ebb2899913c99652bb6e188696 
[Snyk] Security upgrade bootstrap-table from 1.18.3 to 1.19.1
 2021-11-15 14:28:37 -08:00
snyk-bot 4839b0e008
fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-BOOTSTRAPTABLE-1657597
 2021-11-13 05:19:33 +00:00
Andrew Shulgin d3ddafdff4
Dockerfile: symlink for ldap_client_tls.{cert,key} 2021-11-13 03:00:09 +02:00
Ivan Nieto Vivanco b07db3b324 Added the current_value string to correspondig 'en' language directory 2021-11-11 14:43:47 -06:00
snipe cc5b8f3d6d
Merge pull request #10302 from SBrown2021/patch-1 
Typo in upgrade.php
 2021-11-11 10:32:42 -08:00
SBrown2021 c668cc3103
Typo in upgrade.php 
Fixed typo on line 181. bootsrap/cache/services.php -> bootstrap/cache/services.php
 2021-11-11 17:05:24 +00:00
snipe bc21875324 More refinements to the UI 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 18:15:38 -08:00
snipe 1a703bf78b Added logout clarification 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:59:52 -08:00
snipe 494c72d92b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:58:04 -08:00