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

4353 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe
971fcf5800 Fixed #6633 - return 200 status code 2019-02-04 18:58:28 -08:00
Ivan Nieto
9ac40f705c Valo/ch37/cannot log in with generated password from (#6655) 
* Cannot log in with generated password from [ch37]

* Cannot log in with generated password from [ch37]. Light cleanup

* Added the fetchHumanBoolean() method.

* Cleaning up the ternary
 2019-01-31 19:58:54 -08:00
Daniel Ruf
2ad270cf33 ci: fix indentation (#6669) 2019-01-30 15:14:17 -08:00
Colin Campbell
ef8e20f66b Alpine linux docker image (#6645) 
* docker-alpine: Alpine linux container + apache 2.4 support

* docker-alpine: Force passport migrations (production mode Exception)

* docker-alpine: Copy default env in Dockerfile
 2019-01-30 14:45:36 -08:00
Daniel Ruf
8ce78c6b31 tests: allow to fail on PHP 7.3 and use the latest PHP 7.1 release (#6666) 2019-01-30 14:32:33 -08:00
Daniel Ruf
af3c8195af tests: fix expected string (#6665) 2019-01-30 14:12:20 -08:00
snipe
117b4c59cc Bumped minor version 2019-01-25 21:06:08 -08:00
snipe
9d21fc85bc Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report 2019-01-25 20:59:54 -08:00
snipe
194d0733d4 Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report 
This report will likely be deprecated.
 2019-01-25 20:57:14 -08:00
Ivan Nieto
79b41ee662 Importing with CSV into Encrypted Custom [ch86] (#6642) 2019-01-25 14:26:59 -08:00
Colin Campbell
f8d9301bd4 fix-docker-pecl: Fix Dockerfile after pear.php.net hack (#6641) 2019-01-25 13:41:39 -08:00
snipe
c1a4fbee16 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2019-01-25 13:34:57 -08:00
Colin Campbell
8c632f63b0 Misc ldap fixes (#6631) 
* misc_ldap_fixes: Map location from OU, not group

* misc_ldap_fixes: Ensure ldap is initialised for import

* misc_ldap_fixes: Import Job Title

* misc_ldap_fixes: Import telephone, fix field select from schema

* misc_ldap_fixes: Cleanup login error-handling, fix boolean tests
 2019-01-24 16:15:44 -08:00
Ivan Nieto
7d982c9ea6 Import page is blank [ch90] (#6636) 2019-01-24 15:34:50 -08:00
snipe
ec4161a959 Fixed typo 2019-01-24 15:21:38 -08:00
snipe
a371e8d53f Added calibration as a maintenance type 
Should just make these custmizable options
 2019-01-24 15:17:33 -08:00
snipe
8f09cca043 Fixed incorrect group route 2019-01-24 15:17:11 -08:00
snipe
b326d8593b Fixed bad groups route on error 2019-01-24 14:56:47 -08:00
snipe
d1fe7abb18 Replaced custom deleted query scopes with onlyTrashed() 2019-01-24 14:47:44 -08:00
snipe
39bca49e8f Specify table name in deleted user display 2019-01-24 14:38:18 -08:00
snipe
b8269020ae Specify table name in deleted user display 2019-01-24 14:37:39 -08:00
snipe
ffc51d6db6 Specify table name in deleted user display 2019-01-24 14:33:54 -08:00
snipe
394e51029e Only try to upload the audit file if one is provided 2019-01-24 14:04:06 -08:00
snipe
4b8f9d810b Fixed #6625 - include fully depreciated date in custom asset report 2019-01-24 12:38:17 -08:00
snipe
89a2ce1c6c Add @jackka as a contributor 2019-01-23 14:12:15 -08:00
snipe
c6ad7f80a8 Add @omyno as a contributor 2019-01-23 14:12:03 -08:00
snipe
7e6a59bdcc Add @KeenRivals as a contributor 2019-01-23 14:11:37 -08:00
snipe
8ebd9afd15 Add @reuser as a contributor 2019-01-23 14:11:23 -08:00
snipe
d1b9eddb34 Add @shinayoshi as a contributor 2019-01-23 14:11:11 -08:00
snipe
0394dd7ee5 Add @andreybolonin as a contributor 2019-01-23 14:10:59 -08:00
snipe
53c6c74a43 Add @fanta8897 as a contributor 2019-01-23 14:10:46 -08:00
snipe
65c5378a10 Add @Sxderp as a contributor 2019-01-23 14:10:35 -08:00
snipe
1c6cbbf8ee Add @smb as a contributor 2019-01-23 14:10:21 -08:00
snipe
10cb4ec401 Add @NMathar as a contributor 2019-01-23 14:10:06 -08:00
bricelabelle
5281713fd9 Added #6617: View licenses checked out to an asset with the hardware API (#6621) 2019-01-22 14:47:40 -08:00
snipe
7982b3f237 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2019-01-22 14:13:39 -08:00
snipe
07eead2dbf Fixed bug where assets could be deleted without being checked back in [ch38] 2019-01-22 14:13:30 -08:00
Ivan Nieto
3fa5976315 Language of mail doesn't show as intended by the settings. [ch87] (#6619) 
* Fixes #5554. Language of mail doesn't show as intended by the settings.
 2019-01-22 14:02:08 -08:00
NMathar
66f557d436 add user license api endpoint fix #6241 (#6616) 2019-01-22 13:48:15 -08:00
snipe
fdd6ddf61b Fixed favicon upload 
[ch309]
 2019-01-18 14:05:52 -08:00
snipe
4129463923 Added filesstem cache 2019-01-18 14:05:10 -08:00
snipe
601c129bbf Embed images in emails 2019-01-17 20:45:24 -08:00
Ivan Nieto
310ed0f1d3 Fix an issue when trying to checkin a license seat. [ch46] (#6599) 
* Fix an issue when trying to checkin a license seat.

* Minor changes in the checkin view, so it can returns to the expected place where the checkin is launched.
 2019-01-17 20:36:40 -08:00
snipe
b293d00699 Switch LDAP error to debug, to avoid crapping up the logs 2019-01-17 20:18:03 -08:00
snipe
1eace04ad9 Handle asset maintenances that do not have a valid asset associated 2019-01-16 02:26:42 -08:00
snipe
75a0cf97e2 Return an error if asset maintenance is associated with a non-existant asset 2019-01-16 02:19:57 -08:00
snipe
c055e3af21 Only try to return the asset tag link if a valid asset id has been passed 2019-01-16 02:19:35 -08:00
snipe
a1f93e733c Fixed undefined error when maintenance is associated with a deleted asset 2019-01-16 01:45:51 -08:00
Steffen
74c099f0b3 fix LDAP/AD sync: function calls for password creation (#6581) 
* - change generatePassword to be more secure (allow duplicate chars)
- move generatePassword from trait to helper
- fix summary output for sync command

* - Don't treat ldap_active_flag as boolean - fixes sync not working at all when ldap field is set
- Sync non activated users (But set activated=0)

* - Read user first before checking against user settings

* Fix failed logins to not throw exceptions
 2019-01-15 14:05:47 -08:00
fanta8897
49073742b5 Updating LDAP such that each user is not required to be bindable to LDAP (#6571) 
* Update Ldap.php

* Update Ldap.php

* Update Ldap.php

* Update Ldap.php

* Update Ldap.php

Updating LDAP.php such that the admin bind will ONLY occur if the user attempting auth cannot bind. If that is the case, it will attempt to bind as admin and search for that user, prior to failing.
 2019-01-15 14:04:21 -08:00