DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
827 commits 101 branches 268 tags 320 MiB
Commit graph

827 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 07b70a8cd0 Merge remote-tracking branch 'origin/develop' 2016-07-27 20:30:25 -07:00
snipe e9eb5ad372 Bumped version 2016-07-27 20:30:11 -07:00
snipe 3fd5fb836f Restore linebreaks in notes 2016-07-27 20:24:09 -07:00
snipe 3514ae2c0d Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-07-27 20:16:54 -07:00
snipe 1493251794 Gitignore cleanup 2016-07-27 20:16:46 -07:00
Daniel Meltzer b4e54225a2 Fix exports (#2338) 
* Update tableexport.js to the new version.

* Give the export file in each table a useful name.

The name takes the form of tabletype-export-YYYY-MM-DD.extension.
 2016-07-27 19:45:45 -07:00
Daniel Meltzer 4c9e75cec9 Install php-zip so backups work. Not needed in 14.04 because it looks like this is part of the php7 split. (#2340) 
Issue #2269
 2016-07-27 19:44:46 -07:00
Daniel Meltzer a401986ef5 Only set the category_type in postEdit if the category is empty. (#2337) 
Fixes #2333
 2016-07-27 16:13:54 -07:00
snipe 288584cb60 Merge branch 'master' of github.com:snipe/snipe-it 2016-07-26 16:33:32 -07:00
Daniel Meltzer 399e70763b Scope requestable assets to company as well. Updates to #2206. (#2326) 2016-07-26 16:22:56 -07:00
Brady Wetherington f145d6cc8c Change README to point to new documentation site 2016-07-26 13:56:40 -07:00
Daniel Meltzer 9e4ac018ea Don't allow users without a company to change the company of items if full company support is enabled. (#2321) 2016-07-26 13:31:36 -07:00
Daniel Meltzer 0bf5c6978e Make sure the assigned user is actually shown in the dropdown list. Not sure why this wasn't throwing an error for me, but this makes it actually behave. (#2322) 2016-07-26 13:06:38 -07:00
snipe 9a9b214c1d Fixes #2319 2016-07-26 06:07:47 -07:00
snipe b76dc25ac0 Duh, we don’t soft-delete companies 2016-07-26 02:11:41 -07:00
snipe b30369f7ce Added table name for trait 2016-07-26 02:04:31 -07:00
snipe 16fe53928c Updated undeleted validation 2016-07-26 01:49:21 -07:00
snipe 2e665e128f Putting uniqueUndeleted into a trait for use across models 2016-07-26 01:39:30 -07:00
snipe 60560e4994 Remove unused Log statement 2016-07-26 00:50:16 -07:00
snipe a44b90dfc9 Custom validator for multiple deleted items with the same unique field 2016-07-26 00:44:26 -07:00
snipe 987b969e88 Move bcrypt out of loop for object importer 2016-07-25 22:31:33 -07:00
snipe ad531d6d59 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-07-25 22:10:38 -07:00
snipe 261d2f133b Only bcrypt temp passwords once for performance 2016-07-25 22:10:33 -07:00
Daniel Meltzer e0938cf82d Scope to company when viewing assets (#2315) 
* If a user doesn't belong to a company, when scoping to a company we should only show items that don't belong to a company.

* Scope tables/items to the company they belong to when fetching items for the index.

* Fix asset count to also scope to company.  This fixes dashboard view

* Exempt super users from the child company check to be consistent.  Fixes license count on dashboard now that we scope everything
 2016-07-25 19:46:29 -07:00
snipe eec22c5aeb Removed port stuff, since LDAP ignores it anyway :-/ 2016-07-22 16:21:16 -07:00
snipe b03330aae0 Added TLS option in settings for LDAP 2016-07-22 16:00:37 -07:00
snipe 7f5ea72dc7 Bumped version 2016-07-22 15:11:03 -07:00
snipe ba25972b49 Add LDAP port number option 2016-07-22 15:09:49 -07:00
snipe cc6b2a0081 FIxes #2280 
This shouldn’t ever happen though. Bad data somwhere, I’m guessing.
 2016-07-22 07:48:46 -07:00
snipe a590cc3dd2 One more fix for MAC address weirdness 2016-07-22 05:56:00 -07:00
snipe d4138f4364 Fixes #2299 2016-07-22 03:10:25 -07:00
snipe 128290bd82 Cleanup checkin blade 2016-07-22 02:34:25 -07:00
snipe 114540d836 Cleanup checkout form 2016-07-22 02:20:05 -07:00
snipe 0b57f74e36 Check for model name (this should never be blank, but…) 2016-07-22 02:14:12 -07:00
snipe 03d7d01e12 Fixes #2300 2016-07-22 02:12:04 -07:00
snipe a1640d7fe3 Form cleanup 2016-07-22 02:11:57 -07:00
snipe 1f85f4b337 Clearer demo mode text 2016-07-22 02:11:46 -07:00
snipe b2d958724b Removed commented code 2016-07-22 02:11:37 -07:00
snipe 297820d347 Newer required style 2016-07-22 01:33:55 -07:00
snipe 094c5ac8df Fixes #2292 2016-07-22 01:16:18 -07:00
snipe 78fda31379 Helper method to introspect into the model level validation to see if the field is required 
(This does not yet handle form request validation)
 2016-07-22 00:29:23 -07:00
snipe 3a04686ade Nicer demo mode message 2016-07-22 00:28:22 -07:00
snipe ca5d3e3006 Nicer license form display 2016-07-22 00:25:41 -07:00
snipe d427dcc8e2 updated version 2016-07-22 00:24:42 -07:00
snipe f0c00897ca Required class 2016-07-22 00:21:56 -07:00
snipe e256bdc9f7 Clearer version in footer 2016-07-21 21:39:23 -07:00
snipe 2e6e0e8911 Fixed versioning path 2016-07-21 21:30:49 -07:00
snipe b0dc5b4183 Fixes #2290 2016-07-21 21:28:17 -07:00
snipe 9385c3e9cf Remove last name requirement from Form Request 2016-07-21 19:46:46 -07:00
snipe 61108102d7 No longer require last name 
I may regret this…
 2016-07-21 19:44:07 -07:00