lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
4147 commits 1 branch 0 tags 220 MiB
Commit graph

4147 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wes Hulette
34246ee4ef [WIP] v5 Develop: New LDAP implementation (#6352) 
* Fixed missing oauth tables during setup.

* WIP New LDAP implementation

* WIP New LDAP implementation

* WIP New LDAP implementation


Merge remote-tracking branch 'origin/WIP_LDAP' into WIP_LDAP

* WIP New LDAP implementation

Added Adldap2 to handle ldap intergration.

* Updated per PR quality review

* Added specific LDAP settings method

* Corrected version number

* Added return documentation

* Added imports

* Changed class to be injected into controller

* Updated with PR suggestions
 2018-12-06 14:05:43 -08:00
snipe
3ed2f55696 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-12-05 19:56:18 -08:00
snipe
09c4dd4891 Added ability to upload favicon and email logo 
todo: refactor the image upload/resize for less copypasta
 2018-12-05 19:56:12 -08:00
snipe
81f9f717dc Updated favicon with new branding 2018-12-05 18:55:23 -08:00
snipe
fb502df089 Fixed dumb code indenting 2018-12-05 18:36:39 -08:00
Ivan Nieto
f91e340178 Fixes #6341. Adding condition that checks offset of licenses seats when the user looks other page than the first. (#6392) 2018-12-05 18:09:54 -08:00
snipe
f6c0e7cc9c Fixed #6464 - added company name to searchable field in user search 2018-12-05 17:20:22 -08:00
snipe
9f73fcf308 Added #6463 - ability to override session path in .env 2018-12-05 17:17:11 -08:00
Evgeny
dd7db95135 A couple hardcoded strings replaced in according with #6406 (#6412) 
Hardcoded strings was replaced with corresponding placeholders.
Log statuses mentioned in #6406 wasn't translated cause it needs more separate complicated development
 2018-11-08 15:20:44 -08:00
snipe
b6daad7573 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-11-02 17:15:08 -07:00
snipe
67d2953080 Fixed #6386 - licenses not searching on category name 2018-11-02 17:15:04 -07:00
Wes Hulette
0d2eef5894 v5 Develop Fixed: Setup error because setting table does not exist (#6390) 
* Fixed missing oauth tables during setup.

* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop

* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop



Merge remote-tracking branch 'origin/develop' into develop

* Fixed error during setup when settings table is not present
 2018-11-02 12:23:41 -07:00
Wes Hulette
88b1da4260 Added: Caching of settings (#6378) 
* Fixed missing oauth tables during setup.

* Cache settings

Cache the setting to reduce unnecessary database calls
 2018-11-01 19:59:50 -07:00
Wes Hulette
0730685c29 v5 Develop Fixed: LDAP Settings Password being updated when field is empty (#6384) 
* Fixed missing oauth tables during setup.

* Fixed password saving

Previous Input::has always returned true, even if password was an empty string.
 2018-11-01 13:36:30 -07:00
snipe
ea91d59ffc
Use username instead of email address in password reset (#6382) 
* Switch to use username instead of email

* Fixed indenting

* Updated password language

* Updated blades to reflect username instead of email

* Changed password/reset controllers to use username instead of email

* Redirect to login page instead of repeating the password reset form
 2018-10-31 18:03:24 -07:00
snipe
ce8d47b2b4 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-10-31 15:19:18 -07:00
snipe
65aef11ae3 Fixed #5879 - added user department filter for custom report 2018-10-31 15:19:13 -07:00
snipe
8f22cf7c3c Added dept update API endpoint 2018-10-31 14:31:57 -07:00
Tim Bishop
7835cc34c8 Insert audited items to the top of the list. (#6376) 
When doing a large number of items they soon disappear off the bottom of
the screen. It's handy to be able to check the result as it's happening
so adding them to the top of the list keeps the most recent items visible.

Move the "Processing..." spinner to the header so it stays at the top.
 2018-10-31 11:13:08 -07:00
snipe
2cecd5e056 One more fix for #6175 (non-accessories) 2018-10-31 10:23:47 -07:00
snipe
5da9120870 Fixed #6175 - crashing when accessory has been deleted 
My guess would be this crash (reported in #6175) was happening because of deleted accessories/accessory rows.
 2018-10-31 10:23:32 -07:00
snipe
5faf8bfcd0 Fixed error on unaccepted asset report 2018-10-29 14:39:42 -07:00
snipe
f0e6a5c905 Fixed error on asset creation 2018-10-29 14:35:34 -07:00
snipe
a483e9365b Add APP_LOG_LEVEL to new logging config 2018-10-25 21:01:14 -07:00
snipe
e443a576f7 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-10-19 16:46:53 -07:00
snipe
20b26effdb Fixed #6349 - add view permission for print all assigned 2018-10-19 16:46:46 -07:00
Wes Hulette
b3672d6365 Fixed: Settings seeder error (#6334) 
* Fixed missing oauth tables during setup.

* Fixed seeding error

Required setting pwd_secure_min was missing from seeder.
 2018-10-17 13:38:27 -07:00
Wes Hulette
a975117eaf Fixed: #6325 & #6317 (#6335) 
* Fixed missing oauth tables during setup.

* Fixed missing manager_id and department_id
 2018-10-17 13:38:13 -07:00
Wes Hulette
465b69516d Fixed: #6259 - Remove remote JS/CSS file loading (#6330) 
* Fixed missing oauth tables during setup.

* Remove remote JS/CSS file loading


Updated gravatar to return to default image

* Updated default avatar path to user url

Removed local html5shim & response js files.
Removed copying html5shim & respond js file to public directory
 2018-10-17 12:52:01 -07:00
snipe
2ded2ff53a Make dashboard snapshots clickable 2018-10-15 18:19:30 -07:00
snipe
74c20e62d5 Fixed - suppress the asset create button if the user is not allowed to create assets 2018-10-15 17:57:47 -07:00
snipe
0dbce93d1b Better logic for disallowing company selection when user is not a superadmin and FCS is enabled 2018-10-15 17:57:28 -07:00
snipe
9797412d23 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-10-15 17:02:39 -07:00
snipe
6b6cf06530 Display asset name if one exists and the user cannot edit 2018-10-15 17:02:31 -07:00
snipe
539c3023b9 Added - check whether the user can edit an asset before allowing them to change the name on checkout 2018-10-15 16:52:45 -07:00
snipe
78b6e84774 Allow min:0 for consumables 2018-10-15 16:52:20 -07:00
Joe Ferguson
704209de9c Fixed #6301: Do not allow duplicate asset tags (#6324) 
* Fixed #6301: Do not allow duplicate asset tags

* Display error message for single asset_tag failure
 2018-10-11 17:15:09 -07:00
snipe
b8f8d49927 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-10-11 15:29:48 -07:00
snipe
63a2727077 Fixed #6323 - typo in link for low inventory 2018-10-11 15:29:38 -07:00
Ivan Nieto
5516978f2e #5696 proposed fix (#6314) 
* Another 'or' caught in a blade template

* Added the requireAcceptance() method in LicenseSeat.php. Changed the permission in checkout-license mail to view.

* Getting right the permission in the view checkout-license
 2018-10-11 14:08:09 -07:00
Wes Hulette
19ee62f704 Fixed: Missing JS file import (#6320) 
* Fixed missing oauth tables during setup.

* Fixed missing JS import
 2018-10-11 13:51:37 -07:00
snipe
dff674b4ab Production assets 2018-10-09 16:12:43 -07:00
snipe
73788817ff Fixed #6306 - seed settings if no record exists 2018-10-09 16:12:26 -07:00
Wes Hulette
d715ecf41d Fixed: Tooltips (#6309) 
* Fixed missing oauth tables during setup.

* Fixed missing tooltips

Updated spelling in bootstrap-table.blade.php to use bootstrap data element. 
Using custom jquery-ui without tooltips to fix conflict issue.

* Removed custom jQuery ui file added fix in bootstrap.js file
 2018-10-09 15:20:27 -07:00
Wes Hulette
6818901f7d Fixed: Admin LTE left menu bar not working (#6308) 
* Fixed missing oauth tables during setup.

* Updated per AdminLTE upgrade guide.
 2018-10-09 15:20:12 -07:00
Wes Hulette
19bc158ff4 Fixed tooltips and iCheck (#6303) 
* Fixed missing oauth tables during setup.

* Fixed duplicate style tag

This was causing webpack issues.

* Deleted erroneously created directory

* Removed duplicate imports

* Fixed tooltips, iCheck audit page

https://github.com/snipe/snipe-it/pull/6285#issuecomment-427235280

* Merge remote-tracking branch 'origin/#6285-Fixes' into #6285-Fixes
Fixed Manifest file
 2018-10-05 07:41:04 -07:00
snipe
a516e4278e Remove company select option if the user is not an admin and FCS is enabled 2018-10-05 07:30:42 -07:00
snipe
c21524f240 Fixed NaN when no asset tag is provided 2018-10-05 05:42:28 -07:00
snipe
ecb8204c3c Associate serials with multiple asset creation 2018-10-05 05:30:13 -07:00
snipe
476b58632b Handle array of asset tags 
TODO: figure out how to display validation errors more sanely
 2018-10-05 04:34:47 -07:00