aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xGNUmakefile53
-rw-r--r--[-rwxr-xr-x]Makefile54
-rwxr-xr-x[-rw-r--r--]scripts/dev.sh0
-rwxr-xr-x[-rw-r--r--]scripts/install.sh0
-rwxr-xr-x[-rw-r--r--]scripts/release.sh0
-rwxr-xr-x[-rw-r--r--]scripts/require.sh0
-rwxr-xr-x[-rw-r--r--]scripts/update.sh0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/base.html.twig2
-rw-r--r--web/manifest.json48
-rw-r--r--web/wallassets/themes/_global/img/appicon/apple-touch-icon-512.pngbin0 -> 28102 bytes
10 files changed, 105 insertions, 52 deletions
diff --git a/GNUmakefile b/GNUmakefile
new file mode 100755
index 00000000..a04468cb
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,53 @@
1SHELL=bash
2TMP_FOLDER=/tmp
3RELEASE_FOLDER=wllbg-release
4
5ENV ?= prod
6
7help: ## Display this help menu
8 @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
9
10clean: ## Clear the application cache
11 rm -rf var/cache/*
12
13install: ## Install wallabag with the latest version
14 @./scripts/install.sh $(ENV)
15
16update: ## Update the wallabag installation to the latest version
17 @./scripts/update.sh $(ENV)
18
19dev: ## Install the latest dev version
20 @./scripts/dev.sh
21
22run: ## Run the wallabag built-in server
23 @php bin/console server:run --env=dev
24
25build: ## Run webpack
26 @npm run build:$(ENV)
27
28prepare: clean ## Prepare database for testsuite
29ifdef DB
30 cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
31endif
32 -php bin/console doctrine:database:drop --force --env=test
33 php bin/console doctrine:database:create --env=test
34 php bin/console doctrine:migrations:migrate --no-interaction --env=test
35
36fixtures: ## Load fixtures into database
37 php bin/console doctrine:fixtures:load --no-interaction --env=test
38
39test: prepare fixtures ## Launch wallabag testsuite
40 bin/simple-phpunit -v
41
42release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
43ifndef VERSION
44 $(error VERSION is not set)
45endif
46 @./scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
47
48deploy: ## Deploy wallabag
49 @bundle exec cap staging deploy
50
51.PHONY: help clean prepare install fixtures update build test release deploy run dev
52
53.DEFAULT_GOAL := install
diff --git a/Makefile b/Makefile
index 0f4cbbe8..fefdd017 100755..100644
--- a/Makefile
+++ b/Makefile
@@ -1,52 +1,2 @@
1TMP_FOLDER=/tmp 1.DEFAULT:
2RELEASE_FOLDER=wllbg-release 2 gmake $@
3
4ENV ?= prod
5
6help: ## Display this help menu
7 @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
8
9clean: ## Clear the application cache
10 rm -rf var/cache/*
11
12install: ## Install wallabag with the latest version
13 @sh scripts/install.sh $(ENV)
14
15update: ## Update the wallabag installation to the latest version
16 @sh scripts/update.sh $(ENV)
17
18dev: ## Install the latest dev version
19 @sh scripts/dev.sh
20
21run: ## Run the wallabag built-in server
22 @php bin/console server:run --env=dev
23
24build: ## Run webpack
25 @npm run build:$(ENV)
26
27prepare: clean ## Prepare database for testsuite
28ifdef DB
29 cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
30endif
31 -php bin/console doctrine:database:drop --force --env=test
32 php bin/console doctrine:database:create --env=test
33 php bin/console doctrine:migrations:migrate --no-interaction --env=test
34
35fixtures: ## Load fixtures into database
36 php bin/console doctrine:fixtures:load --no-interaction --env=test
37
38test: prepare fixtures ## Launch wallabag testsuite
39 bin/simple-phpunit -v
40
41release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
42ifndef VERSION
43 $(error VERSION is not set)
44endif
45 @sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
46
47deploy: ## Deploy wallabag
48 @bundle exec cap staging deploy
49
50.PHONY: help clean prepare install fixtures update build test release deploy run dev
51
52.DEFAULT_GOAL := install
diff --git a/scripts/dev.sh b/scripts/dev.sh
index 0703ced1..0703ced1 100644..100755
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
diff --git a/scripts/install.sh b/scripts/install.sh
index 62a46f4f..62a46f4f 100644..100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
diff --git a/scripts/release.sh b/scripts/release.sh
index 6186a486..6186a486 100644..100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
diff --git a/scripts/require.sh b/scripts/require.sh
index c48ab936..c48ab936 100644..100755
--- a/scripts/require.sh
+++ b/scripts/require.sh
diff --git a/scripts/update.sh b/scripts/update.sh
index d0598135..d0598135 100644..100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 2499bb88..aa388bcb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -38,6 +38,8 @@
38 38
39 <link rel="shortcut icon" type="image/x-icon" href="{{ asset('wallassets/themes/_global/img/appicon/favicon.ico') }}"> 39 <link rel="shortcut icon" type="image/x-icon" href="{{ asset('wallassets/themes/_global/img/appicon/favicon.ico') }}">
40 40
41 <link rel="manifest" href="{{ asset('manifest.json') }}">
42
41 {% block css %} 43 {% block css %}
42 {% endblock %} 44 {% endblock %}
43 {% block scripts %} 45 {% block scripts %}
diff --git a/web/manifest.json b/web/manifest.json
new file mode 100644
index 00000000..72638eef
--- /dev/null
+++ b/web/manifest.json
@@ -0,0 +1,48 @@
1{
2 "short_name": "wallabag",
3 "name": "Save and classify articles. Read them later. Freely.",
4 "icons": [
5 {
6 "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-57.png",
7 "type": "image/png",
8 "sizes": "57x57"
9 },
10 {
11 "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-72.png",
12 "type": "image/png",
13 "sizes": "72x72"
14 },
15 {
16 "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-76.png",
17 "type": "image/png",
18 "sizes": "76x76"
19 },
20 {
21 "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-114.png",
22 "type": "image/png",
23 "sizes": "114x114"
24 },
25 {
26 "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-120.png",
27 "type": "image/png",
28 "sizes": "120x120"
29 },
30 {
31 "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-144.png",
32 "type": "image/png",
33 "sizes": "144x144"
34 },
35 {
36 "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-152.png",
37 "type": "image/png",
38 "sizes": "152x152"
39 },
40 {
41 "src": "wallassets/themes/_global/img/appicon/apple-touch-icon-512.png",
42 "type": "image/png",
43 "sizes": "512x512"
44 }
45 ],
46 "display": "standalone",
47 "background_color": "#FFFFFF"
48}
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
index 00000000..7385c256
--- /dev/null
+++ b/web/wallassets/themes/_global/img/appicon/apple-touch-icon-512.png
Binary files differ