Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1944 from wallabag/travis-rename-branches | Thomas Citharel | 2016-04-18 | 1 | -2/+1 |
|\ | | | | | Update Travis configuration with branches renaming | ||||
| * | Update Travis configuration with branches renaming | Nicolas Lœuillet | 2016-04-18 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #1938 from wallabag/hide-pagination | Thomas Citharel | 2016-04-18 | 2 | -2/+2 |
|\ | | | | | Display pagination only if we have more than one page | ||||
| * | Display pagination only if we have more than one page | Nicolas Lœuillet | 2016-04-18 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #1935 from jami7/patch-8 | Nicolas Lœuillet | 2016-04-17 | 1 | -24/+24 |
|\ \ | | | | | | | Update messages.es.yml | ||||
| * | | Update messages.es.yml | jami7 | 2016-04-16 | 1 | -24/+24 |
|/ / | |||||
* | | Merge pull request #1933 from wallabag/hide-pagination | Nicolas Lœuillet | 2016-04-16 | 2 | -2/+6 |
|\| | | | | | Hide pagination if we only have one entry to display | ||||
| * | Hide pagination if we only have one entry to display | Nicolas Lœuillet | 2016-04-16 | 2 | -2/+6 |
|/ | |||||
* | Merge pull request #1925 from wallabag/fix-redirect-without-referer | Nicolas Lœuillet | 2016-04-15 | 5 | -4/+111 |
|\ | | | | | Redirect to homepage if referer is null | ||||
| * | Fix redirect when delete entry | Nicolas Lœuillet | 2016-04-15 | 1 | -1/+1 |
| | | |||||
| * | Fix tests | Nicolas Lœuillet | 2016-04-15 | 2 | -11/+18 |
| | | |||||
| * | Redirect to homepage if referer is null | Nicolas Lœuillet | 2016-04-15 | 5 | -4/+104 |
| | | | | | | | | Fix #1924 | ||||
* | | Merge pull request #1929 from wallabag/change-guid-rss | Nicolas Lœuillet | 2016-04-15 | 2 | -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 URL | Nicolas Lœuillet | 2016-04-15 | 2 | -4/+4 |
|/ | | | | Fix #1926 | ||||
* | Merge pull request #1916 from wallabag/cleanup | Nicolas Lœuillet | 2016-04-13 | 72 | -687/+639 |
|\ | | | | | Convert array + phpDoc | ||||
| * | Move test parameters out of parameters.yml | Jeremy Benoist | 2016-04-12 | 10 | -125/+39 |
| | | | | | | | | The end user doesn't care to about the test database. | ||||
| * | Fix MySQL tests on HHVM | Jeremy Benoist | 2016-04-12 | 1 | -1/+1 |
| | | |||||
| * | Convert array + phpDoc | Jeremy Benoist | 2016-04-12 | 61 | -561/+599 |
| | | | | | | | | Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter | ||||
* | | Merge pull request #1918 from wallabag/improve-pagination | Jeremy Benoist | 2016-04-13 | 9 | -38/+49 |
|\ \ | | | | | | | Improve pagination when user has lot of entries | ||||
| * | | Fix indentation | Nicolas Lœuillet | 2016-04-13 | 1 | -4/+4 |
| | | | |||||
| * | | Lost in translation pager | Nicolas Lœuillet | 2016-04-12 | 4 | -11/+3 |
| | | | |||||
| * | | Fix display for Next/Previous link when they are disabled | Nicolas Lœuillet | 2016-04-12 | 1 | -0/+5 |
| | | | |||||
| * | | Restore old behavior for OutOfRangeCurrentPageException | Nicolas Lœuillet | 2016-04-12 | 2 | -2/+10 |
| | | | |||||
| * | | Fix tests | Nicolas Lœuillet | 2016-04-12 | 1 | -1/+1 |
| | | | |||||
| * | | Improve pagination when user has lot of entries | Nicolas Lœuillet | 2016-04-12 | 9 | -47/+53 |
| | | | | | | | | | | | | | | | Fix #1905 * Usage of whiteoctober/WhiteOctoberPagerfantaBundle | ||||
* | | | Merge pull request #1919 from wallabag/cleanup-composerjson | Jeremy Benoist | 2016-04-12 | 3 | -3/+0 |
|\ \ \ | |/ / |/| | | Remove useless dependancy | ||||
| * | | Remove useless dependancy | Nicolas Lœuillet | 2016-04-12 | 3 | -3/+0 |
|/ / | |||||
* | | Merge pull request #1911 from wallabag/title-on-title-entry | Nicolas Lœuillet | 2016-04-12 | 2 | -2/+2 |
|\ \ | |/ |/| | add title hover on entry titles | ||||
| * | Add title hover on entry titles | Thomas Citharel | 2016-04-12 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #1915 from wallabag/doc-links | Nicolas Lœuillet | 2016-04-12 | 4 | -11/+8 |
|\ \ | | | | | | | Fix doc links | ||||
| * | | Fix doc links | Jeremy Benoist | 2016-04-12 | 4 | -11/+8 |
|/ / | |||||
* | | Merge pull request #1912 from wallabag/install-config | Nicolas Lœuillet | 2016-04-11 | 2 | -28/+45 |
|\ \ | |/ |/| | Move setup config outside setupAdmin | ||||
| * | Move setup config outside setupAdmin | Jeremy Benoist | 2016-04-11 | 2 | -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.1 | Nicolas Lœuillet | 2016-04-11 | 5 | -6/+6 |
|\ | | | | | Prepare release 2.0.1 | ||||
| * | Prepare release 2.0.1 | Nicolas Lœuillet | 2016-04-11 | 5 | -6/+6 |
|/ | |||||
* | Merge pull request #1902 from wallabag/v2-changelog | Jeremy Benoist | 2016-04-10 | 1 | -0/+64 |
|\ | | | | | Add changelog | ||||
| * | Update changelog | Nicolas Lœuillet | 2016-04-10 | 1 | -17/+22 |
| | | |||||
| * | Add changelog | Nicolas Lœuillet | 2016-04-10 | 1 | -0/+59 |
| | | |||||
* | | Merge pull request #1823 from wallabag/translation-fa | Nicolas Lœuillet | 2016-04-10 | 1 | -149/+149 |
|\ \ | | | | | | | Translation fa | ||||
| * | | Fix FA translations indentation | Jeremy Benoist | 2016-04-10 | 1 | -43/+43 |
| | | | |||||
| * | | Update messages.fa.yml | Masoud Abkenar | 2016-04-10 | 1 | -149/+149 |
| | | | |||||
* | | | Merge pull request #1903 from wallabag/force-server-version | Nicolas Lœuillet | 2016-04-10 | 2 | -1/+8 |
|\ \ \ | | | | | | | | | Force server version to avoid connexion error | ||||
| * | | | Force server version to avoid connexion error | Jeremy Benoist | 2016-04-10 | 2 | -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/spanish | Nicolas Lœuillet | 2016-04-10 | 2 | -18/+18 |
|\ \ \ | | | | | | | | | Update Spanish translation | ||||
| * | | | Uncommented translated ES lines | Jeremy Benoist | 2016-04-10 | 2 | -10/+10 |
| | | | | | | | | | | | | | | | | Also, turn yaml lint into a more versbose check | ||||
| * | | | Update messages.es.yml | jami7 | 2016-04-10 | 1 | -6/+6 |
| | | | | | | | | | | | | On line 103, I'm not sure what symbol that is that looks like this (<<) but it looks smaller? Where is that? Should I just copy and paste it? And just to clarity, please look at line 101 too cause I'm not too sure if/how I change the stuff within <...> I stopped mid line in 103 just until I get clarification on this. Thanks. | ||||
| * | | | Update messages.es.yml | jami7 | 2016-04-10 | 1 | -9/+9 |
| | | | | |||||
* | | | | Merge pull request #1887 from wallabag/v2-duplicate-bookmarklet | Jeremy Benoist | 2016-04-10 | 1 | -3/+17 |
|\ \ \ \ | | | | | | | | | | | Fix duplicate article when added via the bookmarklet | ||||
| * | | | | Change visibility of checkIfEntryAlreadyExists method to private | Nicolas Lœuillet | 2016-04-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Refactor EntryController | Nicolas Lœuillet | 2016-04-09 | 1 | -6/+14 |
| | | | | |