Commit graph

516 commits

Author SHA1 Message Date
Thomas Citharel 4c6ee89c9c Fix review again
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-07 17:13:08 +02:00
Aline 34806fab1b Fix reviews
Signed-off-by: Aline <chetta.aline@gmail.com>
2017-05-07 15:07:50 +02:00
Thomas Citharel 2003ffa97e Fix according to review 2017-05-04 17:44:42 +02:00
Thomas Citharel 17cc3aacb7 fix theme changes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:49:44 +02:00
Thomas Citharel 64f81bc316 Adds Webpack support and removes the use for Grunt
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
2017-05-04 14:49:44 +02:00
Nicolas Lœuillet 9c09c253fe Merge pull request #3047 from wallabag/add-notmatches-operator
Added notmatches operator for tagging rule
2017-05-03 11:53:01 +02:00
Nicolas Lœuillet 96e4398072
Fixed sandwich menu position in entry view (material theme) 2017-05-02 15:40:15 +02:00
Nicolas Lœuillet fdd725f58c Added notmatches operator for tagging rule 2017-04-20 15:17:02 +02:00
Nicolas Lœuillet 64f1d8f77a Merge pull request #3024 from wallabag/store-date
Added publication date and author
2017-04-18 13:12:28 +02:00
Nicolas Lœuillet 01736b5a2e Removed is_public in Entry edit form 2017-04-13 15:54:19 +02:00
Nicolas Lœuillet 7b0b3622ab Added author of article 2017-04-09 15:24:51 +02:00
Nicolas Lœuillet 5e9009ce86 Added publication date 2017-04-05 22:22:52 +02:00
Nicolas Lœuillet 9102851f59
Added delete button on Baggy theme 2017-03-31 10:53:23 +02:00
Thomas Citharel 6da1aebc94 Allow to remove all archived entries
Since we still support fucking SQLite, we need to retrieve all tags & annotations for archived entries before deleting them.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-03-31 10:46:05 +02:00
FrenchHope fb9f100e8f
Scuttle sharing 2017-03-28 14:20:14 +02:00
Christoph Doblander cee28dc6d4 remove language on html-tag 2017-03-06 21:34:50 +01:00
Nicolas Lœuillet 2edc539581 Merge pull request #2830 from Kdecherf/striptags-title
Fix rendering of entry title in Twig views
2017-02-17 09:28:56 +01:00
Kevin Decherf aedd385e10 views: cosmetic in share links href
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-16 21:36:34 +01:00
Kevin Decherf 7d9a67de14 Show active list in the left menu during search
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-05 15:19:52 +01:00
Kevin Decherf 1bb7bdc8b3 Fix rendering of entry title in Twig views
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>
2017-02-02 21:54:15 +01:00
Jeremy Benoist 78295b99dd
Merge remote-tracking branch 'origin/master' into 2.2 2017-01-26 13:32:07 +01:00
Nicolas Lœuillet 3d9950792c
Fixed possible JS injection via the title edition 2017-01-17 10:09:04 +01:00
Simounet ccb9e79a35 Fix double overlay on expanded right sidenav 2016-12-30 14:00:19 +01:00
Nicolas Lœuillet 339b1e689d Merge pull request #2725 from lapineige/master
Share to Shaarli - Include tags
2016-12-30 13:50:44 +01:00
Simounet 22d0c929e3 Access to search, filters, export on mobile 2016-12-29 19:19:51 +01:00
lapineige d5d4708fe3 Share tags to Shaarli - Material theme 2016-12-28 12:27:09 +01:00
lapineige 0a0aa70098 Share tags to Shaarli - Baggy theme 2016-12-28 12:27:00 +01:00
Simounet 6ed615ac74 Fix entry reading time 2016-12-27 22:37:42 +01:00
Nicolas Lœuillet be2c55de4c
Moved total messages from import 2016-12-08 16:46:17 +01:00
Nicolas Lœuillet 8d064ba5a4
Updated addons links 2016-12-01 13:48:34 +01:00
Nicolas Lœuillet 6787afbe0d
Added floating button on entry view for mobile 2016-11-30 16:08:02 +01:00
Nicolas Lœuillet 9aa991281d
Renamed view_mode by list_mode and hide excerpt 2016-11-28 16:10:21 +01:00
Nicolas Lœuillet 56a7ce17f3 Hide article text on mobile with list mode 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet 9f01d0fde0 Added list view 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet 0df2a4b021
Fixed entry shortcuts available in list view 2016-11-22 21:31:21 +01:00
Nicolas Lœuillet c526f9e474 Added help about shortcuts 2016-11-22 13:07:42 +01:00
Jeremy Benoist 1f00547836 Merge pull request #2630 from ThibaudDauce/fix-black-headings
Add white-text class to card-title too
2016-11-21 17:06:55 +01:00
Thibaud Dauce 4f2755a61d Add white-text class to card-title too 2016-11-21 15:37:47 +01:00
Jeremy Benoist 8670250a26
Add RSS pagination
Following https://tools.ietf.org/html/rfc5005#page-4
2016-11-20 09:39:26 +01:00
Nicolas Lœuillet 32f455c131 Added tests 2016-11-19 20:05:16 +01:00
Nicolas Lœuillet 49b042dfdf Added translations and currentRoute parameter 2016-11-19 19:17:30 +01:00
Nicolas Lœuillet 398de40517 Added search engine in baggy theme 2016-11-19 19:17:30 +01:00
Nicolas Lœuillet ee122a7528 Added a simple search engine
Fix #18
2016-11-19 19:17:30 +01:00
Jeremy Benoist 68003139e1
Merge remote-tracking branch 'origin/master' into 2.2
# 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
2016-11-19 15:30:49 +01:00
Nicolas Lœuillet 10b3509757
Added http_status in Entry entity 2016-11-18 15:09:21 +01:00
Nicolas Lœuillet c894d76e57 Added tooltips for baggy theme 2016-11-17 09:22:39 +01:00
Nicolas Lœuillet 540a9bc4a2 Added help on config screen 2016-11-17 09:22:39 +01:00
Nicolas Lœuillet a42f38d9fb
Added a configuration to define the redirection after archiving an entry
Fix #496
2016-11-16 23:07:34 +01:00
Nicolas Lœuillet 94f2057ffe
Added CSS class on links 2016-11-16 09:17:12 +01:00
Nicolas Lœuillet 3cc78f0679 Added shortcuts 2016-11-15 21:54:20 +01:00
Nicolas Lœuillet a8c6f29f3e
Hide creation date in mobile view 2016-11-14 14:28:42 +01:00
Nicolas Lœuillet 80302e5aaa Changed display for material theme 2016-11-14 13:58:41 +01:00
Nicolas Lœuillet 1c282b1da0 Added creation date on entries view 2016-11-14 13:57:31 +01:00
Jeremy Benoist d3511bbde9 Merge pull request #2577 from wallabag/add-tooltip-material
Added tooltips in header bar
2016-11-14 10:08:26 +01:00
Nicolas Lœuillet cf9ee2fbd0
Added tooltips in header bar 2016-11-12 11:57:55 +01:00
Nicolas Lœuillet 8a9604aafe Added unmark.it sharing
Fix #668
2016-11-09 18:18:49 +01:00
Jeremy Benoist 8d7b4f0eff
Display a bigger image in case of image content
If the content is only an image, we can display a bigger preview image because we won’t have text to display.

Also, split different card view to avoid too much complexity in the entries.html.twig
2016-11-08 22:17:46 +01:00
Yuriy Evdokimov d99a7c2206 fix #2559 2016-11-08 22:14:32 +05:00
Nicolas Lœuillet df30af69d2 Added new tag form in mobile view for Material theme
Fix #2376
2016-11-08 14:24:00 +01:00
Jeremy Benoist d61b24e459
Round readingtime to avoid crazy number
Like `8.666666666667 min`
2016-11-06 21:41:32 +01:00
Nicolas Lœuillet 2db9142bfc Merge pull request #2460 from wallabag/ui-changes
UI Changes
2016-11-04 08:49:52 +01:00
Jeremy Benoist 5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
Thomas Citharel d56d416d9b
Deal with more resolution issues
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 12:49:57 +01:00
Thomas Citharel 3221b2e413
Fix resolution issues and 'title' issues
Also, modify editorconfig for css files.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 11:28:40 +01:00
Nicolas Lœuillet 68e0efffb8
Fixed review 2016-10-31 17:20:27 +01:00
Nicolas Lœuillet 3b81212674
Added translations and baggy part 2016-10-31 16:48:34 +01:00
Nicolas Lœuillet e61ee56031 Added QRCode and link to configure android application 2016-10-31 16:18:52 +01:00
Nicolas Lœuillet 920d88599a Fixed entries export filtered with a tag
Fix #2505
2016-10-29 13:43:11 +02:00
Nicolas Lœuillet 73e8df9e44
Renamed variable for page title 2016-10-26 15:49:44 +02:00
Nicolas Lœuillet 7a5043f187
Added tag label in the page title
Fix #2472
2016-10-26 13:53:23 +02:00
Jeremy Benoist 64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist ca8b49f46e
Add baggy reset part 2016-10-22 13:13:07 +02:00
Jeremy Benoist 206bade58a
Add ability to reset some datas
- annotations
- tags
- entries
2016-10-22 13:13:06 +02:00
Jeremy Benoist 817724a7b8
Re-add bottom pagination
Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
2016-10-22 13:09:16 +02:00
Thomas Citharel 34aa06a9b9
WIP
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-22 13:08:04 +02:00
Jeremy Benoist b64d8f2c9f
Update Twitter cards description 2016-10-21 10:51:20 +02:00
Jeremy Benoist 692f9388cb Merge pull request #2455 from wallabag/fix-material-config-tabs
Fix tabs on material
2016-10-16 21:06:23 +02:00
Jeremy Benoist 3fb409ffc6 Merge pull request #2454 from wallabag/fix-baggy-small-width
Fix baggy display on small screens
2016-10-16 21:05:30 +02:00
Sven Fischer f69ab83a5a add link to German documentation in about page 2016-10-16 09:23:58 +02:00
Thomas Citharel d9a30ef301 Fix tabs on material
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-15 19:26:38 +02:00
Thomas Citharel d32e1c424a Fix baggy on small screens 2016-10-15 19:04:53 +02:00
Jeremy Benoist e4cf672ccf
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-11 21:01:30 +02:00
Nicolas Lœuillet a2f42d8eaa
Fixed Twitter Cards by adding a description tag 2016-10-10 16:05:06 +02:00
Nicolas Lœuillet 020c723e28 Added support of Twitter Cards for public articles 2016-10-10 14:33:34 +02:00
Jeremy Benoist 8eeefc658c Merge pull request #2414 from szafranek/bugfix-bookmarklet
Remove automatic closing of the window from bookmarklet
2016-10-10 07:11:01 +02:00
Krzysztof Szafranek d8a9209cfc Remove automatic closing of the window from bookmarklet 2016-10-09 22:40:55 +02:00
Jeremy Benoist 28bb48905a
Optimize the way tag list is rendered
Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query.

Also change the layout of the tag list in material design
2016-10-09 18:55:22 +02:00
Jeremy Benoist e39aec3e38 Merge pull request #2406 from szafranek/bugfix-number-of-annotations
Show number of annotations instead of nbAnnotations placeholder
2016-10-09 14:11:20 +02:00
Krzysztof Szafranek 90c766b96b Show number of annotations instead of nbAnnotations placeholder
When there was more than one annotation, a placeholder was displayed in both themes, instead of actual number.
2016-10-09 04:59:04 +02:00
Krzysztof Szafranek c5e4293efd Fix few invalid HTML tags 2016-10-09 03:37:21 +02:00
Jeremy Benoist 876d77a67d
Better display and description
Confirmation message isn’t required since it is written in the delete description
2016-10-08 20:25:42 +02:00
Jeremy Benoist eed812afd0
Logout user before deleting it
And add a smal description
2016-10-08 19:39:12 +02:00
Nicolas Lœuillet 71254701b7
Changed tests 2016-10-08 13:27:18 +02:00
Nicolas Lœuillet bb0c78f4a6
Added check if there is only one user
Added translations and documentation
2016-10-08 13:27:18 +02:00
Thomas Citharel e4b46f77ef
work 2016-10-08 13:27:17 +02:00
Nicolas Lœuillet d5c45d5288
Added default picture if preview picture is null 2016-10-07 15:21:31 +02:00
Nicolas Lœuillet d0d196ffb3
Fixed review 2016-10-07 09:22:40 +02:00
Nicolas Lœuillet f0d52417fb
Added OpenGraph support for public articles
Fix #2289
2016-10-07 09:05:18 +02:00
Thomas Citharel 15f1352ef8
better tags on material 2016-10-05 14:06:55 +02:00
Thomas Citharel 645c0d5bce
better tags on baggy 2016-10-04 20:11:10 +02:00