Merge pull request #3745 from burkemw3/patch-3

Add placeholder image to card-based gallery entries page

diff --git a/GNUmakefile b/GNUmakefile
new file mode 100755 (executable)
index 0000000..a04468c
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,53 @@
+SHELL=bash
+TMP_FOLDER=/tmp
+RELEASE_FOLDER=wllbg-release
+
+ENV ?= prod
+
+help: ## Display this help menu
+       @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+clean: ## Clear the application cache
+       rm -rf var/cache/*
+
+install: ## Install wallabag with the latest version
+       @./scripts/install.sh $(ENV)
+
+update: ## Update the wallabag installation to the latest version
+       @./scripts/update.sh $(ENV)
+
+dev: ## Install the latest dev version
+       @./scripts/dev.sh
+
+run: ## Run the wallabag built-in server
+       @php bin/console server:run --env=dev
+
+build: ## Run webpack
+       @npm run build:$(ENV)
+
+prepare: clean ## Prepare database for testsuite
+ifdef DB
+       cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
+endif
+       -php bin/console doctrine:database:drop --force --env=test
+       php bin/console doctrine:database:create --env=test
+       php bin/console doctrine:migrations:migrate --no-interaction --env=test
+
+fixtures: ## Load fixtures into database
+       php bin/console doctrine:fixtures:load --no-interaction --env=test
+
+test: prepare fixtures ## Launch wallabag testsuite
+       bin/simple-phpunit -v
+
+release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
+ifndef VERSION
+       $(error VERSION is not set)
+endif
+       @./scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
+
+deploy: ## Deploy wallabag
+       @bundle exec cap staging deploy
+
+.PHONY: help clean prepare install fixtures update build test release deploy run dev
+
+.DEFAULT_GOAL := install

diff --git a/Makefile b/Makefile
old mode 100755 (executable)
new mode 100644 (file)
index 0f4cbbe..fefdd01
--- a/Makefile
+++ b/Makefile
@@ -1,52 +1,2 @@
-TMP_FOLDER=/tmp
-RELEASE_FOLDER=wllbg-release
-
-ENV ?= prod
-
-help: ## Display this help menu
-       @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-clean: ## Clear the application cache
-       rm -rf var/cache/*
-
-install: ## Install wallabag with the latest version
-       @sh scripts/install.sh $(ENV)
-
-update: ## Update the wallabag installation to the latest version
-       @sh scripts/update.sh $(ENV)
-
-dev: ## Install the latest dev version
-       @sh scripts/dev.sh
-
-run: ## Run the wallabag built-in server
-       @php bin/console server:run --env=dev
-
-build: ## Run webpack
-       @npm run build:$(ENV)
-
-prepare: clean ## Prepare database for testsuite
-ifdef DB
-       cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
-endif
-       -php bin/console doctrine:database:drop --force --env=test
-       php bin/console doctrine:database:create --env=test
-       php bin/console doctrine:migrations:migrate --no-interaction --env=test
-
-fixtures: ## Load fixtures into database
-       php bin/console doctrine:fixtures:load --no-interaction --env=test
-
-test: prepare fixtures ## Launch wallabag testsuite
-       bin/simple-phpunit -v
-
-release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
-ifndef VERSION
-       $(error VERSION is not set)
-endif
-       @sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
-
-deploy: ## Deploy wallabag
-       @bundle exec cap staging deploy
-
-.PHONY: help clean prepare install fixtures update build test release deploy run dev
-
-.DEFAULT_GOAL := install
+.DEFAULT:
+       gmake $@

diff --git a/scripts/dev.sh b/scripts/dev.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/scripts/install.sh b/scripts/install.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/scripts/release.sh b/scripts/release.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/scripts/require.sh b/scripts/require.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/scripts/update.sh b/scripts/update.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 2499bb887adb87f2b2b99271f47dec83b168f59d..aa388bcbcbd3d5a2e062f8e1f5ab122822435589 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -38,6 +38,8 @@
 
             <link rel="shortcut icon" type="image/x-icon" href="{{ asset('wallassets/themes/_global/img/appicon/favicon.ico') }}">
 
+            <link rel="manifest" href="{{ asset('manifest.json') }}">
+
             {% block css %}
             {% endblock %}
             {% block scripts %}

diff --git a/web/manifest.json b/web/manifest.json
new file mode 100644 (file)
index 0000000..72638ee
--- /dev/null
+++ b/web/manifest.json
@@ -0,0 +1,48 @@
+{
+  "short_name": "wallabag",
+  "name": "Save and classify articles. Read them later. Freely.",
+  "icons": [
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-57.png",
+      "type": "image/png",
+      "sizes": "57x57"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-72.png",
+      "type": "image/png",
+      "sizes": "72x72"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-76.png",
+      "type": "image/png",
+      "sizes": "76x76"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-114.png",
+      "type": "image/png",
+      "sizes": "114x114"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-120.png",
+      "type": "image/png",
+      "sizes": "120x120"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-144.png",
+      "type": "image/png",
+      "sizes": "144x144"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-152.png",
+      "type": "image/png",
+      "sizes": "152x152"
+    },
+    {
+      "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "display": "standalone",
+  "background_color": "#FFFFFF"
+}

diff --git a/web/wallassets/themes/_global/img/appicon/apple-touch-icon-512.png b/web/wallassets/themes/_global/img/appicon/apple-touch-icon-512.png
new file mode 100644 (file)
index 0000000..7385c25
Binary files /dev/null and b/web/wallassets/themes/_global/img/appicon/apple-touch-icon-512.png differ