aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add client_credentials as grant_typeoauth-changesThomas Citharel2017-06-147-1/+138
* Removed padding on entry viewNicolas Lœuillet2017-06-131-1/+1
* Fixed internal settings formNicolas Lœuillet2017-06-121-2/+1
* Merge pull request #3173 from wallabag/domain-name-paramJérémy Benoist2017-06-1014-15/+55
|\
| * Promote httpsJeremy Benoist2017-06-091-1/+1
| * ReviewJeremy Benoist2017-06-084-4/+3
| * fix testsThomas Citharel2017-06-061-0/+1
| * add migrationThomas Citharel2017-06-062-4/+52
| * remove craueconfig domain name setting and add a proper one in parametersThomas Citharel2017-06-0613-11/+3
* | Merge pull request #3093 from aaa2000/annotation-error-on-saveNicolas Lœuillet2017-06-072-1/+115
|\ \ | |/ |/|
| * Fix postgresql migrationadev2017-06-071-2/+2
| * Displays an error with an annotation with a too long quoteadev2017-06-042-1/+115
* | Update PL transationMateusz Rumiński2017-06-021-1/+1
* | Add :it: translationJérémy Benoist2017-06-021-1/+1
* | Use a dedicated file for wallabag configJeremy Benoist2017-06-022-165/+165
* | Add translationJeremy Benoist2017-06-0212-0/+12
* | API user creation behing a toggleJeremy Benoist2017-06-023-0/+182
|/
* Merge pull request #2708 from jcharaoui/import-disablecontentupdateJérémy Benoist2017-06-021-0/+1
|\
| * Put default fetching error title in global configJerome Charaoui2017-06-011-0/+1
* | Merge pull request #3171 from wallabag/drop-fucking-sqliteNicolas Lœuillet2017-06-011-5/+6
|\ \ | |/ |/|
| * Changed default database nameNicolas Lœuillet2017-06-011-1/+1
| * Fixed @tcitworld 's reviewNicolas Lœuillet2017-05-311-1/+1
| * Defined MySQL as the default rdbms for wallabagNicolas Lœuillet2017-05-311-4/+5
* | Merge pull request #3137 from aaa2000/isolated-testsJérémy Benoist2017-06-016-3/+14
|\ \ | |/ |/|
| * Isolated testsadev2017-05-316-3/+14
* | Merge pull request #3077 from wallabag/add-tags-list-viewNicolas Lœuillet2017-05-313-1/+62
|\ \ | |/ |/|
| * Reduced border-radius for tagsNicolas Lœuillet2017-05-312-0/+2
| * Add some flex magicThomas Citharel2017-05-312-34/+47
| * Fixed tags display on grid viewNicolas Lœuillet2017-05-313-0/+46
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-301-1/+1
|\ \ | |/ |/|
| * Fix documentation URL for "How can I help to fix that?"Damien Cassou2017-05-241-1/+1
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-191-1/+1
|\|
| * Prepare wallabag 2.2.3Nicolas Lœuillet2017-05-171-1/+1
* | Merge pull request #3120 from aaa2000/fix-delete-annotation-userJérémy Benoist2017-05-151-0/+5
|\ \
| * | Fix delete annotation when username is definedadev2017-05-141-0/+5
* | | Upgraded CraueConfigBundle to 2.0Nicolas Lœuillet2017-05-123-6/+13
|/ /
* | Added headers field in EntryNicolas Lœuillet2017-05-111-0/+55
* | Added migration to change length for user fieldsNicolas Lœuillet2017-05-101-0/+60
* | Merge pull request #3022 from wallabag/webpackThomas Citharel2017-05-0947-1723/+3102
|\ \
| * | icon mail a bit betterThomas Citharel2017-05-091-1/+1
| * | fix 3-dots menu positionThomas Citharel2017-05-081-1/+1
| * | Fix review againThomas Citharel2017-05-072-14/+18
| * | Fix reviewsAline2017-05-074-0/+24
| * | fixed margin on sidebar menuThomas Citharel2017-05-051-1/+1
| * | Fix according to reviewThomas Citharel2017-05-045-1052/+39
| * | rebaseThomas Citharel2017-05-041-0/+5
| * | add comment to config.yml to explain live reload featureThomas Citharel2017-05-041-0/+1
| * | disable default dev serverThomas Citharel2017-05-041-1/+1
| * | Adds Webpack support and removes the use for GruntThomas Citharel2017-05-0445-699/+3057
* | | Merge pull request #3053 from wallabag/api-bulk-addNicolas Lœuillet2017-05-051-0/+1
|\ \ \ | |/ / |/| |