aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #1953 from maxi62330/masterNicolas Lœuillet2016-04-192-10/+10
|\ \ | |/ |/| Actualisation des liens morts (Documentation de traduction)
| * Actualisation des liens morts (Documentation de traduction)Martinet Maxime2016-04-192-10/+10
|/
* Merge pull request #1942 from wallabag/optimize-importThomas Citharel2016-04-184-2/+305
|\ | | | | Optimize import
| * Add testsNicolas Lœuillet2016-04-184-4/+305
| |
| * Add doctrine clear after flush, thanks to @BitOne talk at Symfony LiveNicolas Lœuillet2016-04-182-0/+2
| |
* | Merge pull request #1944 from wallabag/travis-rename-branchesThomas Citharel2016-04-181-2/+1
|\ \ | |/ |/| Update Travis configuration with branches renaming
| * Update Travis configuration with branches renamingNicolas Lœuillet2016-04-181-2/+1
|/
* Merge pull request #1938 from wallabag/hide-paginationThomas Citharel2016-04-182-2/+2
|\ | | | | Display pagination only if we have more than one page
| * Display pagination only if we have more than one pageNicolas Lœuillet2016-04-182-2/+2
| |
* | Merge pull request #1935 from jami7/patch-8Nicolas Lœuillet2016-04-171-24/+24
|\ \ | | | | | | Update messages.es.yml
| * | Update messages.es.ymljami72016-04-161-24/+24
|/ /
* | Merge pull request #1933 from wallabag/hide-paginationNicolas Lœuillet2016-04-162-2/+6
|\| | | | | Hide pagination if we only have one entry to display
| * Hide pagination if we only have one entry to displayNicolas Lœuillet2016-04-162-2/+6
|/
* Merge pull request #1925 from wallabag/fix-redirect-without-refererNicolas Lœuillet2016-04-155-4/+111
|\ | | | | Redirect to homepage if referer is null
| * Fix redirect when delete entryNicolas Lœuillet2016-04-151-1/+1
| |
| * Fix testsNicolas Lœuillet2016-04-152-11/+18
| |
| * Redirect to homepage if referer is nullNicolas Lœuillet2016-04-155-4/+104
| | | | | | | | Fix #1924
* | Merge pull request #1929 from wallabag/change-guid-rssNicolas Lœuillet2016-04-152-4/+4
|\ \ | |/ |/| Change guid and link in RSS feeds to give original entry URL
| * Change guid and link in RSS feeds to give original entry URLNicolas Lœuillet2016-04-152-4/+4
|/ | | | Fix #1926
* Merge pull request #1916 from wallabag/cleanupNicolas Lœuillet2016-04-1372-687/+639
|\ | | | | Convert array + phpDoc
| * Move test parameters out of parameters.ymlJeremy Benoist2016-04-1210-125/+39
| | | | | | | | The end user doesn't care to about the test database.
| * Fix MySQL tests on HHVMJeremy Benoist2016-04-121-1/+1
| |
| * Convert array + phpDocJeremy Benoist2016-04-1261-561/+599
| | | | | | | | Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter
* | Merge pull request #1918 from wallabag/improve-paginationJeremy Benoist2016-04-139-38/+49
|\ \ | | | | | | Improve pagination when user has lot of entries
| * | Fix indentationNicolas Lœuillet2016-04-131-4/+4
| | |
| * | Lost in translation pagerNicolas Lœuillet2016-04-124-11/+3
| | |
| * | Fix display for Next/Previous link when they are disabledNicolas Lœuillet2016-04-121-0/+5
| | |
| * | Restore old behavior for OutOfRangeCurrentPageExceptionNicolas Lœuillet2016-04-122-2/+10
| | |
| * | Fix testsNicolas Lœuillet2016-04-121-1/+1
| | |
| * | Improve pagination when user has lot of entriesNicolas Lœuillet2016-04-129-47/+53
| | | | | | | | | | | | | | | Fix #1905 * Usage of whiteoctober/WhiteOctoberPagerfantaBundle
* | | Merge pull request #1919 from wallabag/cleanup-composerjsonJeremy Benoist2016-04-123-3/+0
|\ \ \ | |/ / |/| | Remove useless dependancy
| * | Remove useless dependancyNicolas Lœuillet2016-04-123-3/+0
|/ /
* | Merge pull request #1911 from wallabag/title-on-title-entryNicolas Lœuillet2016-04-122-2/+2
|\ \ | |/ |/| add title hover on entry titles
| * Add title hover on entry titlesThomas Citharel2016-04-122-2/+2
| |
* | Merge pull request #1915 from wallabag/doc-linksNicolas Lœuillet2016-04-124-11/+8
|\ \ | | | | | | Fix doc links
| * | Fix doc linksJeremy Benoist2016-04-124-11/+8
|/ /
* | Merge pull request #1912 from wallabag/install-configNicolas Lœuillet2016-04-112-28/+45
|\ \ | |/ |/| Move setup config outside setupAdmin
| * Move setup config outside setupAdminJeremy Benoist2016-04-112-28/+45
|/ | | | If user doesn't want to create a new admin (even if it's recommended) the internal config weren't created resulting in error when using the interface.
* Merge pull request #1909 from wallabag/prepare-release-2.0.1Nicolas Lœuillet2016-04-115-6/+6
|\ | | | | Prepare release 2.0.1
| * Prepare release 2.0.1Nicolas Lœuillet2016-04-115-6/+6
|/
* Merge pull request #1902 from wallabag/v2-changelogJeremy Benoist2016-04-101-0/+64
|\ | | | | Add changelog
| * Update changelogNicolas Lœuillet2016-04-101-17/+22
| |
| * Add changelogNicolas Lœuillet2016-04-101-0/+59
| |
* | Merge pull request #1823 from wallabag/translation-faNicolas Lœuillet2016-04-101-149/+149
|\ \ | | | | | | Translation fa
| * | Fix FA translations indentationJeremy Benoist2016-04-101-43/+43
| | |
| * | Update messages.fa.ymlMasoud Abkenar2016-04-101-149/+149
| | |
* | | Merge pull request #1903 from wallabag/force-server-versionNicolas Lœuillet2016-04-102-1/+8
|\ \ \ | | | | | | | | Force server version to avoid connexion error
| * | | Force server version to avoid connexion errorJeremy Benoist2016-04-102-1/+8
| |/ / | | | | | | | | | | | | When installing a new project with MySQL, if the database doesn't exist before installation will fail because DBAL will try to get the server version by querying it. And since this query is done using the default database connexion and since the database doesn't exist, DBAL can't connect to the server.
* | | Merge pull request #1901 from wallabag/spanishNicolas Lœuillet2016-04-102-18/+18
|\ \ \ | | | | | | | | Update Spanish translation
| * | | Uncommented translated ES linesJeremy Benoist2016-04-102-10/+10
| | | | | | | | | | | | | | | | Also, turn yaml lint into a more versbose check