3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-09 09:58:44 +00:00
Commit Graph

71 Commits

Author SHA1 Message Date
ba25972b49 Add LDAP port number option 2016-07-22 15:09:49 -07:00
61108102d7 No longer require last name
I may regret this…
2016-07-21 19:44:07 -07:00
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
192b1582f5 Merge branch 'v3' of git@github.com:snipe/snipe-it.git 2016-07-15 16:46:15 -07:00
27b8d326e3 fix for undefined user 2016-07-15 16:38:49 -07:00
698cb161d4 Not sure how this ever worked? 2016-07-15 11:11:48 -07:00
92175eb700 Few more LDAP/AD tweaks 2016-07-14 23:49:32 -07:00
c1d2be651a Removed default pemissions 2016-07-14 18:32:54 -07:00
8729871353 Fucking rookie mistake. Send redbull. 2016-07-14 16:52:20 -07:00
99a42dfc38 More AD fixes 2016-07-14 16:27:32 -07:00
0cf8ac1d95 Add AD domain to settings 2016-07-14 15:52:52 -07:00
e6b872299d Possible fix for #2246 - needs AD testing 2016-07-13 15:18:29 -07:00
2ce1d8b985 Fixed missing use statement 2016-07-13 07:13:49 -07:00
b5d3843b7c New LDAP model 2016-07-13 05:48:16 -07:00
026f099ba3 Fixed indenting 2016-07-13 05:47:32 -07:00
7a4cbce460 Use trans instead of lang:: 2016-07-10 21:07:59 -07:00
3f835ba847 Updated lang to trans 2016-07-10 21:04:49 -07:00
3bb5479efd Move print statement to LOG 2016-07-01 16:24:58 -07:00
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
6633366b29 Small fix for status label types 2016-06-28 12:40:20 -07:00
483bf1b309 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-06-28 12:19:19 -07:00
0e96a0aa3e Updated comment 2016-06-28 12:19:14 -07:00
e4275bd3d3 Fixes status label inline creation 2016-06-28 12:19:05 -07:00
d484636bba Add model number column to the hardware list. (#2204)
* Add model number column to the hardware list and allow searching based on model number.   Column is hidden by default.

* Fix sorting.  Add scope to order by model number.
2016-06-27 22:32:40 -07:00
5bc52a9425 Link to user on asset checkout as well as checkin. 2016-06-23 09:39:50 -04:00
0cf563ae5b Show admin in maintenances 2016-06-22 17:04:47 -07:00
0ca85f8a8a Updates to components 2016-06-22 14:55:17 -07:00
f753783ca0 Smaller miminums for model and category name 2016-06-22 12:50:21 -07:00
4ed8ff5576 Formatting fixes for coding standards 2016-06-22 12:27:41 -07:00
5a45ec708b Use the model validation trait to validate asset maintences. Might be better to add a form request as well, but this at least makes the model validation occur. fixes #2170 2016-06-16 22:22:07 -04:00
6a277a5391 Added inheritance back into users/groups 2016-06-15 20:45:45 -07:00
c29984d0df Skip superuser check if the user isn't logged in 2016-06-13 19:05:29 -07:00
bfe4bc6ee5 Bypass company scoping if user is an admin 2016-06-13 11:40:22 -07:00
396446a34b Updated namespace for collection 2016-06-13 10:54:28 -07:00
2daed3c271 Fix for custom fields not saving 2016-06-10 16:36:46 -07:00
c1a3592059 Fixes #2130 2016-06-10 08:29:43 -07:00
a0901247a3 Let superadmins through companyable trait 2016-06-10 04:07:27 -07:00
ec4bc6c2af Allow superadmins to print labels 2016-06-10 03:40:49 -07:00
95f94c1cfb Fixed error when user has no permissions values 2016-06-02 17:16:22 -07:00
97691726f0 Updates to permissions decoding 2016-06-02 02:49:32 -07:00
eacf70ee3f Updated validation 2016-06-01 15:45:05 -07:00
1c1ef951e9 Fix a regression in Helper::usersList and ::managerList() where the "Select a User" option disappeared. Also format names the way they used to be formatted. 2016-06-01 13:47:46 -05:00
f2a5337ad2 Simplify 2016-05-31 19:41:14 -05:00
0fa82743a1 Remove remaining DB::Raw(concat) calls to make things more sqlite friendly. This adds one new method to the Asset Model to return the formatted string that was used by the license and asset maintence controller. It also fixes a potential sqlite-only issue where '' and null are different. 2016-05-31 19:41:14 -05:00
4b98711e07 Replace the assorted concat() methods with a full_name method in the User model and adjust queries accordingly 2016-05-31 19:41:14 -05:00
0e0b31bba6 Company name length to 1 2016-05-31 15:04:13 -07:00
bfc3f69adb Better comments on model methods 2016-05-24 16:08:18 -07:00
cde0d49e18 Added assets method 2016-05-24 16:06:22 -07:00
abf027059f Fixed comment 2016-05-24 16:06:15 -07:00
c4a699f109 Validation for new alert settings 2016-05-19 19:43:05 -07:00