aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-0913-11/+37
|\
| * Merge pull request #3097 from wallabag/update-licenseJérémy Benoist2017-05-091-2/+2
| |\ | | | | | | Update graby* licenses
| | * Update graby* licensesJérémy Benoist2017-05-091-2/+2
| |/
| * Merge pull request #3096 from aaa2000/fix-api-entries-pagination-with-perpageJérémy Benoist2017-05-092-1/+18
| |\ | | | | | | Fix API pagination is broken if perPage is custom value
| | * Fix API pagination is broken if perPage is custom valueadev2017-05-082-1/+18
| |/ | | | | | | Fix #2720
| * Merge pull request #3090 from aaa2000/translate-login-page-errorNicolas Lœuillet2017-05-071-1/+1
| |\ | | | | | | Translate error message in login page
| | * Translate error message in login pageadev2017-05-061-1/+1
| |/ | | | | | | Fix #2933
| * Merge pull request #3082 from aaa2000/fix-form-errors-displayJérémy Benoist2017-05-054-1/+11
| |\ | | | | | | Fix display the form errors correctly
| | * Fix display the form errors correctlyadev2017-05-054-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use `property_path` form option to map underscored form fields to object properties @see https://github.com/symfony/symfony/issues/9162#issuecomment-25431148 Fix #3067
| * | Merge pull request #3072 from wallabag/hotfix/3061Nicolas Lœuillet2017-05-026-6/+6
| |\ \ | | |/ | |/| Small typo in documentation fix #3061
| | * Small typo in documentation fix #3061Maxime Marinel2017-05-026-6/+6
| |/
* | Merge pull request #3022 from wallabag/webpackThomas Citharel2017-05-09202-132081/+8809
|\ \ | | | | | | Adds Webpack support and remove Grunt
| * | icon mail a bit betterThomas Citharel2017-05-092-2/+2
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | fix 3-dots menu positionThomas Citharel2017-05-081-1/+1
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | Fix review againThomas Citharel2017-05-074-51/+57
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | Fix reviewsAline2017-05-0710-9/+33
| | | | | | | | | | | | Signed-off-by: Aline <chetta.aline@gmail.com>
| * | fixed margin on sidebar menuThomas Citharel2017-05-052-2/+2
| | |
| * | Fix according to reviewThomas Citharel2017-05-047-1054/+41
| | |
| * | rebaseThomas Citharel2017-05-042-1/+6
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | Use npm script instead of direct webpack callThomas Citharel2017-05-041-1/+1
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | fix travisThomas Citharel2017-05-041-4/+3
| | |
| * | fix theme changesThomas Citharel2017-05-041-6/+6
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | 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-04197-131003/+8709
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> use scss Signed-off-by: Thomas Citharel <tcit@tcit.fr> fix build, add babel, fix annotations fixes (and improvements !) for baggy add live reload & environments & eslint & theme fixes
* | | Merge pull request #3088 from wallabag/execute-migrations-after-installJérémy Benoist2017-05-053-12/+26
|\ \ \ | | | | | | | | Added migrations execution after fresh install
| * | | Added migrations execution after fresh installNicolas Lœuillet2017-05-055-14/+28
| | | |
* | | | Merge pull request #2920 from wallabag/cleanduplicatescommandJérémy Benoist2017-05-057-2/+319
|\ \ \ \ | |/ / / |/| | | Clean Duplicates Command
| * | | Fixed testNicolas Lœuillet2017-05-051-0/+4
| | | |
| * | | Fixed @j0k3r reviewNicolas Lœuillet2017-05-052-6/+4
| | | |
| * | | Added test for deduplicationNicolas Lœuillet2017-05-054-3/+67
| | | |
| * | | Add docs for cli commandsThomas Citharel2017-05-012-0/+60
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | Add basic testsThomas Citharel2017-05-011-0/+59
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | Add Clean Duplicates CommandThomas Citharel2017-05-012-0/+132
| | | |
* | | | Merge pull request #3053 from wallabag/api-bulk-addNicolas Lœuillet2017-05-055-83/+236
|\ \ \ \ | | | | | | | | | | Added API endpoint to handle a list of URL
| * | | | Little refacto and send 400 on reaching urls limitJeremy Benoist2017-05-052-106/+97
| | | | |
| * | | | Added limitNicolas Lœuillet2017-05-015-0/+37
| | | | |
| * | | | Fix tests (for real this time)Jeremy Benoist2017-05-011-2/+2
| | | | |
| * | | | Fix testsJeremy Benoist2017-05-012-5/+4
| | | | |
| * | | | Splitted the endpoint in twoNicolas Lœuillet2017-05-012-63/+88
| | | | |
| * | | | Added API endpoint to handle a list of URLNicolas Lœuillet2017-05-012-8/+109
| |/ / / | | | | | | | | | | | | By passing an array, you can add / delete URL in mass (bulk request)
* | | | Merge pull request #3080 from wallabag/use-username-to-importNicolas Lœuillet2017-05-043-16/+41
|\ \ \ \ | | | | | | | | | | Use username to import
| * | | | Use username to importThomas Citharel2017-05-043-16/+41
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> add docs Signed-off-by: Thomas Citharel <tcit@tcit.fr> use username as default Signed-off-by: Thomas Citharel <tcit@tcit.fr> rename user to username typo Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | Merge pull request #3060 from wallabag/search-usersThomas Citharel2017-05-0417-118/+256
|\ \ \ \ | |/ / / |/| | | Search & paginate users
| * | | Merged list and search methodsNicolas Lœuillet2017-05-0215-154/+99
| | | |
| * | | rename index to listThomas Citharel2017-05-022-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | Fix testsThomas Citharel2017-05-022-5/+23
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | Add paginationThomas Citharel2017-05-023-12/+45
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | Add filter to users management pageThomas Citharel2017-05-0217-28/+170
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | Merge pull request #3079 from wallabag/update-docJérémy Benoist2017-05-0416-26/+26
|\ \ \ \ | | | | | | | | | | Fixed old links in documentation
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 09:45:55 +0000