From 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 8 Mar 2016 17:02:34 +0100 Subject: manage assets through npm first draft remote assetic totally work nearly there use at least nodejs > 0.12 use proper version of grunt bump nodejs version for travis update npm workaround for materialize install node 5.0 add grunt-cli baggy theme & cache node modules cache bower & npm make travis build assets on php7 only exclude installing node & npm if not needed & use bash clean & try to make icomoon work on baggy ready config for travis rebase make travis work more travis work impove travis & update deps add missing pixrem deps add module through oddly lost ui updates install latest nodejs add install_dev.sh, link local binaries for npm/bower/grunt ui improvements (mostly baggy) fix travis build no need to install on travis Add unread filter to entries pages Add the ability to filter for unread pages in the filters menu. Add unread filter test to EntryControllerTest Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved. Improve English translation Update FAQ -Fix grammar -Add notes about MTA, firewall, and SELinux Update installation instructions -Fix grammar -Add SELinux section add screenshots of android docu in English Fix the deletion of Tags/Entries relation when delete an entry Fix #2121 Move fixtures to the right place Display a message when saving an entry failed When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too. Change ManyToMany between entry & tag Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed Prepare wallabag 2.0.5 enforce older materialize version --- .../_global/img/appicon/apple-touch-icon-114.png | Bin 0 -> 2281 bytes .../_global/img/appicon/apple-touch-icon-120.png | Bin 0 -> 2318 bytes .../_global/img/appicon/apple-touch-icon-144.png | Bin 0 -> 2718 bytes .../_global/img/appicon/apple-touch-icon-152.png | Bin 0 -> 2835 bytes .../_global/img/appicon/apple-touch-icon-57.png | Bin 0 -> 1582 bytes .../_global/img/appicon/apple-touch-icon-72.png | Bin 0 -> 1709 bytes .../_global/img/appicon/apple-touch-icon-76.png | Bin 0 -> 1838 bytes .../_global/img/appicon/apple-touch-icon.png | Bin 0 -> 1579 bytes .../static/themes/_global/img/appicon/favicon.ico | Bin 0 -> 34494 bytes .../static/themes/_global/img/bg-select.png | Bin 0 -> 1095 bytes .../_global/img/icons/carrot-icon--black.png | Bin 0 -> 1538 bytes .../_global/img/icons/carrot-icon--white.png | Bin 0 -> 1605 bytes .../_global/img/icons/diaspora-icon--black.png | Bin 0 -> 1555 bytes .../_global/img/icons/diaspora-icon--white.png | Bin 0 -> 612 bytes .../themes/_global/img/logo-other_themes.png | Bin 0 -> 3058 bytes .../static/themes/_global/img/logo-square.png | Bin 0 -> 3314 bytes app/Resources/static/themes/_global/img/logo-w.png | Bin 0 -> 4916 bytes .../static/themes/_global/img/logo-wallabag.svg | 300 +++++ .../static/themes/_global/js/bookmarklet.js | 2 + .../static/themes/_global/js/restoreScroll.js | 25 + app/Resources/static/themes/baggy/css/font.css | 6 + app/Resources/static/themes/baggy/css/main.css | 1233 ++++++++++++++++++++ app/Resources/static/themes/baggy/css/messages.css | 19 + app/Resources/static/themes/baggy/css/print.css | 64 + .../static/themes/baggy/css/ratatouille.css | 225 ++++ app/Resources/static/themes/baggy/font/icomoon.eot | Bin 0 -> 97236 bytes app/Resources/static/themes/baggy/font/icomoon.svg | 501 ++++++++ app/Resources/static/themes/baggy/font/icomoon.ttf | Bin 0 -> 97072 bytes .../static/themes/baggy/font/icomoon.woff | Bin 0 -> 97148 bytes app/Resources/static/themes/baggy/img/blank.png | Bin 0 -> 141 bytes app/Resources/static/themes/baggy/img/down.png | Bin 0 -> 216 bytes app/Resources/static/themes/baggy/img/list.png | Bin 0 -> 201 bytes app/Resources/static/themes/baggy/img/table.png | Bin 0 -> 229 bytes app/Resources/static/themes/baggy/img/top.png | Bin 0 -> 212 bytes app/Resources/static/themes/baggy/js/autoClose.js | 6 + .../static/themes/baggy/js/autoCompleteTags.js | 47 + .../static/themes/baggy/js/closeMessage.js | 17 + app/Resources/static/themes/baggy/js/init.js | 101 ++ app/Resources/static/themes/baggy/js/popupForm.js | 100 ++ app/Resources/static/themes/baggy/js/saveLink.js | 78 ++ app/Resources/static/themes/material/css/main.css | 611 ++++++++++ app/Resources/static/themes/material/css/print.css | 64 + app/Resources/static/themes/material/js/init.js | 116 ++ 43 files changed, 3515 insertions(+) create mode 100755 app/Resources/static/themes/_global/img/appicon/apple-touch-icon-114.png create mode 100755 app/Resources/static/themes/_global/img/appicon/apple-touch-icon-120.png create mode 100755 app/Resources/static/themes/_global/img/appicon/apple-touch-icon-144.png create mode 100755 app/Resources/static/themes/_global/img/appicon/apple-touch-icon-152.png create mode 100755 app/Resources/static/themes/_global/img/appicon/apple-touch-icon-57.png create mode 100755 app/Resources/static/themes/_global/img/appicon/apple-touch-icon-72.png create mode 100755 app/Resources/static/themes/_global/img/appicon/apple-touch-icon-76.png create mode 100755 app/Resources/static/themes/_global/img/appicon/apple-touch-icon.png create mode 100755 app/Resources/static/themes/_global/img/appicon/favicon.ico create mode 100644 app/Resources/static/themes/_global/img/bg-select.png create mode 100644 app/Resources/static/themes/_global/img/icons/carrot-icon--black.png create mode 100644 app/Resources/static/themes/_global/img/icons/carrot-icon--white.png create mode 100644 app/Resources/static/themes/_global/img/icons/diaspora-icon--black.png create mode 100644 app/Resources/static/themes/_global/img/icons/diaspora-icon--white.png create mode 100755 app/Resources/static/themes/_global/img/logo-other_themes.png create mode 100644 app/Resources/static/themes/_global/img/logo-square.png create mode 100755 app/Resources/static/themes/_global/img/logo-w.png create mode 100644 app/Resources/static/themes/_global/img/logo-wallabag.svg create mode 100644 app/Resources/static/themes/_global/js/bookmarklet.js create mode 100644 app/Resources/static/themes/_global/js/restoreScroll.js create mode 100755 app/Resources/static/themes/baggy/css/font.css create mode 100755 app/Resources/static/themes/baggy/css/main.css create mode 100755 app/Resources/static/themes/baggy/css/messages.css create mode 100755 app/Resources/static/themes/baggy/css/print.css create mode 100644 app/Resources/static/themes/baggy/css/ratatouille.css create mode 100644 app/Resources/static/themes/baggy/font/icomoon.eot create mode 100644 app/Resources/static/themes/baggy/font/icomoon.svg create mode 100644 app/Resources/static/themes/baggy/font/icomoon.ttf create mode 100644 app/Resources/static/themes/baggy/font/icomoon.woff create mode 100755 app/Resources/static/themes/baggy/img/blank.png create mode 100644 app/Resources/static/themes/baggy/img/down.png create mode 100755 app/Resources/static/themes/baggy/img/list.png create mode 100755 app/Resources/static/themes/baggy/img/table.png create mode 100644 app/Resources/static/themes/baggy/img/top.png create mode 100644 app/Resources/static/themes/baggy/js/autoClose.js create mode 100755 app/Resources/static/themes/baggy/js/autoCompleteTags.js create mode 100644 app/Resources/static/themes/baggy/js/closeMessage.js create mode 100755 app/Resources/static/themes/baggy/js/init.js create mode 100644 app/Resources/static/themes/baggy/js/popupForm.js create mode 100755 app/Resources/static/themes/baggy/js/saveLink.js create mode 100755 app/Resources/static/themes/material/css/main.css create mode 100755 app/Resources/static/themes/material/css/print.css create mode 100755 app/Resources/static/themes/material/js/init.js (limited to 'app/Resources') diff --git a/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-114.png b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-114.png new file mode 100755 index 00000000..0e96edd5 Binary files /dev/null and b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-114.png differ diff --git a/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-120.png b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-120.png new file mode 100755 index 00000000..dc5aab1c Binary files /dev/null and b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-120.png differ diff --git a/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-144.png b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-144.png new file mode 100755 index 00000000..1d005db6 Binary files /dev/null and b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-144.png differ diff --git a/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-152.png b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-152.png new file mode 100755 index 00000000..f915231f Binary files /dev/null and b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-152.png differ diff --git a/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-57.png b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-57.png new file mode 100755 index 00000000..5aa19ed9 Binary files /dev/null and b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-57.png differ diff --git a/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-72.png b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-72.png new file mode 100755 index 00000000..b8b48e1b Binary files /dev/null and b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-72.png differ diff --git a/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-76.png b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-76.png new file mode 100755 index 00000000..9f9dba27 Binary files /dev/null and b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon-76.png differ diff --git a/app/Resources/static/themes/_global/img/appicon/apple-touch-icon.png b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon.png new file mode 100755 index 00000000..9cf29e2b Binary files /dev/null and b/app/Resources/static/themes/_global/img/appicon/apple-touch-icon.png differ diff --git a/app/Resources/static/themes/_global/img/appicon/favicon.ico b/app/Resources/static/themes/_global/img/appicon/favicon.ico new file mode 100755 index 00000000..0346558b Binary files /dev/null and b/app/Resources/static/themes/_global/img/appicon/favicon.ico differ diff --git a/app/Resources/static/themes/_global/img/bg-select.png b/app/Resources/static/themes/_global/img/bg-select.png new file mode 100644 index 00000000..95120441 Binary files /dev/null and b/app/Resources/static/themes/_global/img/bg-select.png differ diff --git a/app/Resources/static/themes/_global/img/icons/carrot-icon--black.png b/app/Resources/static/themes/_global/img/icons/carrot-icon--black.png new file mode 100644 index 00000000..6da7925b Binary files /dev/null and b/app/Resources/static/themes/_global/img/icons/carrot-icon--black.png differ diff --git a/app/Resources/static/themes/_global/img/icons/carrot-icon--white.png b/app/Resources/static/themes/_global/img/icons/carrot-icon--white.png new file mode 100644 index 00000000..a70044b6 Binary files /dev/null and b/app/Resources/static/themes/_global/img/icons/carrot-icon--white.png differ diff --git a/app/Resources/static/themes/_global/img/icons/diaspora-icon--black.png b/app/Resources/static/themes/_global/img/icons/diaspora-icon--black.png new file mode 100644 index 00000000..32bca194 Binary files /dev/null and b/app/Resources/static/themes/_global/img/icons/diaspora-icon--black.png differ diff --git a/app/Resources/static/themes/_global/img/icons/diaspora-icon--white.png b/app/Resources/static/themes/_global/img/icons/diaspora-icon--white.png new file mode 100644 index 00000000..fc48d47c Binary files /dev/null and b/app/Resources/static/themes/_global/img/icons/diaspora-icon--white.png differ diff --git a/app/Resources/static/themes/_global/img/logo-other_themes.png b/app/Resources/static/themes/_global/img/logo-other_themes.png new file mode 100755 index 00000000..c90aa46f Binary files /dev/null and b/app/Resources/static/themes/_global/img/logo-other_themes.png differ diff --git a/app/Resources/static/themes/_global/img/logo-square.png b/app/Resources/static/themes/_global/img/logo-square.png new file mode 100644 index 00000000..d5e05977 Binary files /dev/null and b/app/Resources/static/themes/_global/img/logo-square.png differ diff --git a/app/Resources/static/themes/_global/img/logo-w.png b/app/Resources/static/themes/_global/img/logo-w.png new file mode 100755 index 00000000..65dc607b Binary files /dev/null and b/app/Resources/static/themes/_global/img/logo-w.png differ diff --git a/app/Resources/static/themes/_global/img/logo-wallabag.svg b/app/Resources/static/themes/_global/img/logo-wallabag.svg new file mode 100644 index 00000000..40193e1c --- /dev/null +++ b/app/Resources/static/themes/_global/img/logo-wallabag.svg @@ -0,0 +1,300 @@ + + + +]> + + + + + + diff --git a/app/Resources/static/themes/_global/js/bookmarklet.js b/app/Resources/static/themes/_global/js/bookmarklet.js new file mode 100644 index 00000000..2afdfc3c --- /dev/null +++ b/app/Resources/static/themes/_global/js/bookmarklet.js @@ -0,0 +1,2 @@ + +top["bookmarklet-url@wallabag.org"]=""+""+""+""+"bag it!"+''+""+""+"