Commit graph

4271 commits

Author SHA1 Message Date
snipe
3b247ba31f Ignore location field if no value is passed 2016-08-02 03:45:03 -07:00
snipe
39450c1fe9 Eager load throttle query 2016-08-02 01:23:53 -07:00
snipe
886a31190c Fixed route 2016-08-02 01:08:37 -07:00
snipe
8246a319a2 Fixes #2363 and #1097 2016-08-02 00:54:38 -07:00
snipe
27adeb427e Generate barcodes locally and try to serve them if they exist 2016-08-01 22:56:28 -07:00
zjean
fcb1d6ac15 Fixed feedback on #2349 (#2359) 2016-07-29 13:59:50 -07:00
Daniel Meltzer
eef8d1609e Small fixes (#2350)
* components.view should point to view, not create

* Fix comment

* Rename variable to accurately reflect its responsibility

* Fix line breaks in serial key, remove places where adding line breaks makes no sense.  Fixes #2344
2016-07-28 20:59:42 -07:00
snipe
c07ad03e74 Removed unique from form request 2016-07-28 09:16:30 -07:00
snipe
68b7b8f932 Fixes Carbon date 2016-07-28 08:51:01 -07:00
snipe
f31637adb4 Fixes #2346 2016-07-28 08:39:28 -07:00
snipe
3e5d2b5385 Ability to remove field from fieldset 2016-07-28 08:10:15 -07:00
snipe
fbd0059bbb Fixes #2317 2016-07-28 08:07:14 -07:00
snipe
f53c5706f6 Fixes #2341 2016-07-28 07:36:58 -07:00
snipe
14b0a6315f Pass users path to get_src 2016-07-28 05:49:41 -07:00
snipe
eb508901c5 Zerofilling for auto-increment 2016-07-27 21:28:00 -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
2e665e128f Putting uniqueUndeleted into a trait for use across models 2016-07-26 01:39:30 -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
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
9385c3e9cf Remove last name requirement from Form Request 2016-07-21 19:46:46 -07:00
snipe
92175eb700 Few more LDAP/AD tweaks 2016-07-14 23:49: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
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
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
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
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
0c98390eef Hide bulk actions, checkbox and checkout/in if deleted 2016-06-29 04:19:37 -07:00
snipe
6d5bc64b2b Another fix for status label types
This is a little janky, as it breaks up the errors into multiple screens if you don't have a status label type AND don't have a name. This is because the model-level validation won't work since we transmogrify that dropdown list of status label types into  boolean values for the DB. Should eventually find a less clunky way to handle this, but needed to get a fix in now.
2016-06-28 14:52:11 -07:00
snipe
483bf1b309 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-06-28 12:19:19 -07:00