aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2334 from wallabag/prepare-21Jeremy Benoist2016-10-035-4/+57
|\ | | | | Prepare wallabag 2.1.0 :rocket:
| * Prepare wallabag 2.1.0 :rocket:Nicolas Lœuillet2016-10-035-4/+57
| |
* | Merge pull request #2335 from wallabag/fix-quickstart-cssNicolas Lœuillet2016-10-032-3/+7
|\ \ | | | | | | Fixed CSS for quickstart links
| * | Fixed CSS for quickstart linksNicolas Lœuillet2016-10-032-3/+7
|/ /
* | Merge pull request #2333 from wallabag/translation-german-for-2.1Jeremy Benoist2016-10-031-51/+51
|\ \ | |/ |/| for 2.1, translate all strings to German, which haven't been translated yet
| * Update messages.de.ymlJeremy Benoist2016-10-031-1/+1
| |
| * Fixed typosNicolas Lœuillet2016-10-031-2/+1
| |
| * Better translation for the weird sentenceJulian Oster2016-10-021-1/+2
| |
| * Improve the german translation a bitJulian Oster2016-10-021-10/+10
| | | | | | Just some little mistakes, good work so far :)
| * translate all strings to German, which haven't been translated yetSven Fischer2016-10-021-51/+51
| |
* | Merge pull request #2314 from wallabag/assetsNicolas Lœuillet2016-10-0328-502/+498
|\ \ | |/ |/| Assets work
| * remove bower dependency from npmThomas Citharel2016-09-291-1/+0
| |
| * remove bowerThomas Citharel2016-09-294-51/+2
| |
| * fonts & ligaturesThomas Citharel2016-09-294-26/+24
| |
| * remove autocomplete and bring fonts through npmThomas Citharel2016-09-283-8/+32
| |
| * Remove .idea stuffThomas Citharel2016-09-281-5/+1
| |
| * Assets workThomas Citharel2016-09-2823-417/+445
| | | | | | | | | | | | | | | | | | | | * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231
* | Merge pull request #2331 from wallabag/api-linksThomas Citharel2016-10-023-4/+115
|\ \ | | | | | | Fix parameters in API _links
| * | Fix parameters in API _linksJeremy Benoist2016-10-023-4/+115
| | | | | | | | | | | | We forgot to pass them to the factory
* | | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-10-021-1/+1
|\ \ \ | |/ / |/| |
| * | Merge pull request #2330 from pmichelazzo/masterJeremy Benoist2016-10-021-1/+1
| |\ \ | | | | | | | | Remove error message when creating ePub versions
| | * | Remove error message when creating ePub versionsPaulino Michelazzo2016-10-021-1/+1
| |/ / | | | | | | | | | | | | | | | Trying to create a ePub version, the first page shows a message of a “missing >”. This change solve this problem (and, for sure, in any download version that’s use HTML).
* | | Merge pull request #2327 from wallabag/user-managementJeremy Benoist2016-10-0231-346/+917
|\ \ \ | | | | | | | | Add users management UI
| * | | Disabled delete button for the logged userJeremy Benoist2016-10-022-1/+12
| | | | | | | | | | | | | | | | To avoid some bad things to happen…
| * | | Remove NewUser test from ConfigJeremy Benoist2016-10-021-114/+0
| | | |
| * | | Cleanup & add link on baggy menuJeremy Benoist2016-10-023-60/+1
| | | |
| * | | Add users management UIJeremy Benoist2016-10-0229-223/+956
| | | | | | | | | | | | | | | | | | | | | | | | - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation)
* | | | Merge pull request #2325 from wallabag/api-entries-existsNicolas Lœuillet2016-10-022-0/+54
|\ \ \ \ | | | | | | | | | | Add an exists endpoint in API
| * | | | CSJeremy Benoist2016-10-021-1/+1
| | | | |
| * | | | Add test when url doesn’t existJeremy Benoist2016-10-011-0/+11
| | | | |
| * | | | Add an exists endpoint in APIJeremy Benoist2016-10-012-0/+43
| | | | | | | | | | | | | | | | | | | | It should allow third party to check if an url was already saved by a user
* | | | | Merge pull request #2328 from wallabag/avoid-duplicate-urlNicolas Lœuillet2016-10-022-1/+45
|\ \ \ \ \ | |_|/ / / |/| | | | Avoid duplicate url with accents
| * | | | Remove additional entryJeremy Benoist2016-10-021-0/+9
| | | | | | | | | | | | | | | | | | | | After the test is done, cleanup what we’ve done
| * | | | Avoid duplicate url with accentsJeremy Benoist2016-10-012-1/+36
| |/ / /
* | | | Merge pull request #2326 from wallabag/update-quickstartJeremy Benoist2016-10-0214-53/+171
|\ \ \ \ | | | | | | | | | | Changed quickstart layout
| * | | | Update testJeremy Benoist2016-10-021-1/+1
| | | | |
| * | | | Fixed french translationNicolas Lœuillet2016-10-011-3/+3
| | | | |
| * | | | Changed translationsNicolas Lœuillet2016-10-0111-10/+11
| | | | |
| * | | | Changed quickstart layoutNicolas Lœuillet2016-10-0113-52/+169
| | | | |
* | | | | Merge pull request #2324 from wallabag/edit-tagging-ruleJeremy Benoist2016-10-0214-17/+106
|\ \ \ \ \ | | | | | | | | | | | | Add ability to edit a tagging rule
| * | | | | CSJeremy Benoist2016-10-011-2/+2
| | | | | |
| * | | | | Introduce validateRuleActionJeremy Benoist2016-10-011-5/+13
| | | | | |
| * | | | | Add ability to edit a tagging ruleJeremy Benoist2016-10-0114-14/+95
| | |/ / / | |/| | |
* | | | | Merge pull request #2323 from wallabag/footer-statsJeremy Benoist2016-10-0215-5/+82
|\ \ \ \ \ | | | | | | | | | | | | Add simple stats in footer
| * | | | | Add simple stats in footerJeremy Benoist2016-10-0115-5/+82
| | | | | |
* | | | | | Merge pull request #2329 from wallabag/Quent-in-patch-1Jeremy Benoist2016-10-0211-35/+37
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Occitan version update
| * | | | | Fix OC typosJeremy Benoist2016-10-0211-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | + remove extra sentence
| * | | | | Occitan version updateQuent-in2016-10-011-24/+26
|/ / / / / | | | | | | | | | | to be ready for the future of Wallabag :)
* | | | | Merge pull request #2322 from wallabag/v2-404Nicolas Lœuillet2016-10-017-9/+107
|\ \ \ \ \ | | | | | | | | | | | | Customize errors templates
| * | | | | Customize errors templatesJeremy Benoist2016-10-017-9/+107
| |/ / / / | | | | | | | | | | | | | | | All error goes to the same template which only display the error message and the status code.