DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
5526 commits 90 branches 265 tags 290 MiB
Commit graph

5526 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe aec2f2a249 Fixed #8576 - switch to HTML from markdown 
This is really stupid. A markdown table with over 3 columns doesn’t render correctly. :(
 2020-10-23 06:54:45 -07:00
snipe 831da2d6d1 New mail vendor files 2020-10-23 06:17:07 -07:00
snipe f2aebe5f9a Fixed #8558 - error on asset acceptance when no sig is required 2020-10-23 05:09:03 -07:00
snipe 40c0ba9a95 Merge remote-tracking branch 'origin/develop' 2020-10-23 04:46:44 -07:00
snipe f5a0726f98 Fixed #8597 - Added leading slash to notifications console commands 2020-10-23 04:46:26 -07:00
snipe 2263dae8f4 Fixed HTML 2020-10-23 04:07:55 -07:00
snipe f182ce1c89 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-10-23 01:12:54 -07:00
snipe c6dde67e86 Bumped version 2020-10-23 01:12:19 -07:00
snipe 88f03e6b55 Added last_checkout and notes from pivot for accessories 2020-10-23 00:44:26 -07:00
snipe 8827d33a43 Fixed query to copy notes 2020-10-23 00:25:20 -07:00
snipe c3e8f64064 Merge remote-tracking branch 'origin/develop' 2020-10-22 23:24:56 -07:00
snipe 68cfbaab2e Fixed signature issue on accepted assets - related to #8577 
I have no idea how this ever worked? We didn’t rename that fieldname recently.
 2020-10-22 23:20:55 -07:00
snipe 66ac5d05ad Started migration to normalize note 2020-10-22 23:18:14 -07:00
Brady Wetherington 18012279f9 Possible fix to #8563 - unset $ldapUsers to avoid OOM'ing 2020-10-22 21:51:23 -07:00
Brady Wetherington 2abfd8da74
Merge pull request #8568 from uberbrady/fix_wordy_json_ldap_output 
Add a dirtiness check to slim down JSON LDAP sync summaries
 2020-10-22 21:18:21 -07:00
snipe ec7d70cea0
Merge pull request #8551 from Godmartinz/bug/ch10148/error-when-using-dark-green-skin 
fixed the Green skin (dark mode) color scheme on the importer page and asset table
 2020-10-22 21:16:52 -07:00
snipe 6c285b0273
Merge pull request #8586 from Godmartinz/Confusing_wording_in_LDAP 
reworded the ad_append_domain_help string
 2020-10-22 21:15:35 -07:00
snipe e65269e9c7 Merge remote-tracking branch 'origin/develop' 2020-10-22 20:09:16 -07:00
snipe 5d112be49a Fixed #8585 - requested assets page blank 2020-10-22 20:08:33 -07:00
snipe d3f5fde84a Merge remote-tracking branch 'origin/develop' 2020-10-22 19:46:55 -07:00
snipe 496b176d4e Fixed #8589 - unable to accept asset 2020-10-22 19:46:40 -07:00
snipe fd66f7aeb4 Merge remote-tracking branch 'origin/develop' 2020-10-22 19:37:21 -07:00
snipe c71086d2f3 Fixed #8590 - unable to checkin and delete from user view 2020-10-22 19:32:51 -07:00
snipe 153f849ef7
Merge pull request #8581 from fashberg/iss8580 
Fixed #8580: ReportsController called method on NULL Object
 2020-10-22 13:00:08 -07:00
Godfrey M fcdb945f5f reworded the ad_append_domain_help string 2020-10-22 09:21:18 -07:00
Folke Ashberg 377c92a290
update 2020-10-22 14:33:24 +02:00
Folke Ashberg 5824ac3b28
Fix for #8580 
Checking $asset->depreciation before calling $asset->depreciated_date()
 2020-10-22 14:22:42 +02:00
Brady Wetherington fad0ed6d5b Add a dirtiness check to slim down JSON LDAP sync summaries 2020-10-21 15:13:36 -07:00
snipe ec9c69323a Merge remote-tracking branch 'origin/develop' 2020-10-21 13:58:58 -07:00
snipe 338106734a Fixed #8562 - manufacturer logo upload failing 2020-10-21 13:57:56 -07:00
snipe 81fcb4c7b3 Merge remote-tracking branch 'origin/develop' 2020-10-21 13:33:04 -07:00
snipe 5ae65d5329 Fixed #8566 - PDF files displaying as ascii instead of downloading 2020-10-21 13:32:46 -07:00
snipe d04b0e4d4b Merge remote-tracking branch 'origin/develop' 2020-10-21 12:23:44 -07:00
snipe a6d0209e93 Fixed #8567 - don’t require model for custom report 2020-10-21 12:23:27 -07:00
snipe 810f6a3970 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-10-21 12:03:23 -07:00
snipe 1379821876 Removed accompanying method, since we don’t use it 2020-10-21 12:02:25 -07:00
snipe 33236f16ac Bumped minor version 2020-10-21 12:01:36 -07:00
snipe 90dddee923 Remove the storage moving commands - we don’t use this 2020-10-21 12:00:40 -07:00
snipe 7869ffcc79
Merge pull request #8557 from fashberg/develop 
Fixed #8543: Change trustedproxy.php to read env('APP_TRUSTED_PROXIES') again
 2020-10-21 11:19:23 -07:00
Folke Ashberg 1687e4b850
Fix for Issue #8543 
* trustedproxy.php sets 'proxies' again according to
  env('APP_TRUSTED_PROXIES') again
 2020-10-21 10:36:27 +02:00
Godfrey M 4a3d8f2cc0 fixed the Green skin (dark mode) color scheme on the importer page and assets table 2020-10-20 15:22:38 -07:00
snipe c19f1b77b0
Merge pull request #8542 from benwa/patch-2 
Fix typo
 2020-10-20 10:51:45 -07:00
Bennett Blodinger 132f296f03
Fix typo 2020-10-20 08:13:52 -05:00
snipe 870b097f03 Derp. Should be master 2020-10-19 17:49:56 -07:00
snipe 3e2996a46a Merge remote-tracking branch 'origin/develop' 2020-10-19 16:57:24 -07:00
snipe 1090b291c3 Updated node packages, reregnerated assets 2020-10-19 16:56:59 -07:00
snipe 12ae408830 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	resources/views/auth/passwords/reset.blade.php
 2020-10-19 16:40:07 -07:00
snipe a62e8413ba Updated version 2020-10-19 16:36:25 -07:00
snipe c1443aa6eb Pull licenses, accessories, etc - the qty is not accurately reflected 2020-10-19 16:22:55 -07:00
snipe e80b63b5c1 Fixed #8526 - skip cache for setup check 2020-10-19 12:33:38 -07:00