aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #2314 from wallabag/assetsNicolas Lœuillet2016-10-0328-502/+498
|\ \ | |/ |/|
| * 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
* | Merge pull request #2331 from wallabag/api-linksThomas Citharel2016-10-023-4/+115
|\ \
| * | Fix parameters in API _linksJeremy Benoist2016-10-023-4/+115
* | | 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 versionsPaulino Michelazzo2016-10-021-1/+1
| |/ /
* | | Merge pull request #2327 from wallabag/user-managementJeremy Benoist2016-10-0231-346/+917
|\ \ \
| * | | Disabled delete button for the logged userJeremy Benoist2016-10-022-1/+12
| * | | 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
* | | | Merge pull request #2325 from wallabag/api-entries-existsNicolas Lœuillet2016-10-022-0/+54
|\ \ \ \
| * | | | 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
* | | | | Merge pull request #2328 from wallabag/avoid-duplicate-urlNicolas Lœuillet2016-10-022-1/+45
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove additional entryJeremy Benoist2016-10-021-0/+9
| * | | | Avoid duplicate url with accentsJeremy Benoist2016-10-012-1/+36
| |/ / /
* | | | Merge pull request #2326 from wallabag/update-quickstartJeremy Benoist2016-10-0214-53/+171
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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 footerJeremy Benoist2016-10-0115-5/+82
* | | | | | Merge pull request #2329 from wallabag/Quent-in-patch-1Jeremy Benoist2016-10-0211-35/+37
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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-017-9/+107
|\ \ \ \ \
| * | | | | Customize errors templatesJeremy Benoist2016-10-017-9/+107
| |/ / / /
* | | | | Merge pull request #2320 from wallabag/user-configNicolas Lœuillet2016-10-017-43/+51
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix bad template nameJeremy Benoist2016-09-301-0/+0
| * | | | Create user config in one placeJeremy Benoist2016-09-306-43/+51
|/ / / /
* | | | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-09-304-5/+6
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge pull request #2319 from pmartin/docker-php-gd-extensionJeremy Benoist2016-09-304-5/+6
| |\ \
| | * | Add PHP 'gd' extension to dockerPascal MARTIN2016-09-301-2/+3
| | * | Fix doc: 'bin/console' instead of 'app/console'Pascal MARTIN2016-09-303-3/+3
| |/ /
* | | Merge pull request #2318 from wallabag/refactor-templatesNicolas Lœuillet2016-09-3026-494/+18
|\ \ \
| * | | Removed duplicated templates filesNicolas Lœuillet2016-09-3026-494/+18
|/ / /
* | | Merge pull request #2315 from wallabag/fixes-about-upgradeNicolas Lœuillet2016-09-2923-33/+555
|\ \ \