mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-07-02 12:05:47 +00:00
Code Issues Projects Releases Wiki Activity
6354 commits 13 branches 99 tags 148 MiB
Commit graph

244 commits

Author SHA1 Message Date
Kevin Decherf 6de4cd35b5 Add support of originUrl field in baggy entry view 2017-11-19 15:02:11 +01:00
Kevin Decherf 9ff628ca56 webpack & views: replace bundles/wallabagcore with wallassets 
This change will prevent composer from removing wallabagcore assets when
installing assets.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-10-24 00:15:52 +02:00
Jérémy Benoist 854616ac6d Merge pull request #3294 from wallabag/export-tag-null 
Empty currentTag should be null
 2017-08-30 13:51:20 +02:00
Jeremy Benoist 2490f61dca
Merge remote-tracking branch 'origin/master' into 2.3 2017-08-22 11:22:47 +02:00
Étienne Gilli aa29fc4ec6 Fix export links in baggy theme 2017-08-13 18:03:32 +02:00
Jeremy Benoist bde23a44f8
Empty currentTag should be null 
And when a parameter is null, it won't appear in the url like `?tag=`.
 2017-07-28 08:07:11 +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
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
Jeremy Benoist b8427f22f0
Add menu access to site credentials CRUD 2017-06-20 16:03:14 +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 fa0f5ee12b
Add some deletion confirmation to avoid mistake 2017-05-24 21:33:37 +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 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
FrenchHope fb9f100e8f
Scuttle sharing 2017-03-28 14:20:14 +02: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
lapineige 0a0aa70098 Share tags to Shaarli - Baggy theme 2016-12-28 12:27:00 +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 32f455c131 Added tests 2016-11-19 20:05:16 +01:00
Nicolas Lœuillet 398de40517 Added search engine in baggy theme 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 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
Nicolas Lœuillet 8a9604aafe Added unmark.it sharing 
Fix #668
 2016-11-09 18:18:49 +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
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 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 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 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
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
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
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
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 645c0d5bce
better tags on baggy 2016-10-04 20:11:10 +02:00
Nicolas Lœuillet 3e85e91159
Fixed calendar icon position with baggy theme 2016-10-04 15:00:47 +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 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 bf3dc999e7
Add ability to edit a tagging rule 2016-10-01 16:52:05 +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
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 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 3e860ff1ce
Change links on baggy theme 2016-08-23 16:55:49 +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
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
Jeremy Benoist 79efca1e6f
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02: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
Simounet 39f27d6370 Handling socials links into a config file 2016-07-20 19:36:01 +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 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
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