ef6eae63d8
Fixed error icon
2015-02-26 15:50:33 -08:00
19ad8970d7
Fixed arrow icon
2015-02-26 14:08:42 -08:00
15a7e205be
Force Model Restore before Asset Restore
2015-02-27 07:33:48 +10:30
528c06cf7f
Reverting icon fix
2015-02-26 10:33:31 -08:00
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
88ce0abe85
more icons
2015-02-27 01:32:24 +10:30
eb5d4983de
more model functionality and icons
2015-02-27 00:53:16 +10:30
379f6bef6c
catergories lang and serveral icons
2015-02-26 23:48:17 +10:30
e090762b5a
Icon changes on hardware
2015-02-26 22:41:44 +10:30
59ea144b28
Minor UX tweaks
2015-02-26 03:07:19 -08:00
f9f3b5b4f9
Smaller buttons
2015-02-26 02:42:25 -08:00
ca1351b704
Switched to all FA
2015-02-25 18:14:51 -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
4a5007264e
Fixed mac address not showing
2015-02-12 21:34:20 -08:00
58ff929d71
Fixes error when no model present because new asset
2015-02-11 22:57:22 -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
fbf03b225d
Fixes #509 - added MAC address as model option
2015-02-11 16:37:24 -08:00
342a8b81af
Fix for error when asset has null status
2015-02-11 13:51:28 -08:00
cd5a352961
Fix for wrong math on remaining licenses when assigned to an asset
2015-02-11 13:39:08 -08:00
35a133bbf9
Fixes #382 - allow admins to restore deleted assets
2015-02-11 04:44:39 -08:00
ab1c921443
Requestable assets views and controllers
2015-02-10 23:55:06 -08:00
8cc95a3b9b
Merge pull request #507 from madd15/patch-2
...
Added Archived Lang
2015-02-10 19:19:03 -08:00
bf9a825095
Removed extraneous ID
2015-02-10 19:18:15 -08:00
5c92be5190
Added Archived Lang
2015-02-11 13:45:04 +10:30
268fb98dbb
Indented for better readibility
2015-02-10 17:41:42 -08:00
5f1227d0fa
Removed stray chars
2015-02-10 17:41:27 -08:00
c06a4d4118
Fixed wonky checkin/checkout buttons
2015-02-10 17:17:33 -08:00
dbc93de6b3
Fixes checkin button on view
2015-02-10 17:11:40 -08:00
2277b6ee69
Fixed checkout logic for new assigned_to
2015-02-10 17:04:15 -08:00
b36d73a4bb
Missing checkin buttons on index
2015-02-10 17:03:13 -08:00
d2438f9fdb
Fixes #502 - normalized statuses
2015-02-10 15:57:19 -08:00
2bae77b3af
Removed extranneous text field
2015-02-09 16:50:12 -08:00
389c27b2e6
Fixes #477 - wrong sidebar on asset view
2015-02-09 00:34:29 -08:00
51a7752771
Moved cancel text to buttons language file
2015-02-06 18:52:09 -08:00
416cd236d2
Updated to new fieldname
2015-02-06 18:42:24 -08:00
a1ac7f8676
Removed cruft
2015-02-04 15:01:08 -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
95141d49ba
Fixes #432 - add model name to checkout
2015-01-22 15:20:16 -08:00
snipe