 snipe
|
33a709ecbc
|
Merge remote-tracking branch 'origin/develop'
v1.2.6
|
2015-02-28 12:27:45 -08:00 |
|
|
snipe
|
9b42d3a4fc
|
Bumped version number
|
2015-02-28 12:27:22 -08:00 |
|
|
snipe
|
c598e3d9c0
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-27 21:07:45 -08:00 |
|
|
snipe
|
c822fff714
|
New language strings
|
2015-02-27 21:07:17 -08:00 |
|
|
snipe
|
c881535fda
|
Updated language strings
|
2015-02-27 13:32:53 -08:00 |
|
|
snipe
|
715fc3fa9b
|
Bumped version for release
v1.2.6-beta
|
2015-02-26 19:17:06 -08:00 |
|
|
snipe
|
c484afb12b
|
Fixed typo for accessories accept
|
2015-02-26 18:58:08 -08:00 |
|
|
snipe
|
5ec91ef5fc
|
Removed test url
|
2015-02-26 18:56:30 -08:00 |
|
|
snipe
|
30db9a2943
|
Unified asset/accessory acceptance
|
2015-02-26 18:42:39 -08:00 |
|
|
snipe
|
1273c4ca87
|
EULA/req improvements
|
2015-02-26 18:20:52 -08:00 |
|
|
snipe
|
cb73d81d5b
|
Smaller buttons
|
2015-02-26 17:23:03 -08:00 |
|
|
snipe
|
04735f1aff
|
Fixed assetlog display
|
2015-02-26 17:04:21 -08:00 |
|
|
snipe
|
d33dcbbcb1
|
Fixed bad method call in accessories on delete
|
2015-02-26 16:17:25 -08:00 |
|
|
snipe
|
04401ca09f
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-26 16:14:11 -08:00 |
|
|
snipe
|
0ff23c422a
|
Better language strings
|
2015-02-26 16:13:47 -08:00 |
|
|
snipe
|
74a7b304c2
|
Limit categories to accessory categories
|
2015-02-26 16:09:40 -08:00 |
|
|
snipe
|
231e465898
|
Added category types to view
|
2015-02-26 16:00:52 -08:00 |
|
|
snipe
|
68c3e88343
|
Few more error icons
|
2015-02-26 15:52:38 -08:00 |
|
|
snipe
|
ef6eae63d8
|
Fixed error icon
|
2015-02-26 15:50:33 -08:00 |
|
|
snipe
|
afe2eb736c
|
Added category type
|
2015-02-26 15:48:44 -08:00 |
|
|
snipe
|
1552c1e917
|
Accessories log (not reporting correctly yet)
|
2015-02-26 15:25:48 -08:00 |
|
|
snipe
|
258d1cd705
|
Removed extra table columns
|
2015-02-26 15:25:33 -08:00 |
|
|
snipe
|
d7b4e8a8de
|
Removed cruft from checkin form
|
2015-02-26 15:25:21 -08:00 |
|
|
snipe
|
c0c563b1c7
|
Fixes accessory relationshop for pivot
|
2015-02-26 15:25:08 -08:00 |
|
|
snipe
|
430b8233ed
|
Fixed user relationship
|
2015-02-26 15:24:51 -08:00 |
|
|
snipe
|
47f1488acc
|
Get the accessory pivot ID
|
2015-02-26 15:24:41 -08:00 |
|
|
snipe
|
21799cca6d
|
User acceptance for accessories
|
2015-02-26 15:24:23 -08:00 |
|
|
snipe
|
e7ae4bd1c4
|
Merge pull request #574 from madd15/patch-3
Remove unused trashedAssets()
|
2015-02-26 14:21:05 -08:00 |
|
|
snipe
|
7da6ba5f68
|
Merge pull request #575 from madd15/patch-4
Reduces Queries on Model Index View
|
2015-02-26 14:20:22 -08:00 |
|
|
madd15
|
8e9f7965c7
|
Reduces Queries on Model Index View
|
2015-02-27 08:44:41 +10:30 |
|
|
madd15
|
4ef2dd0c7e
|
Remove unused trashedAssets()
|
2015-02-27 08:42:53 +10:30 |
|
|
snipe
|
19ad8970d7
|
Fixed arrow icon
|
2015-02-26 14:08:42 -08:00 |
|
|
snipe
|
a20e1f6943
|
Fixed attach to relation
|
2015-02-26 14:08:31 -08:00 |
|
|
snipe
|
5010720a97
|
Fixed accessory relationship
|
2015-02-26 14:07:52 -08:00 |
|
|
snipe
|
efaf067b94
|
Fixed user relationship
|
2015-02-26 14:07:39 -08:00 |
|
|
snipe
|
6efd268004
|
Disable checkouts if there are none left
|
2015-02-26 13:28:08 -08:00 |
|
|
snipe
|
7f26f01a8f
|
Merge pull request #573 from madd15/models
Force Model Restore before Asset Restore
|
2015-02-26 13:06:15 -08:00 |
|
|
snipe
|
31df29cac8
|
Fixed funky layout from datatables
|
2015-02-26 13:05:10 -08:00 |
|
|
madd15
|
15a7e205be
|
Force Model Restore before Asset Restore
|
2015-02-27 07:33:48 +10:30 |
|
|
snipe
|
3e189d3502
|
Fixes #538 - sortable tables
|
2015-02-26 12:59:40 -08:00 |
|
|
snipe
|
6d16c97902
|
Fixed back arrow
|
2015-02-26 12:40:54 -08:00 |
|
|
snipe
|
1ac401f0c0
|
Fixed EULA mail
|
2015-02-26 11:54:56 -08:00 |
|
|
snipe
|
62cb1daefd
|
Language strings for checkin/checkout
|
2015-02-26 11:42:11 -08:00 |
|
|
snipe
|
acedab5587
|
Checkout for accessories
|
2015-02-26 11:42:02 -08:00 |
|
|
snipe
|
ad30aebcbc
|
Methods to extend the category EULA to the accessory
|
2015-02-26 11:41:47 -08:00 |
|
|
snipe
|
528c06cf7f
|
Reverting icon fix
|
2015-02-26 10:33:31 -08:00 |
|
|
snipe
|
97d97fc4df
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
Conflicts:
app/views/backend/categories/edit.blade.php
app/views/backend/depreciations/edit.blade.php
app/views/backend/groups/create.blade.php
app/views/backend/groups/edit.blade.php
app/views/backend/hardware/bulk.blade.php
app/views/backend/hardware/checkin.blade.php
app/views/backend/hardware/checkout.blade.php
app/views/backend/hardware/edit.blade.php
app/views/backend/licenses/checkin.blade.php
app/views/backend/licenses/checkout.blade.php
app/views/backend/licenses/edit.blade.php
app/views/backend/locations/edit.blade.php
app/views/backend/manufacturers/edit.blade.php
app/views/backend/models/edit.blade.php
app/views/backend/statuslabels/edit.blade.php
app/views/backend/suppliers/edit.blade.php
app/views/frontend/account/change-email.blade.php
app/views/frontend/account/change-password.blade.php
app/views/frontend/account/profile.blade.php
app/views/frontend/auth/forgot-password-confirm.blade.php
app/views/frontend/auth/signin.blade.php
|
2015-02-26 10:26:04 -08:00 |
|
|
snipe
|
e89cb883ec
|
Merge pull request #570 from madd15/models
Not Complete - Fix #565 - Models soft delete and restore, several icons and and Category lang
|
2015-02-26 10:20:15 -08:00 |
|
|
madd15
|
88ce0abe85
|
more icons
|
2015-02-27 01:32:24 +10:30 |
|
|
madd15
|
4570efc68b
|
Add restore to action button
|
2015-02-27 01:03:31 +10:30 |
|