aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #1925 from wallabag/fix-redirect-without-refererNicolas Lœuillet2016-04-155-4/+111
|\
| * 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
* | 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 URLNicolas Lœuillet2016-04-152-4/+4
|/
* Merge pull request #1916 from wallabag/cleanupNicolas Lœuillet2016-04-1372-687/+639
|\
| * Move test parameters out of parameters.ymlJeremy Benoist2016-04-1210-125/+39
| * Fix MySQL tests on HHVMJeremy Benoist2016-04-121-1/+1
| * Convert array + phpDocJeremy Benoist2016-04-1261-561/+599
* | Merge pull request #1918 from wallabag/improve-paginationJeremy Benoist2016-04-139-38/+49
|\ \
| * | 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
* | | Merge pull request #1919 from wallabag/cleanup-composerjsonJeremy Benoist2016-04-123-3/+0
|\ \ \ | |/ / |/| |
| * | 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 titlesThomas Citharel2016-04-122-2/+2
* | Merge pull request #1915 from wallabag/doc-linksNicolas Lœuillet2016-04-124-11/+8
|\ \
| * | 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 setupAdminJeremy Benoist2016-04-112-28/+45
|/
* Merge pull request #1909 from wallabag/prepare-release-2.0.1Nicolas Lœuillet2016-04-115-6/+6
|\
| * Prepare release 2.0.1Nicolas Lœuillet2016-04-115-6/+6
|/
* Merge pull request #1902 from wallabag/v2-changelogJeremy Benoist2016-04-101-0/+64
|\
| * 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
|\ \
| * | 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 errorJeremy Benoist2016-04-102-1/+8
| |/ /
* | | Merge pull request #1901 from wallabag/spanishNicolas Lœuillet2016-04-102-18/+18
|\ \ \
| * | | Uncommented translated ES linesJeremy Benoist2016-04-102-10/+10
| * | | Update messages.es.ymljami72016-04-101-6/+6
| * | | Update messages.es.ymljami72016-04-101-9/+9
* | | | Merge pull request #1887 from wallabag/v2-duplicate-bookmarkletJeremy Benoist2016-04-101-3/+17
|\ \ \ \
| * | | | Change visibility of checkIfEntryAlreadyExists method to privateNicolas Lœuillet2016-04-101-1/+1
| * | | | Refactor EntryControllerNicolas Lœuillet2016-04-091-6/+14
| * | | | Fix duplicate article when added via the bookmarkletNicolas Lœuillet2016-04-081-1/+7
* | | | | Merge pull request #1895 from wallabag/v2-fix-entries-apiJeremy Benoist2016-04-101-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove int castNicolas Lœuillet2016-04-101-2/+2
| * | | | All the entries are fetched via GET /api/entriesNicolas Lœuillet2016-04-091-3/+3
* | | | | Merge pull request #1900 from wallabag/v2-remove-pt-empty-docJeremy Benoist2016-04-103-93/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove empty portugese documentationNicolas Lœuillet2016-04-103-93/+0
| | |_|/ | |/| |
* / | | Fix typo in french documentationNicolas Lœuillet2016-04-101-1/+1
|/ / /
* | | Merge pull request #1899 from wallabag/v2-nginx-docJeremy Benoist2016-04-102-1/+9
|\ \ \