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 |
|
|
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 |
|
|
snipe
|
76685d7fd3
|
Clearer text in restore artisan command
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 00:07:32 -08:00 |
|
|
snipe
|
96f76e1f6b
|
INCOMPLETE: Added restore and upload methods for backups
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 00:07:17 -08:00 |
|
|
snipe
|
05c6254fdc
|
Updated snipeit.js with "restore" modal code
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 22:39:33 -08:00 |
|
|
snipe
|
3b25093aeb
|
Removed noisy debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 22:38:27 -08:00 |
|
|
snipe
|
76506dabbf
|
Made helpers call full namespace (tho I have no idea why this was necessary)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 22:38:14 -08:00 |
|
|
snipe
|
1b1b54fbf4
|
Add modified_value and modified_display so we can use the formatted date but still sort correctly
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 22:37:49 -08:00 |
|
|
snipe
|
542ab75d89
|
Added new backup routes
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 19:39:50 -08:00 |
|
|
snipe
|
0e21a95817
|
Escape error message in asset autdit apI (same as in v5)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 19:39:32 -08:00 |
|
|
snipe
|
fb21712a68
|
Added restore modal HTML
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 19:38:40 -08:00 |
|
|
snipe
|
9ed1442bd1
|
Merge pull request #10286 from uberbrady/fix_bulk_audit_xss
Escape asset_tag attribute at controller level for bulk checkout
|
2021-11-08 20:32:02 -08:00 |
|
|
Brady Wetherington
|
3ea209a507
|
Escape asset_tag attribute at controller level for consumption in bulk checkout
|
2021-11-08 20:27:43 -08:00 |
|
|
snipe
|
edf98cb795
|
Merge pull request #10279 from snipe/fixes/turn_get_into_post_for_custom_field_required
Turn custom fields required/optional/remove into POST requests
|
2021-11-08 14:37:36 -08:00 |
|
|
snipe
|
16d18bc7eb
|
Merge pull request #10283 from snipe/fixes/remove_get_logout_route
|
2021-11-08 12:55:19 -08:00 |
|
|
snipe
|
38c36af6fc
|
Changes logout to POST
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-08 12:53:11 -08:00 |
|
|
snipe
|
b5855e7be5
|
Removed get route for logout
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-08 12:35:15 -08:00 |
|
|
snipe
|
0d811d067c
|
Turn cusotm fields required/optional/remove into POST requests
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-05 10:53:48 -07:00 |
|
|
snipe
|
fba0e2b712
|
Revert tableexport
(It broke the npm run prod build)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-03 16:17:19 -07:00 |
|
|
snipe
|
608c2f91a8
|
Updated package lock
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-03 16:04:48 -07:00 |
|
|
snipe
|
960028b376
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-03 16:04:39 -07:00 |
|
|
snipe
|
6690a0f1df
|
Merge pull request #10257 from Wouter0100/patch-1
fix(Docker): use correct python binary for exit listener
|
2021-11-02 14:53:35 -07:00 |
|