Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | 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 | |
|\ | ||||||
| * | 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 | |
|\ \ | ||||||
| * | | 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 | Jeremy Benoist | 2016-04-10 | 2 | -1/+8 | |
| |/ / | ||||||
* | | | Merge pull request #1901 from wallabag/spanish | Nicolas Lœuillet | 2016-04-10 | 2 | -18/+18 | |
|\ \ \ | ||||||
| * | | | Uncommented translated ES lines | Jeremy Benoist | 2016-04-10 | 2 | -10/+10 | |
| * | | | Update messages.es.yml | jami7 | 2016-04-10 | 1 | -6/+6 | |
| * | | | 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 | |
|\ \ \ \ | ||||||
| * | | | | 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 | |
| * | | | | Fix duplicate article when added via the bookmarklet | Nicolas Lœuillet | 2016-04-08 | 1 | -1/+7 | |
* | | | | | Merge pull request #1895 from wallabag/v2-fix-entries-api | Jeremy Benoist | 2016-04-10 | 1 | -3/+3 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Remove int cast | Nicolas Lœuillet | 2016-04-10 | 1 | -2/+2 | |
| * | | | | All the entries are fetched via GET /api/entries | Nicolas Lœuillet | 2016-04-09 | 1 | -3/+3 | |
* | | | | | Merge pull request #1900 from wallabag/v2-remove-pt-empty-doc | Jeremy Benoist | 2016-04-10 | 3 | -93/+0 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Remove empty portugese documentation | Nicolas Lœuillet | 2016-04-10 | 3 | -93/+0 | |
| | |_|/ | |/| | | ||||||
* / | | | Fix typo in french documentation | Nicolas Lœuillet | 2016-04-10 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #1899 from wallabag/v2-nginx-doc | Jeremy Benoist | 2016-04-10 | 2 | -1/+9 | |
|\ \ \ | ||||||
| * | | | Add documentation about importing large file into nginx | Nicolas Lœuillet | 2016-04-10 | 2 | -1/+9 | |
* | | | | Merge pull request #1898 from wallabag/v2-fix-readingtime-display-material | Jeremy Benoist | 2016-04-10 | 1 | -2/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix estimated reading time in material view | Nicolas Lœuillet | 2016-04-10 | 1 | -2/+1 | |
| |/ / | ||||||
* | | | Merge pull request #1896 from wallabag/v2-fix-internal-settings | Jeremy Benoist | 2016-04-10 | 5 | -12/+13 | |
|\ \ \ | ||||||
| * | | | Fix internal settings | Nicolas Lœuillet | 2016-04-09 | 5 | -12/+13 | |
| |/ / | ||||||
* | | | Merge pull request #1894 from wallabag/v2-fix-doc-link | Jeremy Benoist | 2016-04-10 | 2 | -2/+2 | |
|\ \ \ | ||||||
| * | | | Fix documentation link in developer page | Nicolas Lœuillet | 2016-04-09 | 2 | -2/+2 | |
| |/ / | ||||||
* | | | Merge pull request #1891 from wallabag/v2-fix-rules-typo | Jeremy Benoist | 2016-04-10 | 2 | -2/+2 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Fix typo on configuration page | Nicolas Lœuillet | 2016-04-09 | 2 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #1824 from wallabag/v2-alternative-env | Jeremy Benoist | 2016-04-08 | 3 | -11/+12 | |
|\ \ | |/ |/| | ||||||
| * | Add documentation | Nicolas Lœuillet | 2016-04-08 | 2 | -0/+10 | |
| * | Remove SMTP configuration environment overrides | Mathieu Bruyen | 2016-03-29 | 1 | -11/+2 | |
* | | Merge pull request #1879 from wallabag/v2-tag-field-position | Jeremy Benoist | 2016-04-08 | 1 | -4/+4 | |
|\ \ | ||||||
| * | | Move tag form in Material theme | Nicolas Lœuillet | 2016-04-07 | 1 | -4/+4 | |
* | | | Merge pull request #1884 from wallabag/nicosomb-patch-1 | Jeremy Benoist | 2016-04-08 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Change the installation method in issue template | Nicolas Lœuillet | 2016-04-08 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #1804 from wallabag/j0k3r-patch-1 | Nicolas Lœuillet | 2016-04-08 | 1 | -1/+16 | |
|\ \ \ | ||||||
| * | | | Force user-agent for iansommerville.com | Jeremy Benoist | 2016-03-18 | 1 | -1/+16 | |
* | | | | Merge pull request #1868 from wallabag/v2-tagrule-baggy | Jeremy Benoist | 2016-04-07 | 3 | -84/+156 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Remove keybaord shortcut and add tagging rule panel in baggy | Nicolas Lœuillet | 2016-04-05 | 3 | -84/+156 | |
* | | | | Lock ocramius/proxy-manager | Jeremy Benoist | 2016-04-06 | 1 | -1/+2 | |
* | | | | Documentation about wallabag API | Nicolas Lœuillet | 2016-04-06 | 16 | -3/+486 | |
|/ / / | ||||||
* | | | Merge pull request #1862 from wallabag/v2-doc-import-wllbg1-cli | Jeremy Benoist | 2016-04-05 | 2 | -2/+2 | |
|\ \ \ | ||||||
| * | | | Add production environment for CLI import | Nicolas Lœuillet | 2016-04-05 | 2 | -2/+2 | |
* | | | | Merge pull request #1861 from wallabag/v2-round-estimated-time | Jeremy Benoist | 2016-04-05 | 2 | -11/+9 | |
|\ \ \ \ | |/ / / |/| | | |