Commit graph

363 commits

Author SHA1 Message Date
snipe
7edf1db101 Small tweaks to history 2016-08-12 19:03:32 -07:00
snipe
41a20d8f66 Tidied up some debugging code, better explanation 2016-08-12 17:10:03 -07:00
snipe
4a9f3fd6ff Generate email method 2016-08-12 16:02:39 -07:00
snipe
9ae1841fc4 Make additional fields fillable 2016-08-12 16:02:18 -07:00
snipe
ba5a2edd54 CSV history routes 2016-08-12 16:02:09 -07:00
snipe
c73cbccffc Method to import CSV history 2016-08-12 16:01:59 -07:00
snipe
24d2726c86 Added helper for imports 2016-08-12 16:01:45 -07:00
snipe
18e576e5fd Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-08-11 22:03:25 -07:00
snipe
4c787891e4 Use custom maintenance middleware 2016-08-11 19:22:26 -07:00
Daniel Meltzer
dbd96a4c10 Don't try to format a formatted number string. (#2396)
The importer already formatted/parsed numbers on input into the db
(maybe it shouldn't have?) so running number_format on that string
throws an exception.  Check to make sure the value is numeric before
formatting it.
2016-08-11 19:13:49 -07:00
snipe
3a81b7e612 Eager load asset query on maintenances to prevent n+1 queries 2016-08-11 15:56:21 -07:00
snipe
4ffea7ceaa Fixes #2406 - added missing gate for assets.edit 2016-08-09 16:38:43 -07:00
snipe
1d3255a00b Allow admin to turn LDAP password sync off.
This is added to handle customers/users with a security policy that prohibits third-parties or external databases from storing LDAP passwords.
2016-08-04 14:29:28 -07:00
snipe
fff2bce9e4 Added missing username in header row 2016-08-02 15:16:01 -07:00
snipe
75e0c5565c Add username and custom fields option to custom report 2016-08-02 15:04:10 -07:00
snipe
ca8ca89955 Added custom color to status labels, only show status labels if there are results 2016-08-02 13:25:50 -07:00
snipe
6fe639f490 Skip email if no email domain is given 2016-08-02 12:30:02 -07:00
snipe
a5467ba25d Slug the username to handle spaces, etc. 2016-08-02 11:12:28 -07:00
snipe
1612562f41 Create log record and send EULA when creating a new asset that’s checked out 2016-08-02 10:33:44 -07:00
snipe
17d5e40e02 Fixes #2383 2016-08-02 09:54:31 -07:00
snipe
0e5209e80f Few more dashboard fixes 2016-08-02 05:06:17 -07:00
snipe
39929c7d89 Better handling for deleted users 2016-08-02 04:23:13 -07:00
snipe
66ad0f1d4c Better fix for location LDAP sync 2016-08-02 03:50:08 -07:00
snipe
3b247ba31f Ignore location field if no value is passed 2016-08-02 03:45:03 -07:00
Brady Wetherington
1747be4b29 Enable .env file to point to location of CA Cert (#2382) 2016-08-02 02:36:00 -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
snipe
139325d8ba Small tweaks for bad data 2016-08-01 10:17:46 -07:00
zjean
fcb1d6ac15 Fixed feedback on #2349 (#2359) 2016-07-29 13:59:50 -07:00
snipe
85232c47da Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-07-28 21:31:58 -07:00
snipe
47f6635992 A few more permissions tweaks 2016-07-28 21:31:53 -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
1f0737cfb7 Allow super admins to override company 2016-07-28 12:40:19 -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
Daniel Meltzer
399e70763b Scope requestable assets to company as well. Updates to #2206. (#2326) 2016-07-26 16:22:56 -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
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