aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Add documentation about importing large file into nginxNicolas Lœuillet2016-04-102-1/+9
* | | | Merge pull request #1898 from wallabag/v2-fix-readingtime-display-materialJeremy Benoist2016-04-101-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix estimated reading time in material viewNicolas Lœuillet2016-04-101-2/+1
| |/ /
* | | Merge pull request #1896 from wallabag/v2-fix-internal-settingsJeremy Benoist2016-04-105-12/+13
|\ \ \
| * | | Fix internal settingsNicolas Lœuillet2016-04-095-12/+13
| |/ /
* | | Merge pull request #1894 from wallabag/v2-fix-doc-linkJeremy Benoist2016-04-102-2/+2
|\ \ \
| * | | Fix documentation link in developer pageNicolas Lœuillet2016-04-092-2/+2
| |/ /
* | | Merge pull request #1891 from wallabag/v2-fix-rules-typoJeremy Benoist2016-04-102-2/+2
|\ \ \ | |/ / |/| |
| * | Fix typo on configuration pageNicolas Lœuillet2016-04-092-2/+2
|/ /
* | Merge pull request #1824 from wallabag/v2-alternative-envJeremy Benoist2016-04-083-11/+12
|\ \ | |/ |/|
| * Add documentationNicolas Lœuillet2016-04-082-0/+10
| * Remove SMTP configuration environment overridesMathieu Bruyen2016-03-291-11/+2
* | Merge pull request #1879 from wallabag/v2-tag-field-positionJeremy Benoist2016-04-081-4/+4
|\ \
| * | Move tag form in Material themeNicolas Lœuillet2016-04-071-4/+4
* | | Merge pull request #1884 from wallabag/nicosomb-patch-1Jeremy Benoist2016-04-081-1/+1
|\ \ \
| * | | Change the installation method in issue templateNicolas Lœuillet2016-04-081-1/+1
|/ / /
* | | Merge pull request #1804 from wallabag/j0k3r-patch-1Nicolas Lœuillet2016-04-081-1/+16
|\ \ \
| * | | Force user-agent for iansommerville.comJeremy Benoist2016-03-181-1/+16
* | | | Merge pull request #1868 from wallabag/v2-tagrule-baggyJeremy Benoist2016-04-073-84/+156
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove keybaord shortcut and add tagging rule panel in baggyNicolas Lœuillet2016-04-053-84/+156
* | | | Lock ocramius/proxy-managerJeremy Benoist2016-04-061-1/+2
* | | | Documentation about wallabag APINicolas Lœuillet2016-04-0616-3/+486
|/ / /
* | | Merge pull request #1862 from wallabag/v2-doc-import-wllbg1-cliJeremy Benoist2016-04-052-2/+2
|\ \ \
| * | | Add production environment for CLI importNicolas Lœuillet2016-04-052-2/+2
* | | | Merge pull request #1861 from wallabag/v2-round-estimated-timeJeremy Benoist2016-04-052-11/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Round estimated time and add reading speed for BaggyNicolas Lœuillet2016-04-052-11/+9