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
snipe
8ba9399de7
Merge branch 'master' into develop
2016-07-21 19:42:11 -07:00
snipe
f6a4d4aaab
Better display for some features disabled for demo mode
2016-07-21 19:40:23 -07:00
Daniel Meltzer
df664bdc9d
Fix categories acceptance test as it stands. We need to choose a category type to pass validation, and we need to see the elemnt alert-danger, not the text, to make the test fail when it should. ( #2289 )
2016-07-20 21:36:43 -07:00
Daniel Meltzer
c2f6e0cfd8
Don't escape html in default eula. Fixes #2277 ( #2279 )
2016-07-20 19:39:48 -07:00
Daniel Meltzer
ba6f26cef9
If a category has items in it, disable changing the category type ( #2288 )
2016-07-20 19:27:33 -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
54a0d0de0e
Fetch the installer from master instead of v3 branch. ( #2266 )
2016-07-19 09:41:00 -07:00
Daniel Meltzer
099f5d4cfd
Update installer script for v3 now that things have moved around. ( #2263 )
2016-07-19 08:41:56 -07:00
snipe
5266bd4415
Bumped version
2016-07-19 02:04:08 -07:00
snipe
ebc74a6530
[Security] Updating Guzzle to address CVE-2016-5385
2016-07-19 00:36:50 -07:00
snipe
13d250f095
Merge branch 'v3' of github.com:snipe/snipe-it into v3
...
# Conflicts:
# app/Models/Ldap.php
2016-07-19 00:13:01 -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
7e56934484
Removed leftover user code
2016-07-15 14:58:29 -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
616f922306
Fixes #2254
2016-07-14 19:50:00 -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
a00198abc7
Added spinner for LDAP test
2016-07-13 07:34:54 -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
f3e99113d2
Bumped version
2016-07-13 05:53:23 -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
snipe
ff6c3cfa17
Added LDAP settings check in settings page
2016-07-13 05:47:23 -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
caee42e843
More valid composer name
2016-07-10 20:57:12 -07:00
snipe
4e38f96f97
Switched or and and to || and && for code quality
2016-07-10 20:55:44 -07:00
