aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3060 from wallabag/search-usersThomas Citharel2017-05-0417-118/+256
|\ | | | | Search & paginate users
| * Merged list and search methodsNicolas Lœuillet2017-05-0215-154/+99
| |
| * rename index to listThomas Citharel2017-05-022-6/+6
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * Fix testsThomas Citharel2017-05-022-5/+23
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * Add paginationThomas Citharel2017-05-023-12/+45
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * Add filter to users management pageThomas Citharel2017-05-0217-28/+170
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #3079 from wallabag/update-docJérémy Benoist2017-05-0416-26/+26
|\ \ | | | | | | Fixed old links in documentation
| * | Updated documentation versionNicolas Lœuillet2017-05-034-8/+8
| | |
| * | Fixed old links in documentationNicolas Lœuillet2017-05-0312-18/+18
|/ /
* | Merge pull request #3047 from wallabag/add-notmatches-operatorNicolas Lœuillet2017-05-0332-51/+126
|\ \ | | | | | | Added notmatches operator for tagging rule
| * | Changed export testNicolas Lœuillet2017-05-031-3/+1
| | |
| * | Fixed @j0k3r reviewNicolas Lœuillet2017-04-222-2/+2
| | |
| * | Added notmatches operator for tagging ruleNicolas Lœuillet2017-04-2032-48/+125
| | |
* | | Merge pull request #3075 from wallabag/disable-shortcuts-loginNicolas Lœuillet2017-05-022-1/+6
|\ \ \ | | | | | | | | Disabled shortcuts on login/register page
| * | | Disabled shortcuts on login/register pageNicolas Lœuillet2017-05-022-1/+6
| | |/ | |/|
* | | Merge pull request #3073 from wallabag/fix-sandwichNicolas Lœuillet2017-05-021-5/+5
|\ \ \ | |/ / |/| | Fixed sandwich menu position in entry view (material theme)
| * | Fixed sandwich menu position in entry view (material theme)Nicolas Lœuillet2017-05-021-5/+5
|/ /
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-013-2/+6
|\ \
| * \ Merge pull request #3066 from wallabag/ignore-tests-exported-filesJérémy Benoist2017-04-291-0/+4
| |\ \ | | | | | | | | Ignore tests exported files
| | * | Ignore tests exported filesThomas Citharel2017-04-291-0/+4
| |/ /
| * | Merge pull request #3064 from gileri/masterJérémy Benoist2017-04-291-1/+1
| |\ \ | | | | | | | | Correct create_application en string
| | * | Correct create_application en stringÉric Gillet2017-04-291-1/+1
| |/ /
| * | Merge pull request #3052 from shtrom/fix-relative-symlinksJérémy Benoist2017-04-251-1/+1
| |\ \ | | | | | | | | Make symfony-assets-install use `relative` symlinks
| | * | Make symfony-assets-install use `relative` symlinksOlivier Mehani2017-04-221-1/+1
| |/ / | | | | | | | | | | | | | | | | | | This facilitates packaging, when installing in a different work PREFIX than the final install location. Signed-off-by: Olivier Mehani <shtrom@ssji.net>
* | | Merge pull request #3055 from wallabag/api-bulk-add-tagsNicolas Lœuillet2017-05-013-3/+174
|\ \ \ | | | | | | | | Added API endpoint to handle a list of URL and to add/delete tags
| * | | Fix testsJeremy Benoist2017-04-292-15/+13
| | | |
| * | | Added endpoint to handle URL list to add/delete tagsNicolas Lœuillet2017-04-243-37/+111
| | | |
| * | | Added API endpoint to handle a list of URL and to add/delete tagsNicolas Lœuillet2017-04-242-0/+99
| | | |
* | | | Merge pull request #3057 from raf64flo/patch-1Jérémy Benoist2017-04-264-10/+10
|\ \ \ \ | |/ / / |/| | | Use up-to-date Firefox extension and add F-Droid link for Android app.
| * | | Fix IT translation #3057Raphaël Flores2017-04-251-1/+1
| | | |
| * | | Fix typos. Fix #3057Raphaël Flores2017-04-252-2/+2
| | | |
| * | | Fix documentation for DE/IT/FR language, even if not sure for ED/IT. Fix #3057.Raphaël Flores2017-04-253-6/+6
| | | |
| * | | Remove 'fr' from Firefox extension URLRaphaël Flores2017-04-251-1/+1
| | | |
| * | | Update Firefox extension and Android linksRaphaël Flores2017-04-251-3/+3
|/ / / | | | | | | Use up-to-date Firefox extension and add F-Droid link for Android app.
* | | Merge pull request #3048 from wallabag/remove-download-picturesNicolas Lœuillet2017-04-221-0/+52
|\ \ \ | |_|/ |/| | Cleaned craue_config_setting by removing useless download_pictures setting
| * | Cleaned craue_config_setting by removing useless download_pictures settingNicolas Lœuillet2017-04-201-0/+52
|/ /
* | Merge pull request #3024 from wallabag/store-dateNicolas Lœuillet2017-04-1823-17/+243
|\ \ | | | | | | Added publication date and author
| * | Added test for multiple authorsNicolas Lœuillet2017-04-101-8/+39
| | |
| * | Fixed migrationsNicolas Lœuillet2017-04-101-0/+5
| | |
| * | Added author of articleNicolas Lœuillet2017-04-0920-6/+79
| | |
| * | Added publication dateNicolas Lœuillet2017-04-0537-23/+140
| | |
* | | Merge pull request #3044 from wallabag/fos-user-2.0Jérémy Benoist2017-04-181-1/+1
|\ \ \ | | | | | | | | Remove dev FOSUserBundle
| * | | Remove dev FOSUserBundleJeremy Benoist2017-04-181-1/+1
|/ / /
* | | Merge pull request #3030 from wallabag/remove-isPublic-from-entryJérémy Benoist2017-04-1430-61/+65
|\ \ \ | | | | | | | | Remove isPublic from Entry entity fix #2598
| * | | Removed is_public in Entry edit formNicolas Lœuillet2017-04-1329-37/+15
| | | |
| * | | Remove isPublic from Entry entity fix #2598Maxime2017-04-132-25/+51
|/ / /
* | | Merge branch 'master' into 2.3Nicolas Lœuillet2017-04-132-2/+4
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #3023 from mart-e/epub-notice-at-the-endJérémy Benoist2017-04-051-2/+2
| |\ | | | | | | Add export notice at the end of the epub
| | * Add export notice at the end of the epubMartin Trigaux2017-04-051-2/+2
| |/ | | | | | | | | | | | | | | | | The text "Produced by wallabag with PHPePub" is the first page of any epub. On ebooks reader, it is common (e.g. kobo) to use the first page as the cover of unread books, which makes it more difficult to differentiate the books. Move the Notices chapter at the end of the book.
| * Merge pull request #3017 from Kdecherf/local-image-alphaJérémy Benoist2017-03-301-0/+2
| |\ | | | | | | Save alpha channel when downloading PNG images
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 18:40:40 +0000