aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Reorganized JS folders for shortcutsNicolas Lœuillet2016-11-1513-46/+124
| | | |
| * | | es6 importsThomas Citharel2016-11-159-40/+57
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | Added new shortcutsNicolas Lœuillet2016-11-1511-7/+90
| | | |
| * | | Changed FOSJSRouting format in configNicolas Lœuillet2016-11-151-1/+12
| | | |
| * | | Added shortcutsNicolas Lœuillet2016-11-1516-6/+121
|/ / /
* | | Merge pull request #2566 from wallabag/add-unmarkitNicolas Lœuillet2016-11-0924-34/+125
|\ \ \ | | | | | | | | Added unmark.it sharing
| * | | Added unmark.it sharingNicolas Lœuillet2016-11-0924-34/+125
| | | | | | | | | | | | | | | | Fix #668
* | | | Merge pull request #2564 from wallabag/mruminski-patch-1Nicolas Lœuillet2016-11-091-5/+5
|\ \ \ \ | |/ / / |/| | | Update messages.pl.yml
| * | | Update messages.pl.ymlMateusz Rumiński2016-11-081-5/+5
|/ / / | | | | | | translate Pinboard importer section to polish
* | | Merge pull request #2553 from wallabag/add-tagform-mobileNicolas Lœuillet2016-11-0815-13/+51
|\ \ \ | | | | | | | | Added new tag form in mobile view for Material theme
| * | | Added new tag form in mobile view for Material themeNicolas Lœuillet2016-11-0815-13/+51
|/ / / | | | | | | | | | Fix #2376
* | | Merge pull request #2548 from wallabag/pinboardJeremy Benoist2016-11-0829-10/+672
|\ \ \ | | | | | | | | Add Pinboard import
| * | | docs: update german import.rstStrubbl2016-11-071-21/+18
| | | |
| * | | Use more explicit checkJeremy Benoist2016-11-071-2/+2
| | | |
| * | | Add english doc into german oneJeremy Benoist2016-11-061-5/+44
| | | |
| * | | Update messages.en.ymlStrubbl2016-11-061-1/+1
| | | | | | | | | | | | Instapaper->Pinboard
| * | | Update messages.de.ymlStrubbl2016-11-061-3/+3
| | | |
| * | | Add docJeremy Benoist2016-11-062-0/+32
| | | |
| * | | Fix testsJeremy Benoist2016-11-062-2/+2
| | | |
| * | | Add Pinboard importJeremy Benoist2016-11-0424-2/+596
| | | |
* | | | Merge pull request #2551 from wallabag/remove-maintenance-bundleJeremy Benoist2016-11-069-112/+0
|\ \ \ \ | |/ / / |/| | | Removed Maintenance bundle
| * | | Removed Maintenance bundleNicolas Lœuillet2016-11-069-112/+0
|/ / /
* | | Merge pull request #2541 from wallabag/mruminski-patch-1Jeremy Benoist2016-11-041-5/+5
|\ \ \ | | | | | | | | Update messages.pl.yml
| * | | Update messages.pl.ymlMateusz Rumiński2016-11-041-5/+5
| | | | | | | | | | | | missing polish translation added
* | | | Merge pull request #2540 from wallabag/Quent-in-patch-1Thomas Citharel2016-11-041-19/+19
|\ \ \ \ | |/ / / |/| | | Update of the OC version
| * | | Update of the OC versionQuent-in2016-11-041-19/+19
|/ / /
* | | Merge pull request #2535 from wallabag/default-sort-2.2Jeremy Benoist2016-11-043-2/+59
|\ \ \ | | | | | | | | Use created_at as default sort
| * | | Add index into Table definitionJeremy Benoist2016-11-041-1/+5
| | | |
| * | | Use created_at as default sortJeremy Benoist2016-11-042-1/+54
|/ / / | | | | | | | | | With index (following https://github.com/wallabag/wallabag/pull/2534)
* | | CleanupJeremy Benoist2016-11-037-29/+6
| | |
* | | Fix rest controller mergeJeremy Benoist2016-11-034-0/+141
| | |
* | | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-0360-1936/+2477
|\| |
| * | Merge pull request #2530 from wallabag/add-doc-failed-load-external-entityNicolas Lœuillet2016-11-023-0/+21
| |\ \ | | | | | | | | Added documentation about failed to load external entity error
| | * | Update faq.rstJeremy Benoist2016-11-021-1/+1
| | | |
| | * | update German faq.rstStrubbl2016-11-021-2/+2
| | | |
| | * | update German faq.rstStrubbl2016-11-021-4/+4
| | | |
| | * | Added more info about Doctrine / PHP bugNicolas Lœuillet2016-11-023-0/+6
| | | |
| | * | Added documentation about failed to load external entity errorNicolas Lœuillet2016-11-023-0/+15
| |/ / | | | | | | | | | Fix #2529
| * | Merge pull request #2519 from Jibec/masterJeremy Benoist2016-11-024-373/+373
| |\ \ | | | | | | | | Translation update - French
| | * | wallabag is full lowercaseJeremy Benoist2016-11-021-7/+7
| | | |
| | * | Translation - French - tiny typoJean-Baptiste2016-10-311-1/+1
| | | |
| | * | Translation - French - tiny escape correctionJean-Baptiste2016-10-311-24/+24
| | | |
| | * | Translation - French - tiny escape correctionJean-Baptiste2016-10-311-1/+1
| | | |
| | * | Translation update - FrenchJean-Baptiste2016-10-301-4/+4
| | | |
| | * | Translation update - FrenchJean-Baptiste2016-10-302-367/+367
| | | |
| | * | Translation update - FrenchJean-Baptiste2016-10-300-0/+0
| | | |
| | * | Translation update - FrenchJean-Baptiste2016-10-301-1/+1
| | | |
| * | | Merge pull request #2528 from Kdecherf/slashdot-cookieJeremy Benoist2016-11-011-0/+1
| |\ \ \ | | | | | | | | | | Force user-agent for .slashdot.org
| | * | | Force user-agent for .slashdot.orgKevin Decherf2016-11-011-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slashdot replaces actual content with a form regarding cookies when requests originate from France. By forcing the user-agent, the warning seems to go away. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | Merge pull request #2524 from lologhi/instapaper-cli-importNicolas Lœuillet2016-11-011-0/+3
| |\ \ \ | | | | | | | | | | Add Instapaper to CLI import