DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6862 commits 53 branches 269 tags 314 MiB
Commit graph

6862 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brady Wetherington 25d72d2978 Make composer install work on 7.4 as well as 8.0 2021-11-09 13:06:24 -08:00
Brady Wetherington ec030e9e1f Tweak some version requirements to make composer install run under phpv8 2021-11-08 21:19:23 -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
Wächtler, Yannick 6b2801867d Renamed account/api to account/general to match naming schema, changed the associated account/api trans() to account/general 2021-11-04 20:15:23 +01:00
Wächtler, Yannick 97030866e4 Adding newly added template files 2021-11-04 20:12:47 +01:00
Nuraeil 3f2749d5d6
Merge pull request #2 from snipe/develop 
Develop
 2021-11-04 19:16:00 +01: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
snipe 98de8526db
Merge pull request #10258 from PlaneNuts/Fix_Advanced_Search/Checked_Out_To 
Fixed #8828: Can't search by checked out user in advanced search
 2021-11-02 14:53:08 -07:00
Wächtler, Yannick 63b30489df Added localized strings for notifications 2021-11-02 15:44:57 +01:00
Wächtler, Yannick 670b70c7e1 Added localized strings for models 2021-11-02 15:34:50 +01:00
Wächtler, Yannick c0891e6827 Added localized strings for modals 2021-11-02 15:27:13 +01:00
Wächtler, Yannick 30d30490a3 Added localized strings for locations 2021-11-02 15:14:54 +01:00
Wächtler, Yannick 4af6412da6 Added localized strings for licenses 2021-11-02 14:55:49 +01:00
Wächtler, Yannick 4fcd4a930f Added localized strings for layouts 2021-11-02 14:45:58 +01:00
Wächtler, Yannick 8bad9c5140 Added localized strings for kits 2021-11-02 14:25:21 +01:00
Wächtler, Yannick 26e056fb3c Added localized strings for improter, added en structure 2021-11-02 14:09:22 +01:00
Wächtler, Yannick c16ade2d87 Added localized strings for hardware 2021-11-02 14:02:48 +01:00
Wouter van Os 2c49c32e72 Fixed #10231: use correct python binary for exit listener 
This fixes #10231, without creating an own Dockerfile.
 2021-11-02 13:06:36 +01:00
Wächtler, Yannick 167bf97d46 Added localized strings for groups 2021-11-02 12:03:41 +01:00
Wächtler, Yannick e825fa81aa Added localized strings for depreciations 2021-11-02 11:50:56 +01:00
Wächtler, Yannick a96c53784c Added localized strings for custom_fields 2021-11-02 11:27:53 +01:00
Wächtler, Yannick c11af0e222 Added missing localized strings for account/accept/index.blade.php and view-assets.blade.php 2021-11-02 10:40:41 +01:00
Wächtler, Yannick 433d6fd3e0 Added localized strings for admin/companies 2021-11-02 10:23:15 +01:00
Wächtler, Yannick b784e63aa8 Added localized strings for account 2021-11-02 10:13:22 +01:00
Terrell Eaton 2c7a71a2a1 Fixes not being able to search by checked out user in advanced search 2021-11-01 22:14:19 +01:00
snipe eae9bf574f Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-10-29 14:11:58 -07:00
snipe 409600f29d Added S3 commented out settings in env example for clarity 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-29 14:11:54 -07:00
snipe e932cdf106
Merge pull request #9799 from Toreg87/fixes/fmcs_departments 
Fixed #9798: Scope departments for FullMultipleCompanySupport
 2021-10-28 18:18:16 -07:00
snipe ea0d92c439
Merge branch 'develop' into fixes/fmcs_departments 2021-10-28 18:18:08 -07:00
snipe 5458e44a40
Merge pull request #9508 from sh1hab/feature/remove_deleted_user_from_unaccepted_assets_report 
Feature #9378 remove deleted user from unaccepted assets report
 2021-10-28 18:11:19 -07:00