aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2326 from wallabag/update-quickstartJeremy Benoist2016-10-0212-50/+168
|\
| * Fixed french translationNicolas Lœuillet2016-10-011-3/+3
| * Changed translationsNicolas Lœuillet2016-10-0111-10/+11
| * Changed quickstart layoutNicolas Lœuillet2016-10-0112-50/+167
* | Merge pull request #2324 from wallabag/edit-tagging-ruleJeremy Benoist2016-10-0212-0/+14
|\ \
| * | Add ability to edit a tagging ruleJeremy Benoist2016-10-0112-0/+14
* | | Merge pull request #2323 from wallabag/footer-statsJeremy Benoist2016-10-0212-3/+25
|\ \ \
| * | | Add simple stats in footerJeremy Benoist2016-10-0112-3/+25
| | |/ | |/|
* | | Fix OC typosJeremy Benoist2016-10-0211-20/+20
* | | Occitan version updateQuent-in2016-10-011-24/+26
| |/ |/|
* | Merge pull request #2322 from wallabag/v2-404Nicolas Lœuillet2016-10-013-0/+60
|\ \
| * | Customize errors templatesJeremy Benoist2016-10-013-0/+60
| |/
* / Create user config in one placeJeremy Benoist2016-09-301-11/+0
|/
* Removed duplicated templates filesNicolas Lœuillet2016-09-3022-485/+9
* Merge pull request #2315 from wallabag/fixes-about-upgradeNicolas Lœuillet2016-09-291-1/+1
|\
| * Reordered upgrade documentationNicolas Lœuillet2016-09-281-1/+0
| * Some fixes about upgrade from 2.0.x -> 2.1.0Nicolas Lœuillet2016-09-281-0/+1
* | Update messages.pl.ymlMateusz Rumiński2016-09-291-2/+2
|/
* Add Instapaper translationsJeremy Benoist2016-09-2711-52/+96
* Update messages.pl.ymlMateusz Rumiński2016-09-271-12/+12
* bring chrome and firefox as separate importsThomas Citharel2016-09-2511-42/+86
* Indentation and renamed fixtures fileNicolas Lœuillet2016-09-259-27/+27
* Add Chrome path for Mac OSNicolas Lœuillet2016-09-253-3/+3
* Import Firefox & Chrome bookmarks into wallabagThomas Citharel2016-09-2511-1/+45
* Display a message when async import won’t workJeremy Benoist2016-09-2411-0/+33
* Merge pull request #2301 from wallabag/fix-rss-feedsJeremy Benoist2016-09-222-18/+2
|\
| * fix feeds not syncing on android appThomas Citharel2016-09-212-18/+2
* | Update messages.pl.ymlMateusz Rumiński2016-09-191-5/+5
* | Merge pull request #1941 from wallabag/v2-asynchronous-jobsJeremy Benoist2016-09-1915-31/+109
|\ \
| * | Avoid losing entry when fetching failJeremy Benoist2016-09-1711-22/+22
| * | Moved Pocket token to user configJeremy Benoist2016-09-1613-0/+35
| * | Change flash message for queued articlesJeremy Benoist2016-09-1311-3/+14
| * | Display how many messages are queueJeremy Benoist2016-09-131-0/+2
| * | Update import.worker.enabled translationJeremy Benoist2016-09-1210-16/+16
| * | Display a message when async is enabledJeremy Benoist2016-09-1111-0/+22
| * | Enable Redis async importJeremy Benoist2016-09-111-0/+8
* | | Fixed label for mark as read link in entry viewNicolas Lœuillet2016-09-152-3/+14
* | | Merge pull request #2287 from wallabag/remove-footerJeremy Benoist2016-09-153-46/+8
|\ \ \
| * | | Remove FooterControllerNicolas Lœuillet2016-09-153-13/+8
| * | | Remove footer partNicolas Lœuillet2016-09-131-33/+0
| |/ /
* / / Update messages.oc.ymlQuent-in2016-09-141-1/+1
|/ /
* | Merge pull request #2266 from wallabag/add-tags-counterJeremy Benoist2016-09-052-3/+1
|\ \
| * | Added tags counter in sidebar (material theme)Nicolas Lœuillet2016-09-042-3/+1
* | | Occitan updatedQuent-in2016-09-051-14/+14
|/ /
* | Remove Twig globalsJeremy Benoist2016-09-031-4/+4
* | Merge pull request #2002 from wallabag/feature-display-itemsNumberJeremy Benoist2016-09-032-4/+6
|\ \
| * | Store cache lifetime in configNicolas Lœuillet2016-09-031-0/+2
| * | Display entries number for each categoryNicolas Lœuillet2016-08-231-4/+4
* | | Fixed different font-size for labels in config screenNicolas Lœuillet2016-09-021-0/+2
* | | Merge pull request #2252 from wallabag/fix-last-mergeNicolas Lœuillet2016-09-023-107/+1
|\ \ \