1075 Commits

Author SHA1 Message Date
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
madd15 6315db7fd8 Allow checkout to user without asset 2014-11-03 15:35:04 +10:30
snipe 343798d241 Merge pull request #322 from madd15/fix-js-delete-asset
Delegate to table, add button to on()
2014-11-02 20:10:05 -05:00
snipe 5050862979 Merge pull request #321 from madd15/patch-5
Fix #318 - Missing end div causing layout issues
2014-11-02 17:34:36 -05:00
madd15 90baf2eeba Delegate to table, add button to on() 2014-11-03 08:58:19 +10:30
madd15 0022389463 Fix dropdown menu position 2014-11-03 08:24:53 +10:30
madd15 04123b3fe8 Missing end div causing layout issues 2014-11-03 08:12:34 +10:30
snipe 491de30374 Finnish translation via jarnok 2014-11-02 13:41:12 -05:00
snipe 0d402f52c8 Localization 2014-11-02 13:34:08 -05:00
diwanicki 55cd7c0f81 move br in notes div, almost there 2014-11-02 13:27:32 -05:00
diwanicki 63656762b0 changed style for notes, brd in div 2014-11-02 13:26:09 -05:00
diwanicki 87a9399b6b maybe a break? 2014-11-02 13:18:58 -05:00
diwanicki ed5ff9a01b trying hard space 2014-11-02 13:14:56 -05:00
diwanicki 68bf40a7ea typo2 2014-11-02 13:10:01 -05:00
diwanicki 0cf24bdde1 typo 2014-11-02 13:08:44 -05:00
diwanicki 05502cf29d trying serial in col-md12 2014-11-02 13:03:06 -05:00
diwanicki 1305ea9597 move in div? 2014-11-02 11:27:56 -05:00
diwanicki 94e1fcb01b maybe breaks? 2014-11-02 11:24:28 -05:00
diwanicki 9c01ab334f playing with paragraph tags 2014-11-02 11:22:05 -05:00
diwanicki b685ea666c em, small, and paragraphs 2014-11-02 11:17:34 -05:00
diwanicki ee35948980 fix div issues 2014-11-02 11:09:29 -05:00
diwanicki 569714315c Revert c122cc2..f094551
This rolls back to commit c122cc2647.
2014-11-02 10:54:52 -05:00
diwanicki f09455117b . 2014-11-02 10:51:45 -05:00
diwanicki af70559754 . 2014-11-02 10:50:35 -05:00
diwanicki 07e6d49dce . 2014-11-02 10:49:22 -05:00
diwanicki 86597bb863 more 2014-11-02 10:46:57 -05:00