snipe
41a20d8f66
Tidied up some debugging code, better explanation
2016-08-12 17:10:03 -07:00
snipe
7a0843e954
Import history language file
2016-08-12 16:02:51 -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
06fcf3e07d
Import history blade
2016-08-12 16:01:34 -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
d314f85b93
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-08-11 15:58:22 -07:00
snipe
3a81b7e612
Eager load asset query on maintenances to prevent n+1 queries
2016-08-11 15:56:21 -07:00
snipe
7992258b46
Updated UI with new required indicator
2016-08-11 15:44:01 -07:00
snipe
869da1da78
Add maintenance notes to maintenances tab in hardware view
2016-08-11 15:40:41 -07:00
Michael T
a6a6aa78b0
Fixing the script freezing prior to mysql secure install ( #2434 )
2016-08-11 15:17:55 -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
29eadb10ae
Fixes #2387
2016-08-02 17:03:15 -07:00
snipe
1ca5f8bee5
Removed asterisks, use orange bar for req fields in locations
2016-08-02 16:40:38 -07:00
snipe
8dbc098836
Bumped hash for 3.2.0
2016-08-02 15:25:23 -07:00
snipe
45ea44e172
Bumped hash
2016-08-02 15:16:16 -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
098e7e4feb
Hide email address if there is no value
2016-08-02 15:03:45 -07:00
snipe
e4355292e4
Bumped hash version
2016-08-02 13:30:00 -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
30c45442f9
Merge remote-tracking branch 'origin/develop'
2016-08-02 12:40:06 -07:00
snipe
03c2c267bc
Added favicon explicit link
2016-08-02 12:39:49 -07:00
snipe
a76fe98b2d
Only show a logo if a logo is uploaded
2016-08-02 12:34:08 -07:00
snipe
9e43a44d20
Better styling for forgotten password screens
2016-08-02 12:30:22 -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
1c09479d5f
Merge remote-tracking branch 'origin/develop'
2016-08-02 10:34:43 -07:00
snipe
682c75e990
Bumped version
2016-08-02 10:34:30 -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
1b7f28598d
Merge remote-tracking branch 'origin/develop'
2016-08-02 09:54:47 -07:00
snipe
17d5e40e02
Fixes #2383
2016-08-02 09:54:31 -07:00
snipe
099a85e26d
Merge remote-tracking branch 'origin/develop'
2016-08-02 05:06:29 -07:00
snipe
0e5209e80f
Few more dashboard fixes
2016-08-02 05:06:17 -07:00
snipe
95328f0a6a
Merge remote-tracking branch 'origin/develop'
2016-08-02 04:46:25 -07:00
snipe
cbc42f3e59
Fix for deleted users display
2016-08-02 04:45:48 -07:00
snipe
846356974d
Merge remote-tracking branch 'origin/develop'
2016-08-02 04:26:19 -07:00
snipe
ef6fb69cee
Fix translation
2016-08-02 04:26:07 -07:00
snipe
fb1eab0978
Merge remote-tracking branch 'origin/develop'
2016-08-02 04:24:09 -07:00
snipe
39929c7d89
Better handling for deleted users
2016-08-02 04:23:13 -07:00
snipe
d6ba0b67f0
Merge remote-tracking branch 'origin/develop'
2016-08-02 03:50:20 -07:00
snipe
66ad0f1d4c
Better fix for location LDAP sync
2016-08-02 03:50:08 -07:00
snipe
bfac25d445
Merge remote-tracking branch 'origin/develop'
2016-08-02 03:45:17 -07:00
snipe
3b247ba31f
Ignore location field if no value is passed
2016-08-02 03:45:03 -07:00
