DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 11:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15658 commits 96 branches 267 tags 296 MiB
Commit graph

15658 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe ae4ba6176d Merge branch 'develop' 2017-10-06 17:04:06 -07:00
snipe e461c25428 Apply model image fix to update method 2017-10-06 17:03:51 -07:00
snipe ea4bfdc51d Merge branch 'develop' 2017-10-06 16:57:51 -07:00
snipe 554ea8bb95 Fixed asset model image validation 2017-10-06 16:56:43 -07:00
Richard Hofman f2be409914 LDAP sync improvements and DB query fix. (#4148) 
* Set 'ldap_ou' Location field to NULL when an empty string is submitted.

* Consolidate LDAP user import logic in LdapSync.php.
 2017-10-06 16:15:14 -07:00
snipe 3fc1bbea73 Apply PR changes to master. Again? 2017-10-06 14:28:19 -07:00
snipe a97f7d2277 Merge branch 'develop' 2017-10-06 14:27:46 -07:00
snipe af70cdaeac Adds email address to CoC 2017-10-06 13:44:39 -07:00
snipe 8919c3b52a Merge branch 'develop' 
# Conflicts:
#	snipeit.sh
 2017-10-05 23:14:13 -07:00
snipe f580e20bc3 Fixed custom fields filter for advanced search 2017-10-05 23:09:02 -07:00
snipe a054cec7c9 Supress output if no title is given 
This should never happen, but….
 2017-10-05 22:51:33 -07:00
tiagom62 1ad7bbdd0c Support configuring smtp settings (#4161) 
* Able to configure smtp settings. General cleanup.

* Check if sudo is available.
 2017-10-05 21:27:00 -07:00
snipe cfe6759825 Merge branch 'develop' 2017-10-05 00:41:30 -07:00
snipe 10c13baf2b Add @GeoffYoung as a contributor 2017-10-05 00:40:32 -07:00
snipe 9fe4e11874 Merge branch 'develop' 
# Conflicts:
#	snipeit.sh
 2017-10-05 00:37:16 -07:00
snipe f6d8642799 Fix $search variable to $search_var for new filter 2017-10-05 00:35:37 -07:00
snipe adddc5324b Add @imjennyli as a contributor 2017-10-05 00:34:50 -07:00
snipe f442b70ae7 Apply PR #4133 to develop 2017-10-05 00:02:14 -07:00
madd15 7b10213b3a Small UI Tweaks to Accessories (#4149) 
* Small UI Change

Changing Save button for Checkout button and adding Cancel button

* Small UI Change

Move buttons to match checkout page and remove extra save button
 2017-10-04 23:28:13 -07:00
tiagom62 ddc79b9070 Support Ubuntu and Debian installs. (#4133) 
* Ubuntu related fixes.

* Further cleanup.

* Support Debian 9 install. More cleanup.
 2017-10-04 23:19:38 -07:00
Jenny Li 5e9b04b0f5 update broken link to contributor docs (#4123) 2017-10-04 23:19:19 -07:00
snipe 2562eb2aeb Merge branch 'develop' 2017-10-03 21:23:46 -07:00
snipe 85da30894b Bumped version 2017-10-03 21:23:27 -07:00
snipe bf344e9322 Merge branch 'develop' 2017-10-03 21:03:19 -07:00
snipe f66e222f3d Fixes #4132 - associated accessory users 2017-10-03 21:03:00 -07:00
snipe fb180d74a1 Merge branch 'develop' 2017-10-03 18:12:47 -07:00
snipe eaf55f5e79 Hide table toolbar id models are deleted 2017-10-03 18:12:30 -07:00
snipe 8edb586576 Merge branch 'develop' 2017-10-03 18:06:59 -07:00
snipe 32b01b8f38 Toggle button deleted/not for models 2017-10-03 18:06:41 -07:00
snipe 340386f282 Merge branch 'develop' 2017-10-03 17:55:21 -07:00
snipe 6dd4282f1f Fixes #4130 - show deleted asset models 2017-10-03 17:53:08 -07:00
snipe 3f44987799 Small logo size tweaks 2017-10-03 14:15:03 -07:00
snipe b4fec068d0 Use asset url for favicon on login blade 2017-10-03 13:44:50 -07:00
snipe 512632ce60 Make the export button contextual for requested status 2017-10-03 12:50:18 -07:00
snipe 58a9b0d3e8 Normalized route name 2017-10-03 12:50:01 -07:00
snipe fcb1283a14 Added missing deployed page title 2017-10-03 12:49:53 -07:00
snipe 54671af7f0 Small export assets fix 2017-10-03 11:49:41 -07:00
snipe aedabb0920 Merge branch 'develop' 2017-10-03 11:29:06 -07:00
snipe aaf4acef83 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-10-03 11:28:45 -07:00
snipe 8e73cacf4e Fixes custom report to include assigned to names, etc 2017-10-03 10:38:28 -07:00
Daniel Meltzer b4b2daebbd Fix Importer tests. (#4122) 2017-10-03 09:14:04 -07:00
snipe 3e2c18cb4d Merge branch 'develop' 2017-10-03 08:47:57 -07:00
snipe c721fdd793 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-10-03 08:46:25 -07:00
Daniel Meltzer d119372ff0 Fix License Import. (#4121) 
The license name is not unique, so keying by license alone was causing issues.  Match using name + serial instead.
 2017-10-03 08:46:06 -07:00
snipe c8bed867da Export PDF as landscape 2017-10-03 07:32:18 -07:00
snipe 3a470ce789 Only report exceptions we want to see 2017-10-03 07:28:00 -07:00
snipe f9105719a8 Merge branch 'develop' 2017-10-03 05:16:11 -07:00
snipe d303cbd7cb Bumped version 2017-10-03 05:15:52 -07:00
snipe 96c09e7264 Merge branch 'develop' 2017-10-03 02:05:47 -07:00
snipe ef19bc7c16 Workaround to fix #4117 
This shouldn’t be necessary, but it looks like some folks missed the migration that drops the FK for company_id
 2017-10-03 02:05:22 -07:00