8b3e22b58e
Fixes #546 - only insert data if values exist
2015-02-19 15:50:53 -08:00
ad9e7f1d9e
Cleaned up settings form for nicer display
2015-02-19 15:34:55 -08:00
f85061f988
Fix #541 - Headers not being skipped if checked
2015-02-20 09:54:55 +10:30
f8e12cabd4
Fixes #476 - added logo upload and header color
2015-02-19 15:14:50 -08:00
70ae59ed62
Fixed a bug when no assets are in table that the autoincrement method blows up. Also optimzed the logic to get max id instead of popping top off creation date.
2015-02-19 12:52:27 -05:00
ae104293da
#539 - Allow checked out asset in requestable
2015-02-19 08:20:27 +10:30
c07907833c
Updated laguage strings
2015-02-18 13:33:05 -08: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
366fb60628
Enhance installation
...
Make available to install app without seeding dummy data.
2015-02-18 16:00:33 +01:00
01f11f2da4
Updated text
2015-02-18 02:56:01 -08:00
f6ae35df63
Only show the "email credentials" checkbox if new user
2015-02-18 02:51:41 -08:00
87936a58fa
CSV user import
2015-02-18 02:48:16 -08:00
8777a1a9f1
Updated language strings
2015-02-17 20:44:01 -08:00
a04af4aead
Bumped version number
2015-02-17 19:17:53 -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
3ba02b65fb
Oops - Assets get their Depreciation from their *model* - wheras
...
Licenses have a Depreciation directly associated with them. So I
pulled the Depreciation relationship out of Depreciable so that both
Assets and Licenses could pull their depreciations in their associated
ways. I could've done this with an inheritance call, but that seems
a bit much (and unnecessarily confusing).
2015-02-17 17:56:59 -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
899e2bc9b6
Not convinved this filename is right or anything, but the shared depreciation code is here
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
38961298ed
Fixes #439 - loads javascript and CSS locally
2015-02-17 15:29:57 -08:00
ea6a6d098a
Fixes #440 - removed unique constraint on serial
2015-02-17 14:15:22 -08:00
b32d74de57
Fixed seeder with duplicate ID
2015-02-16 19:56:11 -08:00
4e4144ea74
Fixed blade reference
2015-02-16 19:43:22 -08:00
7b331b26d3
Language string for nothing updated on bulk update
2015-02-16 18:27:27 -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
08ee02d0cd
Fixes #525 - added serial to asset model UI
2015-02-16 13:12:57 -08:00
ec1ab6913e
Merged layout blades for unified nav
2015-02-16 12:55:32 -08:00
f40bb7b8b3
Fixes #520 postal code requirement
2015-02-13 11:40:28 -08:00
17258b73a1
Fixes #520 - state no longer required
2015-02-13 11:37:47 -08:00
4a5007264e
Fixed mac address not showing
2015-02-12 21:34:20 -08:00
064c0211db
Fix #517 - User Requestable Assets
2015-02-13 07:50:47 +10:30
f57c61dd4d
Possible fix for #518 - license count issue
2015-02-12 12:25:22 -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
c26369f8cc
Added spacing between buttons
2015-02-11 21:21:19 -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
95be7908f8
New language strings
2015-02-11 16:51:16 -08: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
89dce89035
Moved expiration date below purchase date
2015-02-11 14:02:34 -08:00
8cdd215614
Fixed intenting
2015-02-11 14:02:21 -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
e343c157c5
Fixed naming conflict for requestable
2015-02-11 12:49:21 -08:00
37fc216c5a
Additional language strings
2015-02-11 05:19:23 -08:00
80e10c4c98
Fixes #387 - sortable asset view by manufacturer
2015-02-11 04:57:59 -08:00
35a133bbf9
Fixes #382 - allow admins to restore deleted assets
2015-02-11 04:44:39 -08:00
snipe