mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-07-03 20:46:04 +00:00
Code Issues Projects Releases Wiki Activity
9176 commits 14 branches 99 tags 149 MiB
Commit graph

741 commits

Author SHA1 Message Date
Jeremy Benoist 6b1b148d65 Add share.scss file 
Still needs to include it in the twig template
 2017-06-22 12:13:22 +02:00
Jeremy Benoist 77c5140bed Better export page 
I’ve increase the width of the page 900px, 600px looks too small for me. Should we use something like 90% instead?
 2017-06-22 12:13:22 +02:00
Thomas Citharel e2a038d653
Fix translations on QR code instructions 2017-06-22 09:12:57 +02:00
Thomas Citharel bd40f1af88
Add all entries RSS feed and put links on tag page itself and baggy too 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-21 12:02:04 +02:00
Thomas Citharel 8c59809432
add rss icon 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-21 11:44:36 +02:00
Jeremy Benoist 18c38dffc6
Add RSS tags feeds 2017-06-21 11:44:35 +02:00
Jérémy Benoist 80784b782b Merge pull request #2683 from wallabag/credentials-in-db 
Store credentials in DB
 2017-06-20 16:40:48 +02:00
Jeremy Benoist f44dba22fc
Get rid of masked value in listing 2017-06-20 16:03:39 +02:00
Thomas Citharel bead8b42da
Fix reviews 
Encrypt username too
Redirect to list after saving credentials
Fix typos

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-20 16:03:39 +02:00
Jeremy Benoist b8427f22f0
Add menu access to site credentials CRUD 2017-06-20 16:03:14 +02:00
Jeremy Benoist fc6d92c63d
Update route & user verification 2017-06-20 16:03:13 +02:00
Jeremy Benoist f92fcb53ca
Add CRUD for site credentials 2017-06-20 16:03:08 +02:00
Jeremy Benoist e8911f7c09
Add isPublic filter on entries 2017-06-10 15:00:52 +02:00
Jeremy Benoist a9b984feee
Fix tags count in tags list on baggy 2017-06-10 11:21:47 +02:00
Jeremy Benoist 0c00e52516
Create a client when creating a user using the api 
While creating a new user using the API, we also create a new client for the current user.
So the app which just create the user can use its newly created client to configure the app.

That new client is only return after creating the user.
When calling the endpoint /api/user to get user information, the new client information won’t be return.
 2017-06-07 23:23:28 +02:00
Thomas Citharel 91775f36fe Add some flex magic 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-31 14:34:46 +02:00
Nicolas Lœuillet 812c980fa5 Fixed tags display on grid view 2017-05-31 13:26:29 +02:00
Nicolas Lœuillet 21242a02a1 Added tags on list view 2017-05-30 09:51:49 +02:00
Jeremy Benoist fa0f5ee12b
Add some deletion confirmation to avoid mistake 2017-05-24 21:33:37 +02:00
Jeremy Benoist 4ab0d25f65
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-19 11:25:19 +02:00
Cedric Girard 5f82fc23a7 modify key name as well 2017-05-18 17:17:21 +02:00
Nicolas Lœuillet 6b94ee51b8 Fixed documentation URL 2017-05-17 09:03:04 +02:00
Cedric Girard 8544c7e4b6 reorder contrib strings in about page 
this fixes #2891
 2017-05-16 14:17:13 +02:00
Jeremy Benoist 54c2d164a3
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-09 13:55:31 +02:00
Jérémy Benoist 9d7d549712 Update graby* licenses 2017-05-09 09:22:50 +02:00
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
Thomas Citharel f733d8aaa3
Fix icon position 2016-10-04 15:12:48 +02:00
Nicolas Lœuillet 3e85e91159
Fixed calendar icon position with baggy theme 2016-10-04 15:00:47 +02:00
Nicolas Lœuillet 0c7f1ba796
Fixed icon position in share menu 2016-10-04 14:58:06 +02:00
Thomas Citharel 46d78f87d9
fix icons 2016-10-04 14:48:22 +02:00
Thomas Citharel a494c33ef7
Basically, fix everything 
* Remove install.sh
* Assets are now provided
* Icons font issues are fixed
 2016-10-03 23:08:26 +02:00
Nicolas Lœuillet 0f70abd695
Fixed CSS for quickstart links 2016-10-03 10:27:01 +02:00
Nicolas Lœuillet ab809de184 Merge pull request #2314 from wallabag/assets 
Assets work
 2016-10-03 09:09:45 +02:00
Jeremy Benoist 03141f9b95
Cleanup & add link on baggy menu 2016-10-02 11:08:53 +02:00
Jeremy Benoist 152fcccd44
Add users management UI 
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
 2016-10-02 11:08:53 +02:00
Jeremy Benoist 52c1fc7449 Merge pull request #2326 from wallabag/update-quickstart 
Changed quickstart layout
 2016-10-02 11:06:03 +02:00
Jeremy Benoist 6e5e27ab07 Merge pull request #2324 from wallabag/edit-tagging-rule 
Add ability to edit a tagging rule
 2016-10-02 11:05:10 +02:00
Jeremy Benoist bfb3ae01da Merge pull request #2323 from wallabag/footer-stats 
Add simple stats in footer
 2016-10-02 11:04:49 +02:00
Nicolas Lœuillet a44d2613c7 Changed quickstart layout 2016-10-01 17:13:53 +02:00
Jeremy Benoist bf3dc999e7
Add ability to edit a tagging rule 2016-10-01 16:52:05 +02:00
Jeremy Benoist 1264029cd4
Add simple stats in footer 2016-10-01 16:03:50 +02:00
Jeremy Benoist 40e219622a
Customize errors templates 
All error goes to the same template which only display the error message and the status code.
 2016-10-01 14:58:48 +02:00
Nicolas Lœuillet 2ff9991a1d
Removed duplicated templates files 2016-09-30 09:38:08 +02:00
Thomas Citharel c146f6940a
Assets work 
* ES6 all the things !

* ESLint checks everything

* CSS fixes (use stylelint)

* Fix #2231
 2016-09-28 10:30:18 +02:00
Jeremy Benoist 637aa17e6b Merge pull request #2301 from wallabag/fix-rss-feeds 
fix feeds not syncing on android app
 2016-09-22 07:51:05 +02:00
Thomas Citharel 389d55f86b
fix feeds not syncing on android app 2016-09-21 19:51:19 +02:00
Jeremy Benoist da18a4682f Merge pull request #1941 from wallabag/v2-asynchronous-jobs 
Use asynchronous jobs for imports
 2016-09-19 07:15:40 +02:00
Jeremy Benoist ebe0787e09
Moved Pocket token to user config 2016-09-16 22:22:25 +02:00
Nicolas Lœuillet 458beef0a9 Fixed label for mark as read link in entry view 
Fix #2286
 2016-09-15 15:32:01 +02:00
Nicolas Lœuillet e77cde4531 Remove FooterController 2016-09-15 11:11:24 +02:00
Jeremy Benoist e01a3c98d6
Display how many messages are queue 
- update the docker-composer to add Redis
- add migrations
 2016-09-13 20:32:52 +02:00
Nicolas Lœuillet d49c88f15a Remove footer part 2016-09-13 20:31:06 +02:00
Nicolas Lœuillet 429d86f388
Added tags counter in sidebar (material theme) 2016-09-04 20:53:28 +02:00
Jeremy Benoist 59ddb9ae99
Remove Twig globals 
Twig Global function are called globally. This means even on a query to the api.

Using a function we can decide when we want to call it.

Also, remove previous `COUNT(e.id)` since it doesn't work on PostgreSQL ...
 2016-09-03 19:09:28 +02:00
Jeremy Benoist 8f8654913c Merge pull request #2002 from wallabag/feature-display-itemsNumber 
Feature display items number
 2016-09-03 16:13:08 +02:00
Nicolas Lœuillet b1e0a586e8
Fixed different font-size for labels in config screen 
Fix #1788
 2016-09-02 10:53:22 +02:00
Nicolas Lœuillet 336262e6ee Merge pull request #2252 from wallabag/fix-last-merge 
Fixed last merge who caused CSS/JS bugs
 2016-09-02 10:27:41 +02:00
Jeremy Benoist 33adf8dc91 Merge pull request #2242 from wallabag/fix-minor-css 
Fix print / article views
 2016-09-01 22:23:45 +02:00
Jeremy Benoist 209ec7cedd
Add Readability to Quickstart page 2016-09-01 13:39:55 +02:00
Nicolas Lœuillet a374ac0fd3
Fixed last merge who caused CSS/JS bugs 2016-08-30 13:52:28 +02:00
Jeremy Benoist cdd3010b47
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-28 16:15:27 +02:00
Nicolas Lœuillet b6520f0b15
Add untagged entries 
Fix #1631
 2016-08-28 14:44:00 +02:00
Nicolas Lœuillet 74d68fbf25
Changed where page title is displayed 2016-08-26 21:26:21 +02:00
Nicolas Lœuillet add0e14cff
Fixed print view for baggy theme 2016-08-26 21:20:02 +02:00
Nicolas Lœuillet 52ef497099 Fix print / article views 2016-08-26 14:35:43 +02:00
Nicolas Lœuillet 8e06720ff3
Add icon for public share link 2016-08-25 16:19:21 +02:00
Nicolas Lœuillet 0a512eaf57
Remove text about original URL in public view 2016-08-25 15:32:38 +02:00
Alexandr Danilov 538587855a A new version of the plugin tinydot with update on window resize 2016-08-25 16:22:47 +03:00
Nicolas Lœuillet 9415bc992e
Add original link in public view of the article 2016-08-25 14:39:33 +02:00
Nicolas Lœuillet 2f9927404d Merge pull request #2230 from modos189/issue_2055 
Cut entries title in card view: continued
 2016-08-23 17:24:46 +02:00
Nicolas Lœuillet 3e860ff1ce
Change links on baggy theme 2016-08-23 16:55:49 +02:00
Nicolas Lœuillet f1be7af446 Change share entry behavior 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet 3377c938f8 Add translations 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet 222e09f140 Add Cache on Share Action 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet d0545b6bd6 Add migration 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet f3d0cb9106 Share entry with a public URL 2016-08-23 16:49:21 +02:00
Alexandr Danilov 28388e15c3 Replacement plugin dotdotdot (6.7 KB) on my tinydot (315 bytes) 2016-08-23 12:58:35 +03:00
Nicolas Lœuillet 8315130a75
Display entries number for each category 2016-08-23 07:47:55 +02:00
Jeremy Benoist 97e7ad4dc7
Remove duplicate pager on baggy 2016-08-23 07:36:43 +02:00
Nicolas Lœuillet 371bcca0f6
Translations and baggy view for tags 2016-08-23 07:26:18 +02:00
Nicolas Lœuillet 891456ba9a
Links on each tag in Tags view 2016-08-23 07:24:42 +02:00
Jeremy Benoist 79efca1e6f
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
Alexandr Danilov 474b086656 Simplify the initialization of the plugin dotdotdot 2016-08-22 23:59:20 +03:00
Alexandr Danilov e32aea53ab Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that allows you to clip a text on the second line and fixed cut entries title in card view 2016-08-22 23:34:44 +03:00
Thomas Citharel 9c545fe028
Added name on client 
- Fix typos in field name
- Added migration for name field in API client table

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2171
 2016-08-22 20:18:27 +02:00
Nicolas Lœuillet c649d43381 Merge pull request #2222 from wallabag/add-date-on-article-view 
Added creation date and reading time on article view
 2016-08-22 09:40:21 +02:00
Jeremy Benoist d35ba2c3d6
Display text on baggy 
Instead of using icons (which aren't available) display real text for reading time & creation date
 2016-08-21 22:22:34 +02:00
Nicolas Lœuillet e7732deb1f Changed code indentation 2016-08-18 15:37:44 +02:00
Nicolas Lœuillet eecd7e406d
Fixed some translations 2016-08-18 15:30:28 +02:00
Nicolas Lœuillet 4e1be104ab
Added creation date and reading time on article view 
Fix #2034
 2016-08-18 15:23:19 +02:00
Nicolas Lœuillet 519ba0b5e7 Replaced favorite word/icon with star one 
Fix #2041
 2016-08-18 14:27:17 +02:00
Nicolas Lœuillet e49c62fac8 Fix form user display for baggy theme 2016-08-17 11:41:46 +02:00
Nicolas Lœuillet 8f5e220327 Fix form user display when 2FA is disabled 2016-08-17 11:41:46 +02:00
Simounet 39f27d6370 Handling socials links into a config file 2016-07-20 19:36:01 +02:00
Jeremy Benoist 0faeabefa7 Merge remote-tracking branch 'origin/master' into 2.1 2016-07-20 12:02:02 +02:00
Thomas Citharel 8d4152f70d
Remove fr part 2016-07-02 11:56:14 +02:00
Thomas Citharel baef8ea26c
Fix 3rd-Party Apps links (Chrome & Firefox) 2016-07-02 11:50:32 +02:00
Thomas Citharel 1d4d9aaf29
Bring tags on entries view to baggy 
Also, a couple of UI improvement and CSS fixing
 2016-07-01 13:59:30 +02:00
Thomas Citharel a15022db96 minor ui fixes 2016-06-23 23:13:25 +02:00
Thomas Citharel 91826e3ca2 fix typo on icons 2016-06-23 22:51:09 +02:00
Thomas Citharel 25dc07d3c9 Add tags on entries view 
Should be tested on old browsers
 2016-06-23 22:50:39 +02:00
Thomas Citharel 2e24d12027 remove block added twice 2016-06-09 19:07:41 +02:00
Thomas Citharel 5ecdfcd041 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
 2016-06-09 17:12:51 +02:00
Jeremy Benoist 839475776b Merge pull request #2052 from danbartram/feature-filter-unread 
Add unread filter to entries pages
 2016-05-27 09:57:51 +02:00
Baptiste Mille-Mathias 4b2774f8db Don't cut entries title in card view 
Stop cutting titles arbitrary at caracter 42.
 2016-05-21 10:39:49 +02:00
Nicolas Lœuillet 9b40422594
Replace vertical dots in material theme with horizontal dots 2016-05-18 14:29:41 +02:00
Merouane Atig 5f2971e1d4 Do not specify language in Firefox addon link 2016-05-13 11:58:10 +02:00
Daniel Bartram 733b2cf19b Add unread filter to entries pages 
Add the ability to filter for unread pages in the filters menu.
 2016-05-09 14:56:52 +01:00
Jeremy Benoist f54de6817e Merge pull request #2020 from wallabag/fix-number-entries-per-tag 
Fix number of entries in tag/list
 2016-05-07 11:09:37 +02:00
Nicolas Lœuillet d9926005b1 Rename getEntriesByUser method to getEntriesByUserId 2016-05-04 11:42:52 +02:00
Nicolas Lœuillet 09e5b9391e
Add pagination bar at the bottom of the page 
Fix #2021
 2016-05-03 21:44:57 +02:00
Nicolas Lœuillet 12c697562e
Fix number of entries in tag/list 
Fix #2006
 2016-05-03 21:12:40 +02:00
Nicolas Lœuillet 2a007fe43d
Fix tags listing 
Fix #1994
* Remove unused method in tag repository
 2016-05-02 21:32:47 +02:00
Nicolas Lœuillet 4a25bef077
Update links in documentation 2016-04-19 20:03:34 +02:00
Nicolas Lœuillet 188b74b6df Display pagination only if we have more than one page 2016-04-18 09:03:21 +02:00
Nicolas Lœuillet 1f034a3316
Hide pagination if we only have one entry to display 2016-04-16 07:19:30 +02:00
Nicolas Lœuillet 2d899e8d30
Change guid and link in RSS feeds to give original entry URL 
Fix #1926
 2016-04-15 16:07:34 +02:00
Jeremy Benoist a417b86923 Merge pull request #1918 from wallabag/improve-pagination 
Improve pagination when user has lot of entries
 2016-04-13 09:42:18 +02:00
Nicolas Lœuillet 18078ded12
Fix indentation 2016-04-13 09:20:01 +02:00
Nicolas Lœuillet c31ea8a409
Remove useless dependancy 2016-04-12 21:47:16 +02:00
Nicolas Lœuillet c95e39c51a
Lost in translation pager 2016-04-12 20:38:56 +02:00
Nicolas Lœuillet 624a7c6df1
Improve pagination when user has lot of entries 
Fix #1905
* Usage of whiteoctober/WhiteOctoberPagerfantaBundle
 2016-04-12 16:04:17 +02:00
Thomas Citharel 1b8b3859c0 Add title hover on entry titles 2016-04-12 14:30:42 +02:00
Jeremy Benoist 54ecbb41d6 Merge pull request #1898 from wallabag/v2-fix-readingtime-display-material 
Fix estimated reading time in material view
 2016-04-10 14:12:13 +02:00
Jeremy Benoist 19a7ea2a44 Merge pull request #1896 from wallabag/v2-fix-internal-settings 
Fix internal settings
 2016-04-10 09:49:10 +02:00
Jeremy Benoist 2504fe46ed Merge pull request #1894 from wallabag/v2-fix-doc-link 
Fix documentation link in developer page
 2016-04-10 09:44:48 +02:00
Nicolas Lœuillet 7ead8a0d9d
Fix estimated reading time in material view 
Fix #1893
 2016-04-10 08:48:53 +02:00
Nicolas Lœuillet cb48a569e0
Fix internal settings 
Fix #1867: remove download_picture setting and manage show_printlink in material theme
 2016-04-09 21:34:50 +02:00
Nicolas Lœuillet 808f541ea9
Fix documentation link in developer page 2016-04-09 20:43:22 +02:00
Nicolas Lœuillet 7a2157b8d7
Fix typo on configuration page 2016-04-09 14:04:43 +02:00
Jeremy Benoist e969c2a7ef Merge pull request #1879 from wallabag/v2-tag-field-position 
Move tag form in Material theme
 2016-04-08 13:51:20 +02:00
Jeremy Benoist 6a986910b6 Merge pull request #1868 from wallabag/v2-tagrule-baggy 
Remove keyboard shortcut and add tagging rule panel in baggy
 2016-04-07 14:10:08 +02:00
Nicolas Lœuillet c6cbe75b2e
Move tag form in Material theme 2016-04-07 13:47:35 +02:00
Nicolas Lœuillet c802181126 Documentation about wallabag API 2016-04-06 11:30:41 +02:00
Nicolas Lœuillet 8687bcd0c9 Remove keybaord shortcut and add tagging rule panel in baggy 2016-04-05 22:29:47 +02:00
Nicolas Lœuillet 4a749cad8d Round estimated time and add reading speed for Baggy 2016-04-05 15:35:01 +02:00
Thomas Citharel a119acd15d Merge pull request #1835 from wallabag/v2-prepare-v2 
🚀 Prepare v2.0.0 🎂
 2016-04-03 22:11:17 +02:00
Nicolas Lœuillet 0795d04916 Hide search buttons 2016-04-03 20:25:43 +02:00
Nicolas Lœuillet eff75729a1 🚀 Prepare v2.0.0 🎂 2016-04-03 18:56:53 +02:00
Nicolas 842a62e293 fix type diaspora* share 2016-03-21 17:03:43 +01:00
Nicolas Lœuillet 7dbed56857 Translate flash message in baggy theme 2016-03-21 15:44:23 +01:00
Jeremy Benoist f3e49264f2 Add reading time translation 2016-03-21 10:00:41 +01:00
Jeremy Benoist 3fae7f1d08 Add missing developer page 2016-03-20 21:56:42 +01:00
Jeremy Benoist 0d42217e4e Convert english translation file 
- 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>`
 2016-03-20 21:12:22 +01:00
Nicolas Lœuillet 78becd5401 Fix documentation and add help message in Baggy 2016-03-18 12:36:52 +01:00
Nicolas Lœuillet 6432b9277e Replace slider with select 2016-03-14 13:49:47 +01:00
Nicolas Lœuillet db1d4b1e19 Fix default value and add baggy implementation 2016-03-14 13:01:31 +01:00
Nicolas Lœuillet bca5485946 Added setting to have a personal reading time 2016-03-14 13:01:31 +01:00
Nicolas Lœuillet cebb42234c Added 'wallabag' in page title 2016-03-08 15:22:35 +01:00
Nicolas Lœuillet 3b32c122ab Change documentation links in quickstart 2016-03-08 11:21:40 +01:00
Nicolas Lœuillet 807037884f Merge pull request #1675 from wallabag/v2-create-api-client 
Ability to create new client for the API
 2016-03-08 10:09:39 +01:00
Jeremy Benoist d11eb2e461 Fix translations mistake 
In Material template, move the developer link in the left menu (like in baggy)
 2016-03-07 11:05:14 +01:00
Jeremy Benoist f17281417c Translate "how to" page 2016-03-07 09:20:20 +01:00
Jeremy Benoist 2766668b59 Use external js & css 2016-03-07 08:58:08 +01:00
Jeremy Benoist 1256f6fe34 Add translations 2016-03-05 22:29:58 +01:00
Jeremy Benoist 9bf15f0269 Add listing clients 
Rename route to be more consistive (ie: prefixed with developer_)
 2016-03-05 21:44:39 +01:00
Jeremy Benoist 2c2308b783 Cleanup form 
- Avoid too much hidden data in the form (instead of manually define the submit button and hide the default, use the default one !)
- Fix HTML syntax in client_parameters
- Add developer link in baggy menu
- Fix space between link in material footer
 2016-03-05 20:04:19 +01:00
Nicolas Lœuillet 76a9bc4797 Add new links in quickstart 2016-03-03 07:30:05 +01:00
Nicolas Lœuillet 6e3d65ccb0 Prepare wallabag for first beta 🚀 2016-02-29 21:34:36 +01:00
Nicolas Lœuillet 8a4690b6a5 add tests 2016-02-29 21:28:25 +01:00
Nicolas Lœuillet abc329453b Enhance documentation and create a form to create a new client 2016-02-29 21:28:25 +01:00
Nicolas Lœuillet 6a2c524a2c API: rename application to client 2016-02-29 21:28:25 +01:00
Nicolas Lœuillet b6321bed7b Added developer documentation 2016-02-29 21:28:25 +01:00
Nicolas Lœuillet 24152cdb5e Fix #1597: first draft to create new client for the API 2016-02-29 21:28:25 +01:00
Nicolas Lœuillet 4dc872238a Rename CommentBundle with AnnotationBundle 2016-02-26 18:14:42 +01:00
Thomas Citharel a772d16b12 display how much comments there are for an entry 2016-02-26 18:14:42 +01:00
Thomas Citharel 2b6e65a5e3 Move annotatorjs to the bottom of the body 
So that the "article" tag is loaded before
 2016-02-26 18:14:27 +01:00
Nicolas Lœuillet 7720cca532 Add annotator in baggy theme 
+ Documentation about annotations
 2016-02-26 18:14:12 +01:00
Thomas Citharel f38e03dc02 Comment work with annotator v2 
- add missing annotator.js file and fix typo
- edit & delete routes, started tests
- basic tests
 2016-02-26 18:13:17 +01:00
Nicolas Lœuillet 575e6907e5 Change remove tag icon in entry view with material theme 2016-02-26 08:58:36 +01:00
Olivier Mehani ef186de38a Make English welcome message more natural 
sed -i "s/Welcome on wallabag/Welcome to wallabag/"

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
 2016-02-25 11:32:40 +11:00
Nicolas Lœuillet ecb266d0ec replace contributors with a link to github 2016-02-23 16:18:13 +01:00
Nicolas Lœuillet 4a2c089c68 Add contributors and 3rd party libraries 2016-02-23 16:04:01 +01:00
Jeremy Benoist 077ddbe1ae Use a different way to use piwik 2016-02-22 11:11:08 +01:00
Nicolas Lœuillet 07643dde08 Fix #1137: implemented Piwik 2016-02-19 15:27:57 +01:00
Thomas Citharel f37c9c3348 translate estimated time minutes 2016-02-18 01:36:02 +01:00
Nicolas Lœuillet f6249b67f6 Merge pull request #1668 from wallabag/v2-stuff 
Few updates
 2016-02-16 12:27:43 +01:00
Jeremy Benoist 9e33bc9dfd Typos 2016-02-16 11:39:24 +01:00
Thomas Citharel a8d5f8971e fix typos 2016-02-15 17:04:48 +01:00
Thomas Citharel 56349e470a improve baggy theme (add new tag panel) 2016-02-14 20:12:03 +01:00
Jeremy Benoist daa2b7e7c3 More translations 2016-02-12 16:59:15 +01:00
Alexandr Danilov a7c7de4e9b Better design of the close button 2016-02-11 16:51:12 +01:00
Jeremy Benoist 9b5edf33a0 Merge pull request #1663 from wallabag/v2-remove-tags-from-entry 
remove tag from entry #1377
 2016-02-11 16:49:03 +01:00
Thomas Citharel 4c07a83b69 lots of diverse translation stuff & some typos 2016-02-11 01:42:37 +01:00
Thomas Citharel e686a76d34 improve test and change method name. Also, display number of entries for each tag 2016-02-10 18:40:15 +01:00
Thomas Citharel 567421af50 remove tag from entry #1377 2016-02-10 17:41:28 +01:00
Jeremy Benoist eb15061d0b Adjust export order 
To be the same as on the entry page.
Also, export name doesn't need to be translated.
 2016-02-04 20:41:30 +01:00
Thomas Citharel 365a38984e better display for txt 2016-02-04 20:31:26 +01:00
Thomas Citharel 6c08fb68b8 add txt export 2016-02-04 20:30:51 +01:00
Jeremy Benoist 27c837dcd1 Merge pull request #1642 from wallabag/v2-escape-preview 
Unescape content for Material card
 2016-02-04 17:46:02 +01:00
Nicolas Lœuillet e008c037f5 Merge pull request #1612 from wallabag/v2-settings-page 
Settings page
 2016-02-04 15:59:57 +01:00
Jeremy Benoist 0796532460 Unescape content for Material card 
Using slice & striptags, the content is automatically escaped.
If some html character need to be displayed, they'll be escape too, sth like `&amp;`.
Using |raw, the content isn't escape twice and is well displayed.
 2016-02-03 20:45:15 +01:00
Jeremy Benoist e43d27f845 Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight 
[#1604] First draft to fix SensioLabsInsight report
 2016-02-01 13:51:35 +01:00
Jeremy Benoist a74a6ca2b1 Add new export config 2016-01-31 15:31:30 +01:00
Jeremy Benoist 63e40f2d7c Add CraueConfig for internal settings 2016-01-31 14:48:26 +01:00
Jeremy Benoist 26975877d7 Always include warning message 
We'll remove it later, on the stable release
 2016-01-31 14:37:19 +01:00
Thomas Citharel b89444ad8b fix #1620 and introduce new parameters to export 2016-01-24 18:21:09 +01:00
Nicolas Lœuillet 5f8a785719 SensioLabsInsight fixes 2016-01-22 21:12:11 +01:00
Nicolas Lœuillet b0b893eafd [#1604] First draft to fix SensioLabsInsight report 2016-01-22 21:12:11 +01:00
Jeremy Benoist 30d81a47c6 Move public assets for themes 
So they can be installed using the `assets:install` command and there'll no longer symlink in the repo
They moved from `web/themes/...` to `bundles/wallabagcore/themes/...`
 2016-01-22 13:45:14 +01:00
Nicolas Lœuillet b91465c067 remove flattr on about page 2016-01-15 15:46:46 +01:00