aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
Commit message (Collapse)AuthorAgeFilesLines
* Add some deletion confirmation to avoid mistakeJeremy Benoist2017-05-241-3/+6
|
* Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-191-1/+1
|\
| * modify key name as wellCedric Girard2017-05-181-1/+1
| |
* | Fix review againThomas Citharel2017-05-071-36/+38
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Fix reviewsAline2017-05-071-2/+1
| | | | | | | | Signed-off-by: Aline <chetta.aline@gmail.com>
* | Fix according to reviewThomas Citharel2017-05-041-1/+1
| |
* | Adds Webpack support and removes the use for GruntThomas Citharel2017-05-041-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> use scss Signed-off-by: Thomas Citharel <tcit@tcit.fr> fix build, add babel, fix annotations fixes (and improvements !) for baggy add live reload & environments & eslint & theme fixes
* | Fixed sandwich menu position in entry view (material theme)Nicolas Lœuillet2017-05-021-5/+5
| |
* | Added author of articleNicolas Lœuillet2017-04-091-1/+9
| |
* | Added publication dateNicolas Lœuillet2017-04-051-2/+8
| |
* | Scuttle sharingFrenchHope2017-03-281-0/+8
|/
* views: cosmetic in share links hrefKevin Decherf2017-02-161-2/+2
| | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Fix rendering of entry title in Twig viewsKevin Decherf2017-02-021-10/+10
| | | | | | | | | | | | | | | | This commit provides some improvements on the rendering of entry title on entries list and entry views and refactors filter calls: - Remove escape filter from apparent title, striptags is enough - Move raw filter to the end of apparent title as it's ignored if not placed as the last filter - Replace raw filter with e('html_attr') for title used in attributes, fixing possible issue and/or glitch - Add striptags to entry.title used for link sharing to respect the apparent title Fixes #2802 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2017-01-261-2/+2
|\
| * Fixed possible JS injection via the title editionNicolas Lœuillet2017-01-171-2/+2
| |
* | Merge pull request #2725 from lapineige/masterNicolas Lœuillet2016-12-301-1/+1
|\ \ | | | | | | Share to Shaarli - Include tags
| * | Share tags to Shaarli - Material themelapineige2016-12-281-1/+1
| |/
* | Fix entry reading timeSimounet2016-12-271-7/+1
| |
* | Added floating button on entry view for mobileNicolas Lœuillet2016-11-301-0/+11
| |
* | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-191-21/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .editorconfig # docs/de/index.rst # docs/de/user/import.rst # docs/en/index.rst # docs/en/user/configuration.rst # docs/en/user/import.rst # docs/fr/index.rst # docs/fr/user/import.rst # src/Wallabag/CoreBundle/Command/InstallCommand.php # src/Wallabag/CoreBundle/Resources/translations/messages.da.yml # src/Wallabag/CoreBundle/Resources/translations/messages.de.yml # src/Wallabag/CoreBundle/Resources/translations/messages.en.yml # src/Wallabag/CoreBundle/Resources/translations/messages.es.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml # src/Wallabag/CoreBundle/Resources/translations/messages.it.yml # src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml # src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml # src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml # src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig # web/bundles/wallabagcore/themes/baggy/css/style.min.css # web/bundles/wallabagcore/themes/baggy/js/baggy.min.js # web/bundles/wallabagcore/themes/material/css/style.min.css # web/bundles/wallabagcore/themes/material/js/material.min.js
| * WIPThomas Citharel2016-10-221-21/+32
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Added CSS class on linksNicolas Lœuillet2016-11-161-4/+4
| |
* | Added unmark.it sharingNicolas Lœuillet2016-11-091-0/+8
| | | | | | | | Fix #668
* | Added new tag form in mobile view for Material themeNicolas Lœuillet2016-11-081-11/+3
|/ | | | Fix #2376
* Fix few invalid HTML tagsKrzysztof Szafranek2016-10-091-1/+1
|
* better tags on materialThomas Citharel2016-10-051-2/+3
|
* Fix icon positionThomas Citharel2016-10-041-3/+6
|
* Fixed icon position in share menuNicolas Lœuillet2016-10-041-7/+6
|
* fix iconsThomas Citharel2016-10-041-8/+6
|
* Basically, fix everythingThomas Citharel2016-10-031-11/+13
| | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed
* Fixed label for mark as read link in entry viewNicolas Lœuillet2016-09-151-2/+7
| | | | Fix #2286
* Fix print / article viewsNicolas Lœuillet2016-08-261-4/+5
|
* Add icon for public share linkNicolas Lœuillet2016-08-251-1/+1
|
* Change share entry behaviorNicolas Lœuillet2016-08-231-1/+6
|
* Add translationsNicolas Lœuillet2016-08-231-2/+2
|
* Add migrationNicolas Lœuillet2016-08-231-1/+1
|
* Share entry with a public URLNicolas Lœuillet2016-08-231-1/+7
|
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-221-5/+14
|\
| * Merge pull request #2222 from wallabag/add-date-on-article-viewNicolas Lœuillet2016-08-221-0/+9
| |\ | | | | | | Added creation date and reading time on article view
| | * Display text on baggyJeremy Benoist2016-08-211-1/+1
| | | | | | | | | | | | Instead of using icons (which aren't available) display real text for reading time & creation date
| | * Changed code indentationNicolas Lœuillet2016-08-181-3/+7
| | |
| | * Added creation date and reading time on article viewNicolas Lœuillet2016-08-181-0/+5
| | | | | | | | | | | | Fix #2034
| * | Replaced favorite word/icon with star oneNicolas Lœuillet2016-08-181-5/+5
| |/ | | | | | | Fix #2041
* | fix typo on iconsThomas Citharel2016-06-231-2/+2
| |
* | manage assets through npmThomas Citharel2016-06-091-41/+33
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fix internal settingsNicolas Lœuillet2016-04-091-0/+11
| | | | Fix #1867: remove download_picture setting and manage show_printlink in material theme
* Move tag form in Material themeNicolas Lœuillet2016-04-071-4/+4
|
* fix type diaspora* shareNicolas2016-03-211-1/+1
|
* Convert english translation fileJeremy Benoist2016-03-201-31/+26
| | | | | | | - convert english translation to translate key - remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material) - fix tests about text in response (now checking translation key instead of translated text) - remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
* Rename CommentBundle with AnnotationBundleNicolas Lœuillet2016-02-261-4/+4
|