DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4053 commits 97 branches 266 tags 291 MiB
Commit graph

1289 commits

Author SHA1 Message Date
Wes Hulette ce0a40a20c Merge branch 'develop' into JS_Cleanup 2018-10-01 08:07:07 -04:00
snipe 153a711de4 Fixed css URL error 2018-09-28 23:18:16 -07:00
Wes Hulette c090a2f0b6 Fixed script imports in setup.blade.php 2018-09-28 17:28:49 -04:00
Wes Hulette 11f128a84f Moved chart.js library into vendor.js 2018-09-28 17:28:49 -04:00
Wes Hulette 991a00b38f Updated pGenerator jQuery Plugin to v1.0.5 2018-09-28 17:27:34 -04:00
Wes Hulette e80dfc886e Added admin-lte-options file, moved pGenerator to main js file 2018-09-28 17:27:06 -04:00
Wes Hulette b84eb836f4 Cleaned up JS 
Removed unnecessary JS files
Moved JS to app & vendor, so neither file is so large, plus they can be downloaded concurrently.
 2018-09-28 17:27:06 -04:00
Wes Hulette ecf77e60df Added: #6246 - CSS Cleanup (#6247) 
* Streamlined CSS by using NPM

Removed unnecessary CSS files
Merged CSS files into one file

* Streamlined CSS by using NPM

Removed unnecessary CSS files
Merged CSS files into one file

* Removed override.less

* Moved bootstrap-color-picker css to file

Removed inline calls

* Changed css import on setup.blade.php

* Updated signature-pad.css import

* NPM Prod compile

* Fixed font family loading issue.
 2018-09-28 14:09:48 -07:00
snipe a5abb3e6a6 Fixes #6252 - activated flag not checked when editing active user 2018-09-28 11:19:43 -07:00
Ivan Nieto 309f102745 Weird syntax in layout.blade.php. Change the use of 'or' operator to the null coalesce operator (#6240) 2018-09-26 22:33:34 -07:00
snipe 115f718cd9 Fix view if model doesnt have a manufacturer 2018-09-24 19:10:24 -07:00
Brady Wetherington c97db3259f
Merge pull request #5913 from tilldeeke/refactore-checkout-checkin-notification-sending 
Refactor: Decouple checkin/checkout notifications from logging
 2018-09-21 18:18:27 -07:00
snipe e45b4efa1a Better info buttons on audit 
TODO: translated strings instead
 2018-09-07 18:08:18 -07:00
snipe 827295a989 Fixed tooltips 2018-09-07 05:39:56 -07:00
snipe ff879e2018 Added the ability to update asset location when auditing - per #5854 2018-09-07 05:39:41 -07:00
snipe e89b33f865 Enable popovers 2018-09-07 05:09:24 -07:00
snipe 77cdb2f409 Added console command to send inventory reports to users 2018-09-07 02:24:41 -07:00
snipe 84cc90e427 Added alt text to email headers 2018-09-05 18:57:36 -07:00
Wes Hulette a865f79d5e Fixed dashboard tables not showing data (#6143) 
Needed data-pagination="true" set
 2018-08-29 12:29:47 -07:00
Wes Hulette bfb5920677 Added #5956 - Moved bootstrap-tables to npm (#6139) 
Created single bootstrap-tables js and css file.
 2018-08-28 13:10:27 -07:00
patrict cf2d2ecdfc Depreciation Report: (#6135) 
* Added monthly depreciation column
* Right aligned amount column headings
* Added monthly depreciation heading text for en, en-GB & af
 2018-08-28 12:40:06 -07:00
Dmitriy Minaev bc8fa31eb2 Add depreciation with half-year convention. Fixed #1237 (#6128) 
* Add half-year convention in depreciation for Models/Depreciable.php

* Add a setting for the depreciation method

* Integrate half-year convention inside working output

* fix: add more checks at Depreciable.php

* depreciation value rounding

* Codestyle fix
 2018-08-28 12:32:46 -07:00
liquidhorse 678ba228cb Fixed #6079: QR Code unnecessarily squished. (#6080) 
* Fixed 2D barcode from being squished unnecessarily when 1D barcode is omitted.
Added one character of whitespace for code readability.
 2018-08-28 12:29:50 -07:00
snipe 0b8d70c7ec Fixed #6124 2018-08-23 21:06:04 -07:00
snipe f6971b8ab2 Fixed #6082 - don’t show expected checkin in email if none given 2018-08-16 14:30:06 -07:00
snipe ce45c3af4e Updated password reset language 2018-08-14 18:11:32 -07:00
Till Deeke 8648d53d25 Adds checkout acceptances 
A checkout acceptance gets generated for every item that needs to be checked out. This resource tracks the user user who can accept the item and their signature
 2018-08-06 14:47:26 +02:00
Till Deeke 830a6cf67e Adds accepting/declining to new controller 2018-08-06 14:46:10 +02:00
snipe 1a660911e7 Check for minimum PHP version in setup 2018-08-02 21:36:18 -07:00
snipe 134bddf4c7 Fixed #6029 - model number not appearing in checkin/checkout emails 2018-08-02 11:43:11 -07:00
Daniel Meltzer 2637ce56a1 Allow importcontroller to return 200 for failed delete. (#6034) 2018-08-02 09:53:54 -07:00
snipe ffed306ecd
Removed old emaol templates (#6026) 
Still testing this to make sure it doesn’t break anything else :)
 2018-08-01 20:56:32 -07:00
snipe f5a5d830a5 Better handling for deleting imports where the files may have been moved 2018-08-01 20:49:55 -07:00
snipe 6f8680efa6 Added external link formatter to BS tables 2018-08-01 18:01:31 -07:00
snipe 3f394f42c7 Partial fix for better UI on deleting files 
Still needs Vue stuff
 2018-08-01 18:01:16 -07:00
snipe b2c99c88bb Fixed #6028 - added supplier url to list view 2018-08-01 17:37:58 -07:00
snipe a4019c9f63 NIcer UI for activated user + email credentials 2018-08-01 14:18:37 -07:00
snipe 694166862e
Added attempted logins admin screen (#6018) 
* Added attempted logins admin screen

* Smaller table spacing
 2018-08-01 03:51:59 -07:00
snipe a209a92de8 Fixed #6011 - use correct file created at date 2018-08-01 02:43:08 -07:00
snipe 3941437ad4 Limit width of title logo so it doesn’t break with long names 2018-08-01 00:27:14 -07:00
snipe 664cc24481 Fixed PR #6002 2018-08-01 00:26:50 -07:00
Sam 6ae096a56f These changes will allow submissions during the AJAX process in Select2s. This allows for barcode scanners, magstrip and NFC scanners that enter a carriage return. (#6002) 2018-08-01 00:06:28 -07:00
snipe b1b5eeecba Fixed #6013 - add accessory checkout notes to detail page 2018-07-31 16:00:38 -07:00
snipe 400913631c Use language strings for bulk password reset 2018-07-30 20:37:19 -07:00
snipe 006a3adea0 Added ability to trigger forgotten password emails for users 2018-07-30 20:31:02 -07:00
Daniel Meltzer b58c77c8b8 Feature: Import users department. (#5987) 
Maps to the "Department" header key by default.  Bug: #5382
 2018-07-27 12:02:18 -07:00
snipe b267b34762 Make sure there is a settings value 2018-07-25 19:02:35 -07:00
snipe a5daee811b Split out custom_css from custom_header color 2018-07-25 19:00:03 -07:00
snipe 2e92ef7d77 Removed HTML colspan for bootstrap table in files display 2018-07-25 07:40:04 -07:00
snipe 3df19d267f Fixed Ziggy routes 2018-07-25 03:00:27 -07:00