Commit graph

408 commits

Author SHA1 Message Date
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
ba25972b49 Add LDAP port number option 2016-07-22 15:09:49 -07:00
snipe
d4138f4364 Fixes #2299 2016-07-22 03:10:25 -07:00
snipe
b2d958724b Removed commented code 2016-07-22 02:11:37 -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
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
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
Daniel Meltzer
68b0bbbec9 Fix tests (#2273)
* Update installer script for v3 now that things have moved around.

* Make Statuslabel attributes fillable and add them to the generated array.  Fixes status label tests.
2016-07-19 15:50:21 -07:00
snipe
52425f62c5 Set default values for status labels in import 2016-07-19 15:49:04 -07:00
Daniel Meltzer
68d8e6a3a9 Importer again (#2260)
* Quote item names when displaying in error table.

* Remove the danger class as well as the warning class when uploading a file.  Fixes a display error if a file is successful after a file fails upload.
2016-07-18 15:46:03 -07:00
snipe
192b1582f5 Merge branch 'v3' of git@github.com:snipe/snipe-it.git 2016-07-15 16:46:15 -07:00
snipe
27b8d326e3 fix for undefined user 2016-07-15 16:38:49 -07:00
snipe
698cb161d4 Not sure how this ever worked? 2016-07-15 11:11:48 -07:00
snipe
92175eb700 Few more LDAP/AD tweaks 2016-07-14 23:49:32 -07:00
snipe
c1d2be651a Removed default pemissions 2016-07-14 18:32:54 -07:00
snipe
8729871353 Fucking rookie mistake. Send redbull. 2016-07-14 16:52:20 -07:00
snipe
99a42dfc38 More AD fixes 2016-07-14 16:27:32 -07:00
snipe
0cf8ac1d95 Add AD domain to settings 2016-07-14 15:52:52 -07:00
snipe
8fd8e747d9 Fix for missing input variable in suppliers ajax method 2016-07-13 22:35:21 -07:00
snipe
e6b872299d Possible fix for #2246 - needs AD testing 2016-07-13 15:18:29 -07:00
snipe
40b56cfad7 Removed unused variables 2016-07-13 07:24:54 -07:00
snipe
5cd2c78d5e Link to location view, not edit 2016-07-13 07:16:10 -07:00
snipe
2ce1d8b985 Fixed missing use statement 2016-07-13 07:13:49 -07:00
snipe
ab6e2a7301 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-07-13 05:50:45 -07:00
snipe
e7038cfdc8 LDAP tester 2016-07-13 05:50:40 -07:00
snipe
4233c781ac Reworked LDAP login. Fixes #2218
LDAP no longer fails completely when the connection settings are wrong, or when app key is messed up. Rather than auth as the admin user and search, we auth as the user themselves. Admin auth is only for LDAP sync now.

This should mean much fewer problems with donked LDAP settings and login.
2016-07-13 05:50:24 -07:00
snipe
b5d3843b7c New LDAP model 2016-07-13 05:48:16 -07:00
snipe
026f099ba3 Fixed indenting 2016-07-13 05:47:32 -07:00
Daniel Meltzer
bf88cd8233 Check for variables to exist and not null rather than assuming it does. Fixes #2247. (#2248) 2016-07-12 21:03:23 -07:00
snipe
c8351ae01b Reverting back to or die 2016-07-11 18:25:29 -07:00
snipe
7a4cbce460 Use trans instead of lang:: 2016-07-10 21:07:59 -07:00
snipe
3f835ba847 Updated lang to trans 2016-07-10 21:04:49 -07:00
snipe
f87fbbdb1d Removed unused use statement 2016-07-10 21:01:11 -07:00
snipe
4e38f96f97 Switched or and and to || and && for code quality 2016-07-10 20:55:44 -07:00
Daniel Meltzer
ab3b9dcf5d Add a clone button the the user table. (#2241)
Also preserve permissions when cloning a user, instead of nulling them by default.
2016-07-10 18:43:10 -07:00
Daniel Meltzer
f683c78a69 Fix adding an image to an asset when public/uploads/assets does not exist (#2240)
* Fix adding an image to an asset when public/uploads/assets does not exist.

 First check to see if we can create directory and do so.  If any errors occur, display the error string as an error on the page.

* Add the public/uploads/assets directory to new installs.

* Add some comments explaining this code so I remember what it does next time.
2016-07-10 18:43:00 -07:00
snipe
642be61007 Remove old asset importer 2016-07-09 19:35:42 -07:00
snipe
8d71e6b268 Fixed indenting 2016-07-09 18:20:57 -07:00
snipe
7ff77981f6 Fixed indenting 2016-07-09 18:19:51 -07:00
snipe
a9f060e768 Removed extraneous comments 2016-07-09 18:19:19 -07:00
snipe
9f4e0491ed Fixes error in license checkout 2016-07-07 04:13:08 -07:00
snipe
f2ddc7b0ae Added purchase cost and purchase date to listing 2016-07-07 02:07:21 -07:00
snipe
01b01c6479 Fixes #2149 2016-07-07 01:13:31 -07:00
snipe
3bb5479efd Move print statement to LOG 2016-07-01 16:24:58 -07:00
snipe
0c98390eef Hide bulk actions, checkbox and checkout/in if deleted 2016-06-29 04:19:37 -07:00