Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 4914c7d
Author: Marcin Kaciuba <aldor007@gmail.com>
Date:   Sun Nov 19 17:13:36 2017 +0100

    Squashed commit of the following:

    commit 9aad8077ccd7ced3bd14fe26b06e3ca71cd4a090
    Merge: 3af3eb5 750fab6
    Author: Marcin Kaciuba <aldor007@gmail.com>
    Date:   Sun Nov 19 17:12:30 2017 +0100

        Merge branch 'Aldor007-patch-1' of github.com:Aldor007/mort into Aldor007-patch-1

    commit 3af3eb5a103729fc54ee8cb805b5eabf4abd07bd
    Author: Marcin Kaciuba <aldor007@gmail.com>
    Date:   Sun Nov 19 17:12:04 2017 +0100

        Update README

    commit 750fab6
    Author: Marcin Kaciuba <aldor007@gmail.com>
    Date:   Sun Nov 19 17:10:17 2017 +0100

        Update README.md

    commit acc7816
    Author: Marcin Kaciuba <aldor007@gmail.com>
    Date:   Sun Nov 19 17:09:17 2017 +0100

        Update README.md

    commit fcb0a14
    Author: Marcin Kaciuba <aldor007@gmail.com>
    Date:   Sun Nov 19 17:08:53 2017 +0100

        Update README.md

    commit 432ad92
    Author: Marcin Kaciuba <aldor007@gmail.com>
    Date:   Sun Nov 19 17:07:42 2017 +0100

        Update README.md

    commit 723426a
    Author: Marcin Kaciuba <aldor007@gmail.com>
    Date:   Sun Nov 19 17:05:07 2017 +0100

        Update README.md

    commit 1be87b4
    Author: Marcin Kaciuba <aldor007@gmail.com>
    Date:   Sun Nov 19 15:52:15 2017 +0100

        Update README.md

commit 750fab6
Author: Marcin Kaciuba <aldor007@gmail.com>
Date:   Sun Nov 19 17:10:17 2017 +0100

    Update README.md

commit acc7816
Author: Marcin Kaciuba <aldor007@gmail.com>
Date:   Sun Nov 19 17:09:17 2017 +0100

    Update README.md

commit fcb0a14
Author: Marcin Kaciuba <aldor007@gmail.com>
Date:   Sun Nov 19 17:08:53 2017 +0100

    Update README.md

commit 432ad92
Author: Marcin Kaciuba <aldor007@gmail.com>
Date:   Sun Nov 19 17:07:42 2017 +0100

    Update README.md

commit 723426a
Author: Marcin Kaciuba <aldor007@gmail.com>
Date:   Sun Nov 19 17:05:07 2017 +0100

    Update README.md

commit 1be87b4
Author: Marcin Kaciuba <aldor007@gmail.com>
Date:   Sun Nov 19 15:52:15 2017 +0100

    Update README.md
  • Loading branch information
aldor007 committed Nov 19, 2017
1 parent 474ed9a commit 1008c8c
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ S3 compatible image processing server written in Go.

# Demo
-------
[Original image](https://mort.mkaciuba.com/demo/cat.jpg)
[Original image 12 Mpix](https://mort.mkaciuba.com/demo/img.jpg)
<table>
<thead>
<tr>
Expand All @@ -33,8 +33,8 @@ S3 compatible image processing server written in Go.
width: 75 </p>
</td>
<td>
<a href="https://mort.mkaciuba.com/demo/small/cat.jpg" target="_blank">
![small](https://mort.mkaciuba.com/demo/small/cat.jpg)
<a href="https://mort.mkaciuba.com/demo/small/img.jpg" target="_blank">
<img src="https://mort.mkaciuba.com/demo/small/img.jpg" width="75px" />
</a>
</td>
</tr>
Expand All @@ -48,8 +48,9 @@ S3 compatible image processing server written in Go.
</ul>
</td>
<td>
![blur](https://mort.mkaciuba.com/demo/blur/cat.jpg")
<a href="https://mort.mkaciuba.com/demo/blur/img.jpg" target="_blank">
<img src="https://mort.mkaciuba.com/demo/blur/img.jpg" width="700px" />
</a>
</td>
</tr>
<tr>
Expand All @@ -62,23 +63,23 @@ S3 compatible image processing server written in Go.
</ul>
</td>
<td>
<a href="https://mort.mkaciuba.com/demo/webp/cat.jpg" target="_blank">
![webp](https://mort.mkaciuba.com/demo/webp/cat.jpg)
<a href="https://mort.mkaciuba.com/demo/webp/img.jpg" target="_blank">
<img src="https://mort.mkaciuba.com/demo/webp/img.jpg" width="1000px" />
</a>
</td>
</tr>
<tr>
<td>
<p>preset: watermakr</p>
<p>preset: watermark</p>
<ul>
<li> <p>resize image (preserve aspect ratio)
width: 1300</p></li>
<li><p>and add watermark</p></li>
<li><p>and add watermark</p></li>
</ul>
</td>
<td>
<a href="https://mort.mkaciuba.com/watermark/webp/cat.jpg" target="_blank">
![watermark](https://mort.mkaciuba.com/watermark/cat.jpg)
<a href="https://mort.mkaciuba.com/watermark/watermark/img.jpg" target="_blank">
<img src="https://mort.mkaciuba.com/demo/watermark/img.jpg" width="1300px" />
</a>
</td>
</tr>
Expand Down

0 comments on commit 1008c8c

Please sign in to comment.