snipe
|
176a26e6c3
|
Bumped version
|
2017-10-16 09:26:44 -07:00 |
|
snipe
|
10a4d7e849
|
Merge branch 'develop'
|
2017-10-16 09:09:53 -07:00 |
|
snipe
|
cbe008d52f
|
Fix assetLoc to assetloc because reasons?
|
2017-10-16 09:08:08 -07:00 |
|
snipe
|
aeb5152789
|
Removed extranneous class for danger text
|
2017-10-16 09:04:38 -07:00 |
|
snipe
|
938490df16
|
Merge branch 'develop'
|
2017-10-16 09:01:09 -07:00 |
|
snipe
|
45c2af80a3
|
More LDAP testing US refinements
|
2017-10-16 09:00:51 -07:00 |
|
snipe
|
892c1b04fd
|
Merge branch 'develop'
|
2017-10-16 07:07:35 -07:00 |
|
snipe
|
1fbf3753bc
|
More small LDAP test improvements
|
2017-10-16 07:07:21 -07:00 |
|
snipe
|
5ead5a94e3
|
Merge branch 'develop'
|
2017-10-16 06:47:01 -07:00 |
|
snipe
|
bcf435f625
|
Try for better error reporting on LDAP fail
Sorry for all the commits on this - my local LDAP isn’t working and I can’t figure out why, so no easy way to test locally
|
2017-10-16 06:46:33 -07:00 |
|
snipe
|
8638c46b1d
|
Merge branch 'develop'
|
2017-10-16 06:40:15 -07:00 |
|
snipe
|
b107280b7b
|
Slightly nicer UI for LDAP login test
|
2017-10-16 06:39:36 -07:00 |
|
snipe
|
1a60c20117
|
Merge branch 'develop'
|
2017-10-16 06:34:23 -07:00 |
|
snipe
|
f1a6926ad9
|
LDAP test login
|
2017-10-16 06:34:04 -07:00 |
|
snipe
|
c27a7f09bd
|
Merge branch 'develop'
|
2017-10-16 05:55:27 -07:00 |
|
snipe
|
ba7b9d8168
|
Removed stray foo
|
2017-10-16 05:54:33 -07:00 |
|
snipe
|
5b070ee32f
|
Merge branch 'develop'
|
2017-10-16 05:52:52 -07:00 |
|
snipe
|
59a126c47c
|
Small tweaks to LDAP test
|
2017-10-16 05:52:18 -07:00 |
|
snipe
|
322e62418e
|
Merge branch 'develop'
|
2017-10-16 05:23:26 -07:00 |
|
snipe
|
a98d94ccdc
|
Pass token to LDAPtest
|
2017-10-16 05:22:37 -07:00 |
|
snipe
|
5addcb517f
|
Merge branch 'develop'
|
2017-10-16 05:01:37 -07:00 |
|
snipe
|
56cbc005ae
|
Fixes expected checkins name in console kernel
|
2017-10-16 05:01:15 -07:00 |
|
Daniel Meltzer
|
22e9246031
|
Fix more old routes. Should fix #4216 (#4217)
|
2017-10-15 23:32:40 -07:00 |
|
snipe
|
c0b39701cc
|
Fixes #4170 - asset maintenance type not showing
|
2017-10-14 16:17:14 -07:00 |
|
madd15
|
e2bac62e36
|
Fix #4205 (#4213)
* Fixing various UI items
* Revert css change
* Dashboard icon CSS up 4px
|
2017-10-14 00:14:22 -07:00 |
|
snipe
|
c12a23b84a
|
Merge branch 'develop'
|
2017-10-11 15:37:01 -07:00 |
|
snipe
|
fa95f6d836
|
Another attempt for #4165
|
2017-10-11 15:36:47 -07:00 |
|
snipe
|
280e8c7ed1
|
Revert "Another attempt for #4165"
This reverts commit 7617fda978 .
|
2017-10-11 15:34:30 -07:00 |
|
snipe
|
7617fda978
|
Another attempt for #4165
(This is terrible and needs to be refactored.)
|
2017-10-11 15:33:53 -07:00 |
|
snipe
|
af69f7636b
|
Merge branch 'develop'
|
2017-10-11 14:44:37 -07:00 |
|
snipe
|
6d4574130f
|
Clearer indication of whether or not the user will be emailed a eula
|
2017-10-11 14:44:25 -07:00 |
|
snipe
|
485b6397d0
|
Possible (crummy temp) fix for #4165
|
2017-10-11 14:42:11 -07:00 |
|
snipe
|
93990327de
|
Hopefully fixes #4163
|
2017-10-11 14:18:08 -07:00 |
|
madd15
|
4ee7765403
|
Change Save buttons to Checkout and add Cancel (#4202)
Bringing components and consumables checkout page inline with other
checkout pages
|
2017-10-11 13:29:22 -07:00 |
|
snipe
|
bdbad067b4
|
Merge branch 'develop'
|
2017-10-11 13:10:46 -07:00 |
|
snipe
|
13a716310c
|
Bumped hash
|
2017-10-11 13:10:29 -07:00 |
|
snipe
|
d0c77c228b
|
Merge branch 'develop'
|
2017-10-11 13:09:30 -07:00 |
|
snipe
|
36cbffa183
|
Fixes bug where custom fields would not store new name in custom fields table on edit
|
2017-10-11 13:09:10 -07:00 |
|
snipe
|
5edf9e143f
|
Merge branch 'develop'
|
2017-10-11 12:46:42 -07:00 |
|
snipe
|
b6a1e0d12f
|
Call migrate before passport install
|
2017-10-11 12:42:31 -07:00 |
|
snipe
|
2fda3a2d26
|
Merge branch 'develop'
|
2017-10-11 12:29:48 -07:00 |
|
snipe
|
f56eb16941
|
More specific order by clause for drilling down on order number
|
2017-10-11 12:29:08 -07:00 |
|
snipe
|
c15c082fb4
|
Merge branch 'develop'
|
2017-10-11 01:31:59 -07:00 |
|
snipe
|
64e7ab3a12
|
Fixes #4182 - empty names for assets when checking out to asset
|
2017-10-11 01:31:37 -07:00 |
|
snipe
|
afbd6c811b
|
Merge branch 'develop'
|
2017-10-10 23:38:45 -07:00 |
|
snipe
|
f64c02ce12
|
Fix for ambiguous query on models
|
2017-10-10 23:12:16 -07:00 |
|
snipe
|
a0d8aa77d3
|
Merge branch 'develop'
|
2017-10-10 22:59:50 -07:00 |
|
snipe
|
bed7b29417
|
Fixes group search
|
2017-10-10 22:59:32 -07:00 |
|
tiagom62
|
40ed86bfe0
|
Sudo isnt available on every distro. (#4194)
|
2017-10-10 22:02:47 -07:00 |
|
snipe
|
33497c9811
|
Merge branch 'develop'
|
2017-10-10 12:48:05 -07:00 |
|