Commit Graph

1100 Commits

Author SHA1 Message Date
snipe 02feb69d5d Localization on user's view page, new strings 2014-11-12 16:22:30 -05:00
snipe fc2d472ed3 Fixed english language string 2014-11-12 15:52:08 -05:00
snipe b622d977d9 Merge pull request #355 from madd15/feature-reports
Added Customizable Asset Report
2014-11-12 01:35:44 -05:00
Madd15 6d2a073d04 Custom Asset Report 2014-11-12 16:05:59 +10:30
snipe 564cf90e58 Merge pull request #354 from madd15/feature-reports
Feature Extended Reports
2014-11-12 00:32:51 -05:00
Madd15 c60e40096a Replace static titles with lang 2014-11-12 13:38:31 +10:30
Madd15 74ae2fceea Fix class on th 2014-11-12 13:34:53 +10:30
Madd15 02605bdf69 Add Asset Report with Reduced Load Time 2014-11-12 12:03:33 +10:30
Madd15 432e348e56 Add Report Controller and License Report 2014-11-12 12:02:55 +10:30
snipe d91a7c7aa8 Merge pull request #351 from diwanicki/patch-1
Update view.blade.php
2014-11-07 16:57:39 -05:00
diwanicki f2ae05786b Update view.blade.php
closing parens was missing from Depreciation, EOL was not configured for translations
2014-11-07 16:56:28 -05:00
snipe 3d3e2dc985 Merge pull request #346 from madd15/feature-supplier-image
Add image to supplier
2014-11-06 22:24:37 -05:00
madd15 3c3617d641 Add image to supplier 2014-11-07 13:46:14 +10:30
snipe b518162c50 Merge pull request #345 from madd15/patch-1
Fix #342
2014-11-06 16:23:50 -05:00
madd15 b2d5dc9ec5 Fix #342 2014-11-07 07:52:44 +10:30
snipe cff24309a1 Possibly fixes #343 2014-11-06 15:21:54 -05:00
snipe b25c94e429 Purchase cost is not required 2014-11-06 15:21:32 -05:00
snipe 53a47743e8 Language string udpates 2014-11-05 23:06:06 -05:00
snipe 8a10386737 Merge pull request #338 from madd15/patch-license-lang
Lang changes for new licenses functions
2014-11-05 22:49:00 -05:00
madd15 7e95d36245 Lang changes for new licenses functions 2014-11-06 14:15:09 +10:30
snipe f90327ee9c Merge pull request #337 from madd15/patch-1
Update to v1.1
2014-11-05 22:21:10 -05:00
madd15 3b5670965c Update to v1.1 2014-11-06 13:50:13 +10:30
snipe 8699a90093 Fixed changelog 2014-11-05 22:05:32 -05:00
snipe 562e5cd700 Changelog generator 2014-11-05 22:03:01 -05:00
snipe 3f7486e1a9 Updated changelog 2014-11-05 22:02:51 -05:00
snipe 0eb6183711 New strings for translation v1.1 2014-11-05 21:16:26 -05:00
snipe cdf5ecc084 Merge pull request #336 from madd15/feature-updated-setting-view
Update Settings to contain PHP & Laravel versions
2014-11-05 21:03:27 -05:00
madd15 0eda46da0c Move side column back to top on the right 2014-11-06 11:23:07 +10:30
madd15 1047c5c8bb Update Settings to contain PHP & Laravel versions 2014-11-06 11:12:15 +10:30
snipe 5f6f3de25e Merge pull request #335 from madd15/feature-new-license-fields
Add Fields to Licenses and Update Supplier for Licenses
2014-11-05 18:26:57 -05:00
madd15 7833d10006 Add Fields to Licenses and Update Supplier for Licenses 2014-11-06 09:32:50 +10:30
snipe 122b3d89d9 Added assetlog to other status types 2014-11-05 16:11:07 -05:00
snipe 14801eca79 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2014-11-05 16:10:11 -05:00
snipe 4a4b974f41 Merge pull request #333 from madd15/patch-1
Add assetlog to Deployed Loading
2014-11-05 16:09:55 -05:00
snipe ab7b828e33 Romanian translations 2014-11-05 16:08:54 -05:00
snipe b0e87d967a Arr! Pirate translations 2014-11-05 16:08:19 -05:00
snipe a0001fe1ed Arabic translations 2014-11-05 16:08:08 -05:00
madd15 ac5fa1641e Add assetlog to Deployed Loading 2014-11-06 07:35:49 +10:30
snipe 7c16dd8c92 Eager loading on other status types 2014-11-05 15:57:10 -05:00
snipe 294b02127b Don't show asset name field if there is none 2014-11-05 15:16:38 -05:00
snipe e04cc806d9 Fixes #327 2014-11-05 15:16:22 -05:00
snipe 2bee522a7c Included defaultLoc to assets view 2014-11-04 19:23:11 -05:00
snipe 5441dd41f0 Eager loading on assets listing 2014-11-04 18:58:16 -05:00
snipe 7858252fca More brazilian portuguese translations 2014-11-04 18:33:35 -05:00
snipe 6c6d31f15a A few more hungarian translations 2014-11-04 18:32:38 -05:00
snipe 6b2d3efe3e Fixes #237 - reporting-only group 2014-11-04 18:21:10 -05:00
snipe 1078dbf5c5 Fixes #324 2014-11-03 02:39:11 -05:00
snipe 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
snipe 25a7b05de6 Merge pull request #323 from madd15/patch-1
Fix if no asset selected sql error
2014-11-03 00:22:00 -05:00
madd15 70d7748229 Remove asterisk from asset 2014-11-03 15:48:51 +10:30