aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--RELEASE_PROCESS.md15
-rw-r--r--app/config/wallabag.yml2
-rwxr-xr-xscripts/release.sh8
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig3
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig4
-rw-r--r--src/Wallabag/UserBundle/Resources/views/layout.html.twig2
6 files changed, 13 insertions, 21 deletions
diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 38dd5a7c..7e43d9d6 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -4,7 +4,7 @@ A release is mostly a git tag of http://github.com/wallabag/wallabag, following
4 4
5### Steps to release 5### Steps to release
6 6
7During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`. 7During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (like 2.3.4).
8 8
9#### Files to edit 9#### Files to edit
10 10
@@ -26,8 +26,8 @@ SYMFONY_ENV=prod composer up --no-dev
26 26
27```diff 27```diff
28script: 28script:
29- - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist 29- - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
30+ - travis_wait composer update --no-interaction --no-progress 30+ - travis_wait bash composer update -o --no-interaction --no-progress --prefer-dist
31``` 31```
32 32
33- Then continue with these commands: 33- Then continue with these commands:
@@ -42,15 +42,14 @@ git push origin release-$LAST_WALLABAG_RELEASE
42- Run these command to create the package: 42- Run these command to create the package:
43 43
44``` 44```
45make release master /tmp wllbg-release prod 45make release VERSION=$LAST_WALLABAG_RELEASE
46``` 46```
47 47
48- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new). You have to upload on this page the package. 48- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `release-$LAST_WALLABAG_RELEASE` branch. You have to upload the package (generated previously).
49- Delete the `release-$LAST_WALLABAG_RELEASE` branch and close the pull request (**DO NOT MERGE IT**). 49- Close the previously created pull request (**DO NOT MERGE IT**) and delete the `release-$LAST_WALLABAG_RELEASE` branch.
50- Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`) 50- Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
51- Update [the downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date)
52- Update Dockerfile https://github.com/wallabag/docker (and create a new tag) 51- Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
53- Update wallabag.org website (downloads, releases and new blog post) 52- Update wallabag.org website (downloads, MD5 sum, releases and new blog post)
54- Put the next patch version suffixed with `-dev` in `app/config/config.yml` (`wallabag_core.version`) 53- Put the next patch version suffixed with `-dev` in `app/config/config.yml` (`wallabag_core.version`)
55- Drink a :beer:! 54- Drink a :beer:!
56 55
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index 6354b22f..847a8058 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -1,5 +1,5 @@
1wallabag_core: 1wallabag_core:
2 version: 2.3.4 2 version: 2.3.5-dev
3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
4 languages: 4 languages:
5 en: 'English' 5 en: 'English'
diff --git a/scripts/release.sh b/scripts/release.sh
index 6186a486..2356a3f0 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -9,12 +9,12 @@ ENV=$4
9 9
10rm -rf $TMP_FOLDER/$RELEASE_FOLDER 10rm -rf $TMP_FOLDER/$RELEASE_FOLDER
11mkdir $TMP_FOLDER/$RELEASE_FOLDER 11mkdir $TMP_FOLDER/$RELEASE_FOLDER
12git clone git@github.com:wallabag/wallabag.git -b $VERSION $TMP_FOLDER/$RELEASE_FOLDER/$VERSION 12git clone git@github.com:wallabag/wallabag.git -b release-$VERSION $TMP_FOLDER/$RELEASE_FOLDER/$VERSION
13cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && SYMFONY_ENV=$ENV COMPOSER_MEMORY_LIMIT=-1 composer up -n --no-dev 13cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && SYMFONY_ENV=$ENV COMPOSER_MEMORY_LIMIT=-1 composer up -n --no-dev
14cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --env=$ENV 14cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --env=$ENV -n
15cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console assets:install --env=$ENV --symlink --relative 15cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console assets:install --env=$ENV --symlink --relative
16cd $TMP_FOLDER/$RELEASE_FOLDER && tar czf wallabag-$VERSION.tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $VERSION 16cd $TMP_FOLDER/$RELEASE_FOLDER && tar czf wallabag-$VERSION.tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $VERSION
17echo "MD5 checksum of the package for wallabag $VERSION" 17echo "MD5 checksum of the package for wallabag $VERSION"
18md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz 18md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-release-$VERSION.tar.gz
19echo "Package to upload to the release server:" 19echo "Package to upload to the release server:"
20echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz 20echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-release-$VERSION.tar.gz
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 48866f6e..e7d42b3d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -96,9 +96,6 @@
96 </div> 96 </div>
97 </aside> 97 </aside>
98 </div> 98 </div>
99 {% if entry.previewPicture is not null %}
100 <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|e|raw }}" /></div>
101 {% endif %}
102 <article> 99 <article>
103 {{ entry.content | raw }} 100 {{ entry.content | raw }}
104 </article> 101 </article>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 9ae6e73e..c6c19de6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -275,10 +275,6 @@
275 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} 275 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
276 </div> 276 </div>
277 277
278 {% if entry.previewPicture is not null %}
279 <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|default('entry.default_title'|trans)|raw }}" /></div>
280 {% endif %}
281
282 </aside> 278 </aside>
283 <article> 279 <article>
284 {{ entry.content | raw }} 280 {{ entry.content | raw }}
diff --git a/src/Wallabag/UserBundle/Resources/views/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
index 99bf7dfd..f97e9870 100644
--- a/src/Wallabag/UserBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
@@ -11,7 +11,7 @@
11<main class="valign-wrapper"> 11<main class="valign-wrapper">
12 <div class="valign row"> 12 <div class="valign row">
13 <div class="card sw"> 13 <div class="card sw">
14 <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-wallabag.svg') }}" alt="wallabag logo" class="typo-logo" /></div> 14 <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-wallabag.svg') }}" class="typo-logo" alt="wallabag logo" /></div>
15 {% block fos_user_content %} 15 {% block fos_user_content %}
16 {% endblock fos_user_content %} 16 {% endblock fos_user_content %}
17 </div> 17 </div>