aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Remove the left margin of tagJeremy Benoist2016-11-081-0/+4
| | | | In the entries list, the first tag below the link isn’t stick to the left. Now it is.
* Merge pull request #2561 from wallabag/Rurik19-patch-2259Thomas Citharel2016-11-081-1/+1
|\ | | | | fix #2559
| * fix #2559Yuriy Evdokimov2016-11-081-1/+1
|/
* Merge pull request #2555 from dkrmr/fix_update_scriptNicolas Lœuillet2016-11-071-1/+1
|\ | | | | Reorder variable assignation in update.sh script, fix #2554
| * Reorder variable assignation in update.sh script, fix #2554Darius Kramer2016-11-071-1/+1
| |
* | Merge pull request #2556 from wallabag/replace-tokenstorageNicolas Lœuillet2016-11-072-10/+21
|\ \ | |/ |/| Replaced TokenStorage with TokenStorageInterface
| * PHP CSNicolas Lœuillet2016-11-071-3/+2
| |
| * Replaced TokenStorage with TokenStorageInterfaceNicolas Lœuillet2016-11-072-7/+19
| |
* | Merge pull request #2552 from wallabag/reading-time-roundJeremy Benoist2016-11-061-1/+1
|\ \ | |/ |/| Round readingtime to avoid crazy number
| * Round readingtime to avoid crazy numberJeremy Benoist2016-11-061-1/+1
|/ | | | Like `8.666666666667 min`
* Merge pull request #2546 from wallabag/update-parameters-docNicolas Lœuillet2016-11-063-0/+9
|\ | | | | Updated default parameters.yml file in documentation
| * Updated default parameters.yml file in documentationNicolas Lœuillet2016-11-063-0/+9
|/
* Merge pull request #2545 from wallabag/update-docNicolas Lœuillet2016-11-053-18/+3
|\ | | | | Update the upgrade documentation
| * Update the upgrade documentationNicolas Lœuillet2016-11-053-18/+3
|/
* Merge pull request #2536 from wallabag/prepare-213Nicolas Lœuillet2016-11-046-889/+465
|\ | | | | Prepare wallabag 2.1.3 :rocket:
| * Update CHANGELOGNicolas Lœuillet2016-11-042-920/+458
| | | | | | | | Usage of github-changes from @lalitkapoor
| * Prepare wallabag 2.1.3 :rocket:Nicolas Lœuillet2016-11-046-19/+57
|/
* Merge pull request #2460 from wallabag/ui-changesNicolas Lœuillet2016-11-0413-135/+233
|\ | | | | UI Changes
| * Deal with more resolution issuesThomas Citharel2016-11-034-6/+22
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * Fix resolution issues and 'title' issuesThomas Citharel2016-11-036-36/+47
| | | | | | | | | | | | Also, modify editorconfig for css files. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * Re-add bottom paginationJeremy Benoist2016-10-2210-76/+68
| | | | | | | | Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
| * remove padding on small widthsThomas Citharel2016-10-223-2/+6
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * WIPThomas Citharel2016-10-225-59/+134
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #2534 from wallabag/default-sortNicolas Lœuillet2016-11-041-1/+1
|\ \ | | | | | | Use created_at as default sort
| * | Use created_at as default sortJeremy Benoist2016-11-041-1/+1
|/ / | | | | | | | | Imported content use the real creation date. If we sort by id, it'll display contents in reverse order.
* | Merge pull request #2530 from wallabag/add-doc-failed-load-external-entityNicolas Lœuillet2016-11-023-0/+21
|\ \ | | | | | | Added documentation about failed to load external entity error
| * | Update faq.rstJeremy Benoist2016-11-021-1/+1
| | |
| * | update German faq.rstStrubbl2016-11-021-2/+2
| | |
| * | update German faq.rstStrubbl2016-11-021-4/+4
| | |
| * | Added more info about Doctrine / PHP bugNicolas Lœuillet2016-11-023-0/+6
| | |
| * | Added documentation about failed to load external entity errorNicolas Lœuillet2016-11-023-0/+15
|/ / | | | | | | Fix #2529
* | Merge pull request #2519 from Jibec/masterJeremy Benoist2016-11-024-373/+373
|\ \ | | | | | | Translation update - French
| * | wallabag is full lowercaseJeremy Benoist2016-11-021-7/+7
| | |
| * | Translation - French - tiny typoJean-Baptiste2016-10-311-1/+1
| | |
| * | Translation - French - tiny escape correctionJean-Baptiste2016-10-311-24/+24
| | |
| * | Translation - French - tiny escape correctionJean-Baptiste2016-10-311-1/+1
| | |
| * | Translation update - FrenchJean-Baptiste2016-10-301-4/+4
| | |
| * | Translation update - FrenchJean-Baptiste2016-10-302-367/+367
| | |
| * | Translation update - FrenchJean-Baptiste2016-10-300-0/+0
| | |
| * | Translation update - FrenchJean-Baptiste2016-10-301-1/+1
| | |
* | | Merge pull request #2528 from Kdecherf/slashdot-cookieJeremy Benoist2016-11-011-0/+1
|\ \ \ | | | | | | | | Force user-agent for .slashdot.org
| * | | Force user-agent for .slashdot.orgKevin Decherf2016-11-011-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Slashdot replaces actual content with a form regarding cookies when requests originate from France. By forcing the user-agent, the warning seems to go away. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #2524 from lologhi/instapaper-cli-importNicolas Lœuillet2016-11-011-0/+3
|\ \ \ | | | | | | | | Add Instapaper to CLI import
| * | | Add Instapaper to CLI importLaurent2016-11-011-0/+3
|/ / /
* | | Merge pull request #2521 from foxmask/masterNicolas Lœuillet2016-10-313-9/+9
|\ \ \ | | | | | | | | fix path for the install scripts
| * | | fix path for in install scriptsFoxMaSk2016-10-303-3/+3
| | | |
| * | | fix path for in install scriptsFoxMaSk2016-10-303-9/+9
| | | |
* | | | Merge pull request #2520 from wallabag/configNicolas Lœuillet2016-10-316-22/+13
|\ \ \ \ | |/ / / |/| | | Inject parameter instead of service
| * | | Fix testsJeremy Benoist2016-10-301-10/+2
| | | |
| * | | Inject parameter instead of serviceJeremy Benoist2016-10-305-12/+11
|/ / / | | | | | | | | | | | | We are injecting CraueConfig service when we only need to retrieve one or two values from it. Instead I discovered we can directly inject a value from a service in the service definition!