DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 20:14:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
10373 commits 97 branches 267 tags 296 MiB
Commit graph

10373 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe b058d84f2c
Merge pull request #10322 from snipe/uberbrady-patch-2 
Change the `[END]` directive in `.htaccess` to `[L]`
 2021-11-17 18:01:52 -08:00
Brady Wetherington 5fb05d8b1c
Change the [END] directive in .htaccess to [L] 
This allows backwards-compatibility with older Apache versions (which we _used_ to have), and should do the exact same thing.
 2021-11-17 15:29:51 -08:00
snipe 78809c0fe7 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-16 12:02:45 -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 7ce5993f5a
Merge pull request #10315 from snipe/fixes/escape_custom_fields_in_api_response 
Escape custom field values in API response
 2021-11-15 20:33:51 -08:00
snipe f7b483358f Escape custom field values in API response 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:32:59 -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
snipe 69fe3c0299 Added some comments on the JS 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:57:15 -08:00
snipe 0c58fa1b1e Merge branch 'features/backup_importer_ui' of https://github.com/snipe/snipe-it into features/backup_importer_ui 2021-11-10 17:49:04 -08:00
snipe e2702186a9 Slightly reworked UI 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 17:48:59 -08:00
snipe 595c3bfd57
Merge pull request #10298 from uberbrady/features/backup_importer_ui 
Cleaned up the output and added some better checks for errors
 2021-11-10 17:21:23 -08:00
Brady Wetherington c2b5f9b372 Cleaned up the output and added some better checks for errors 2021-11-10 17:08:04 -08:00
snipe b069eec43a Fixed upload disabled button 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 16:01:22 -08:00
snipe 040bdd2f32 Merge branch 'features/backup_importer_ui' of https://github.com/snipe/snipe-it into features/backup_importer_ui 2021-11-10 13:01:05 -08:00
snipe f8cf65bbb3 Small layout fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 13:01:02 -08:00
snipe c1a844cce6
Merge pull request #10296 from uberbrady/features/backup_importer_ui 
Tweak Restore command to _also_ run via webserver via Artisan::call()
 2021-11-10 13:00:40 -08:00
Brady Wetherington 2b6614e2dd Tweak Restore command to _also_ run via webserver via Artisan::call() 2021-11-10 12:44:19 -08:00
Brady Wetherington 864cc4f8d5 Fix FIXME's by downgrading them to TODO's :) 2021-11-10 11:37:10 -08:00
snipe ec2a3b0f35 Updated label names 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 01:44:34 -08:00
snipe 230a568145 Added help text and more info in the modal 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 01:44:11 -08:00
snipe 457c6080cc Better handling if there was no file uploaded 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 01:43:45 -08:00
snipe 856b9294f8 Improved BS tables on backups 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 00:08:43 -08:00
snipe 8590e5d67e UNRELATED: fixed wrong html tag for license view badge count 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 00:08:15 -08:00
snipe cf070866f0 INCOMPLETE: Added more generic language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-10 00:07:47 -08:00