 Brady Wetherington
|
3ee9e93349
|
Note about key:generate
|
2015-02-16 21:27:23 -08:00 |
|
|
Brady Wetherington
|
c9b51bface
|
Docker kinda-sorta working, and documentation
|
2015-02-16 21:27:23 -08:00 |
|
|
snipe
|
1f0f9c2441
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-16 20:50:41 -08:00 |
|
|
snipe
|
d4fbea3571
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-16 20:49:55 -08:00 |
|
|
snipe
|
b32d74de57
|
Fixed seeder with duplicate ID
|
2015-02-16 19:56:11 -08:00 |
|
|
snipe
|
4e4144ea74
|
Fixed blade reference
|
2015-02-16 19:43:22 -08:00 |
|
|
snipe
|
7b331b26d3
|
Language string for nothing updated on bulk update
|
2015-02-16 18:27:27 -08:00 |
|
|
snipe
|
e02bea4275
|
Fixes #457 - added bulk options to hardware
|
2015-02-16 18:21:29 -08:00 |
|
|
snipe
|
24f5cdc743
|
Fixes #523 - added file uploads to assets
|
2015-02-16 13:49:51 -08:00 |
|
|
snipe
|
08ee02d0cd
|
Fixes #525 - added serial to asset model UI
|
2015-02-16 13:12:57 -08:00 |
|
|
snipe
|
ec1ab6913e
|
Merged layout blades for unified nav
|
2015-02-16 12:55:32 -08:00 |
|
|
snipe
|
f40bb7b8b3
|
Fixes #520 postal code requirement
|
2015-02-13 11:40:28 -08:00 |
|
|
snipe
|
17258b73a1
|
Fixes #520 - state no longer required
|
2015-02-13 11:37:47 -08:00 |
|
|
snipe
|
4a5007264e
|
Fixed mac address not showing
|
2015-02-12 21:34:20 -08:00 |
|
|
snipe
|
bd01b11f4f
|
Merge pull request #519 from madd15/patch-2
Fix #517 - User Requestable Assets
|
2015-02-12 13:21:48 -08:00 |
|
|
madd15
|
064c0211db
|
Fix #517 - User Requestable Assets
|
2015-02-13 07:50:47 +10:30 |
|
|
snipe
|
4cb931a93b
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-12 12:50:15 -08:00 |
|
|
snipe
|
3df8243d80
|
Updated composer to include mockery
|
2015-02-12 12:49:57 -08:00 |
|
|
snipe
|
f57c61dd4d
|
Possible fix for #518 - license count issue
|
2015-02-12 12:25:22 -08:00 |
|
|
snipe
|
7a4f115cb3
|
Merge remote-tracking branch 'origin/develop'
v1.2.4
|
2015-02-11 22:57:47 -08:00 |
|
|
snipe
|
58ff929d71
|
Fixes error when no model present because new asset
|
2015-02-11 22:57:22 -08:00 |
|
|
snipe
|
49f25a23a9
|
Merge pull request #516 from splaer/fix-475
Fix 475
|
2015-02-11 21:42:33 -08:00 |
|
|
Splaer
|
bcf75073ec
|
Update style
updated the scss as well until that starts getting auto compiled
|
2015-02-12 00:38:58 -05:00 |
|
|
snipe
|
6908456d09
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-11 21:27:56 -08:00 |
|
|
snipe
|
c26369f8cc
|
Added spacing between buttons
|
2015-02-11 21:21:19 -08:00 |
|
|
snipe
|
56e090f3e7
|
Unlink username if they've been deleted
|
2015-02-11 21:19:18 -08:00 |
|
|
Splaer
|
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 |
|
|
snipe
|
823e0c8562
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-11 16:55:29 -08:00 |
|
|
snipe
|
95be7908f8
|
New language strings
|
2015-02-11 16:51:16 -08:00 |
|
|
snipe
|
c660c71556
|
Added MAC address to view
|
2015-02-11 16:43:46 -08:00 |
|
|
snipe
|
fbf03b225d
|
Fixes #509 - added MAC address as model option
|
2015-02-11 16:37:24 -08:00 |
|
|
snipe
|
a5f4c51ab2
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-11 14:31:25 -08:00 |
|
|
snipe
|
89dce89035
|
Moved expiration date below purchase date
|
2015-02-11 14:02:34 -08:00 |
|
|
snipe
|
8cdd215614
|
Fixed intenting
|
2015-02-11 14:02:21 -08:00 |
|
|
snipe
|
342a8b81af
|
Fix for error when asset has null status
|
2015-02-11 13:51:28 -08:00 |
|
|
snipe
|
cd5a352961
|
Fix for wrong math on remaining licenses when assigned to an asset
|
2015-02-11 13:39:08 -08:00 |
|
|
snipe
|
a451fa1fa6
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-11 12:49:39 -08:00 |
|
|
snipe
|
e343c157c5
|
Fixed naming conflict for requestable
|
2015-02-11 12:49:21 -08:00 |
|
|
snipe
|
37fc216c5a
|
Additional language strings
|
2015-02-11 05:19:23 -08:00 |
|
|
snipe
|
96feb84fd4
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-11 04:59:35 -08:00 |
|
|
snipe
|
80e10c4c98
|
Fixes #387 - sortable asset view by manufacturer
|
2015-02-11 04:57:59 -08:00 |
|
|
snipe
|
35a133bbf9
|
Fixes #382 - allow admins to restore deleted assets
|
2015-02-11 04:44:39 -08:00 |
|
|
snipe
|
0adbce77f9
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-11 03:52:08 -08:00 |
|
|
snipe
|
c89be34503
|
Fixes #329 and #454 - added category asset view
|
2015-02-11 03:51:01 -08:00 |
|
|
snipe
|
9c3873e712
|
Category asset view
|
2015-02-11 03:50:16 -08:00 |
|
|
snipe
|
4f6eeda368
|
View asset for requests
|
2015-02-11 03:49:33 -08:00 |
|
|
snipe
|
f690cd6305
|
Requests table
|
2015-02-11 03:49:13 -08:00 |
|
|
snipe
|
447ed3518e
|
Merge remote-tracking branch 'origin/develop'
|
2015-02-11 00:56:17 -08:00 |
|
|
snipe
|
d9d99b2223
|
No trashed
|
2015-02-11 00:44:22 -08:00 |
|
|
snipe
|
2b99adba5f
|
Do not include trashed for user view
|
2015-02-11 00:43:50 -08:00 |
|