 snipe
|
d0eed67c42
|
Fixed relationship to return actual assets
|
2015-11-02 17:41:33 -08:00 |
|
|
snipe
|
9cc542aea9
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
|
2015-11-02 16:45:44 -08:00 |
|
|
snipe
|
725ca04ac8
|
Bumped version
|
2015-11-02 16:45:30 -08:00 |
|
|
snipe
|
e07dcf2598
|
Added location detail view
|
2015-11-02 16:45:19 -08:00 |
|
|
snipe
|
712e415f4d
|
Updated deleted seats language
|
2015-11-02 16:45:02 -08:00 |
|
|
snipe
|
c8551367cb
|
Moved sample file so people can't accidentally import it
|
2015-11-02 16:44:46 -08:00 |
|
|
snipe
|
5c820d49a6
|
Fixes #1305
|
2015-11-02 16:44:17 -08:00 |
|
|
snipe
|
fbd79fc943
|
Merge pull request #1298 from MicaelRodrigues/snipeMike
Create user on the fly from sucessful LDAP authentication, if it does not already exist.
|
2015-10-30 16:22:12 -07:00 |
|
|
Micael Rodrigues
|
b39944b2d7
|
Create user on the fly from sucessful LDAP authentication, if it does not already exists.
|
2015-10-28 23:01:45 +00:00 |
|
|
snipe
|
e0fccc8fc9
|
Possible fix for #1296? Can't reproduce locally
|
2015-10-28 05:53:28 -07:00 |
|
|
snipe
|
76968f7d48
|
Fixes asset model table sorting
|
2015-10-28 03:23:55 -07:00 |
|
|
snipe
|
5436d54aa0
|
Fixes #1290 - datatable broken for assets in model
|
2015-10-28 02:10:04 -07:00 |
|
|
snipe
|
b6f4080b97
|
Fixes consumable detail view
|
2015-10-26 14:36:55 -07:00 |
|
|
snipe
|
09bcb137c4
|
Ugly fix for preventing errors if there is an invalid model (therefore no category)
|
2015-10-23 21:22:42 -07:00 |
|
|
snipe
|
8ec6b7e03a
|
Basic location ordering for #1266
|
2015-10-23 21:19:22 -07:00 |
|
|
snipe
|
efddda8665
|
Fixed expected_checkin error on asset view
|
2015-10-23 18:28:06 -07:00 |
|
|
snipe
|
48e6ebe306
|
Make EOL not sortable anymore, since that sort doesn't work
|
2015-10-23 18:15:27 -07:00 |
|
|
snipe
|
eb1335405b
|
Order by last_checkout and expected_checkin for #1266
|
2015-10-23 17:59:21 -07:00 |
|
|
snipe
|
8a1ffb9014
|
Save de-normed values for last checkout and expected_checkin
|
2015-10-23 17:55:03 -07:00 |
|
|
snipe
|
ec4b2f114d
|
Merge pull request #1283 from snipe/features/checkout_time
Migration to add last_checkout and expected_checkin fields to Asset
|
2015-10-23 17:47:45 -07:00 |
|
|
Brady Wetherington
|
9a5edb3db7
|
Migration to add last_checkout and expected_checkin fields to Asset
|
2015-10-23 17:40:04 -07:00 |
|
|
snipe
|
f0557f8e1c
|
Added expected Checkin scope
Neither this nor the methd above actually work tho. Need to spend some time on the complex joins and sorting
|
2015-10-23 15:25:02 -07:00 |
|
|
snipe
|
2953b395f2
|
Added order number to allowed sort columns
|
2015-10-23 15:12:06 -07:00 |
|
|
snipe
|
e9050826ec
|
Added order number if one is being searched on
|
2015-10-23 14:49:58 -07:00 |
|
|
snipe
|
20e7888bd9
|
Fixed expected checkin on view
|
2015-10-23 14:36:20 -07:00 |
|
|
snipe
|
e93b53ad4c
|
Updated maintenance mode message
|
2015-10-23 14:35:42 -07:00 |
|
|
snipe
|
0a3843393d
|
Addec expected_checkout, fixed language calls to use blade syntax
|
2015-10-23 14:35:31 -07:00 |
|
|
snipe
|
60f403f555
|
Expected checkin is a date, not a datetime
|
2015-10-23 14:29:00 -07:00 |
|
|
snipe
|
cf49920564
|
Fixes #1235 - 24 hour format for log
|
2015-10-23 12:39:22 -07:00 |
|
|
snipe
|
aaf2c6fbce
|
Updated licenses and unaccepted assets to use bootstrap tables for #1266
|
2015-10-22 03:28:12 -07:00 |
|
|
snipe
|
9a63cbbd6c
|
Removed download button
|
2015-10-22 03:22:59 -07:00 |
|
|
snipe
|
0aeab1ab7e
|
Remove CSV export button
|
2015-10-22 03:13:30 -07:00 |
|
|
snipe
|
4c3a5a99df
|
Use client-side bootstrap tables for reports
|
2015-10-22 03:11:34 -07:00 |
|
|
snipe
|
60370b9627
|
Added acceptance methods back in
|
2015-10-22 03:10:43 -07:00 |
|
|
snipe
|
df986c7cfe
|
Minor indenting edits
|
2015-10-22 03:10:25 -07:00 |
|
|
snipe
|
a3f5dc331d
|
Fixes #1007 and #1053
|
2015-10-22 02:11:39 -07:00 |
|
|
snipe
|
af6a3dcccd
|
Updated sample data
|
2015-10-22 01:14:21 -07:00 |
|
|
snipe
|
7901b49503
|
Updated sample file
|
2015-10-22 00:18:44 -07:00 |
|
|
snipe
|
8ea40d4e6d
|
Fixes default value for strict mode
|
2015-10-22 00:17:45 -07:00 |
|
|
snipe
|
1bdd5886e6
|
Select * because reasons
|
2015-10-21 23:58:07 -07:00 |
|
|
snipe
|
9c71d34761
|
Merge pull request #1276 from madd15/patch-5
return getEdit to correct method
|
2015-10-21 23:40:53 -07:00 |
|
|
madd15
|
79a69d7633
|
return getEdit to correct method
|
2015-10-22 17:10:02 +10:30 |
|
|
snipe
|
27799dc78a
|
Nicer activity report display
(This needs the API/Bootstrap tables treatment soon)
|
2015-10-21 23:39:45 -07:00 |
|
|
snipe
|
4cb19d1aae
|
More eager loading, pass $statuslabel_types to view
|
2015-10-21 23:31:28 -07:00 |
|
|
snipe
|
c91113ac95
|
Eager load accessories
|
2015-10-21 23:25:33 -07:00 |
|
|
snipe
|
eb5649d0b3
|
Eager load assets
|
2015-10-21 23:25:23 -07:00 |
|
|
snipe
|
f06af97364
|
Account for no limit or offset passed
|
2015-10-21 23:23:22 -07:00 |
|
|
snipe
|
b1d5812ae2
|
Fixed categorys page
|
2015-10-21 23:19:27 -07:00 |
|
|
snipe
|
2e044bf0a3
|
Fixed category bug
|
2015-10-21 23:18:40 -07:00 |
|
|
snipe
|
bd418d1422
|
Eager load some models
|
2015-10-21 23:17:22 -07:00 |
|