15a7e205be
Force Model Restore before Asset Restore
2015-02-27 07:33:48 +10:30
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
eb5d4983de
more model functionality and icons
2015-02-27 00:53:16 +10:30
f9f3b5b4f9
Smaller buttons
2015-02-26 02:42:25 -08:00
cd7461a3a8
Missed files. Composer to add new package and organized the view page label
2015-02-25 15:08:12 -05:00
7d87b3384c
Standardized colors for checkin/checkout in sidebar
2015-02-18 12:22:37 -08:00
30df21c7aa
Fixed missing checkedout-to info on asset view
2015-02-18 10:27:41 -08:00
063e5c407c
Fixed the depreciation report, fixes to calculate current depreciated
...
value (which were only used there). Additional fixes and refactoring
around Depreciable, in terms of how assets get depreciation via models,
and licenses get depreciation directly.
2015-02-17 18:51:13 -08:00
88dc0700f0
Make date functions work; create negative intervals for depreciation,
...
Also renamed "months_until_depreciation" to "time_until_depreciation"
And renamed Depreciatable to Depreciable (which is an actual word in
English.) Also a cleanup/consistency-enforcement for interval display.
2015-02-17 17:40:16 -08:00
1e4071b51d
First stab at cleaning up Depreciation
...
Conflicts:
app/models/Asset.php
It looks like the same time I pulled depreciation out of the
Asset class, uploads were being added in. It doesn't look
like a conflict to me, but git couldn't figure it out. Oh Well.
2015-02-17 17:39:39 -08:00
e02bea4275
Fixes #457 - added bulk options to hardware
2015-02-16 18:21:29 -08:00
24f5cdc743
Fixes #523 - added file uploads to assets
2015-02-16 13:49:51 -08:00
49f25a23a9
Merge pull request #516 from splaer/fix-475
...
Fix 475
2015-02-11 21:42:33 -08:00
56e090f3e7
Unlink username if they've been deleted
2015-02-11 21:19:18 -08:00
00f7717142
Fix #475 and styling
...
Cleaned up styling to break lines with larger notes on hardware view
and asset view. Changed column type to text.
2015-02-11 23:38:59 -05:00
c660c71556
Added MAC address to view
2015-02-11 16:43:46 -08:00
35a133bbf9
Fixes #382 - allow admins to restore deleted assets
2015-02-11 04:44:39 -08:00
bf9a825095
Removed extraneous ID
2015-02-10 19:18:15 -08:00
5f1227d0fa
Removed stray chars
2015-02-10 17:41:27 -08:00
dbc93de6b3
Fixes checkin button on view
2015-02-10 17:11:40 -08:00
d2438f9fdb
Fixes #502 - normalized statuses
2015-02-10 15:57:19 -08:00
389c27b2e6
Fixes #477 - wrong sidebar on asset view
2015-02-09 00:34:29 -08:00
416cd236d2
Updated to new fieldname
2015-02-06 18:42:24 -08:00
cd338d2a70
Fixes #483 - line breaks in notes on view
2015-02-04 10:21:02 -08:00
2b86f14e30
Possible fix for #484 - fullname issue
2015-02-01 14:33:58 -08:00
950567e9d6
Fixes issue related to #471 - assigning to user ID 0 causes erro
2015-01-23 15:38:39 -08:00
0663ccb99f
Check if ->adminuser->id isset before trying to print the fullName so we can catch when a user that created an asset has been deleted. Fixes #349
2014-12-03 07:46:29 -06:00
300c262739
Merge pull request #320 from diwanicki/asset-view-edit-new-org
...
Adjustments to Asset Edit and Asset View layouts
2014-11-03 00:40:44 -05:00
0022389463
Fix dropdown menu position
2014-11-03 08:24:53 +10:30
04123b3fe8
Missing end div causing layout issues
2014-11-03 08:12:34 +10:30
55cd7c0f81
move br in notes div, almost there
2014-11-02 13:27:32 -05:00
63656762b0
changed style for notes, brd in div
2014-11-02 13:26:09 -05:00
87a9399b6b
maybe a break?
2014-11-02 13:18:58 -05:00
ed5ff9a01b
trying hard space
2014-11-02 13:14:56 -05:00
68bf40a7ea
typo2
2014-11-02 13:10:01 -05:00
0cf24bdde1
typo
2014-11-02 13:08:44 -05:00
05502cf29d
trying serial in col-md12
2014-11-02 13:03:06 -05:00
1305ea9597
move in div?
2014-11-02 11:27:56 -05:00
94e1fcb01b
maybe breaks?
2014-11-02 11:24:28 -05:00
9c01ab334f
playing with paragraph tags
2014-11-02 11:22:05 -05:00
b685ea666c
em, small, and paragraphs
2014-11-02 11:17:34 -05:00
ee35948980
fix div issues
2014-11-02 11:09:29 -05:00
569714315c
Revert c122cc2..f094551
...
This rolls back to commit c122cc2647
2014-11-02 10:54:52 -05:00
f09455117b
.
2014-11-02 10:51:45 -05:00
af70559754
.
2014-11-02 10:50:35 -05:00
07e6d49dce
.
2014-11-02 10:49:22 -05:00
86597bb863
more
2014-11-02 10:46:57 -05:00
6d057846a1
again
2014-11-02 10:45:33 -05:00
ba9f8c61f1
more
2014-11-02 10:41:52 -05:00
d3266dd4e8
still more
2014-11-02 10:40:10 -05:00
madd15