aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge pull request #2584 from blankoworld/masterJeremy Benoist2016-11-143-0/+18
| |\ \ | | |/ | |/| fix #2582 - Documentation, Nginx config: disable all other PHP file from symphony
| | * fix #2582 - Nginx config: disable all other PHP file from symphonyOlivier DOSSMANN2016-11-143-0/+18
| |/ | | | | | | | | | | | | Regarding https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/ we need to limit access to config.php and make_dev.php files from Nginx. That's why we return 404 error page for these files.
| * Merge pull request #2577 from wallabag/add-tooltip-materialJeremy Benoist2016-11-141-3/+3
| |\ | | | | | | Added tooltips in header bar
| | * Added tooltips in header barNicolas Lœuillet2016-11-121-3/+3
| | |
| * | Merge pull request #2562 from wallabag/image-biggerThomas Citharel2016-11-1412-99/+176
| |\ \ | | | | | | | | Bigger image preview in case of only image content
| | * | Display a bigger image in case of image contentJeremy Benoist2016-11-0810-97/+164
| | | | | | | | | | | | | | | | | | | | | | | | If the content is only an image, we can display a bigger preview image because we won’t have text to display. Also, split different card view to avoid too much complexity in the entries.html.twig
| | * | Add `grunt watch` taskJeremy Benoist2016-11-082-2/+8
| | | |
| | * | Remove the left margin of tagJeremy Benoist2016-11-081-0/+4
| | | | | | | | | | | | | | | | In the entries list, the first tag below the link isn’t stick to the left. Now it is.
| * | | Merge pull request #2571 from wallabag/change-language-without-logoutNicolas Lœuillet2016-11-1113-12/+14
| |\ \ \ | | |_|/ | |/| | Changed behavior when we change language
| | * | Changed behavior when we change languageNicolas Lœuillet2016-11-1013-12/+14
| |/ / | | | | | | | | | No need to disconnect to apply the language substitution
| * | Merge pull request #2565 from wallabag/remove-support-websiteNicolas Lœuillet2016-11-0912-12/+12
| |\ \ | | | | | | | | Removed support website on about page
| | * | Removed support website on about pageNicolas Lœuillet2016-11-0912-12/+12
| |/ /
| * | Merge pull request #2563 from wallabag/pr-templateNicolas Lœuillet2016-11-091-8/+13
| |\ \ | | |/ | |/| Improve PR template
| | * Improve PR templateJeremy Benoist2016-11-081-8/+13
| |/
| * Merge pull request #2561 from wallabag/Rurik19-patch-2259Thomas Citharel2016-11-081-1/+1
| |\ | | | | | | fix #2559
| | * fix #2559Yuriy Evdokimov2016-11-081-1/+1
| |/
| * Merge pull request #2555 from dkrmr/fix_update_scriptNicolas Lœuillet2016-11-071-1/+1
| |\ | | | | | | Reorder variable assignation in update.sh script, fix #2554
| | * Reorder variable assignation in update.sh script, fix #2554Darius Kramer2016-11-071-1/+1
| | |
| * | Merge pull request #2556 from wallabag/replace-tokenstorageNicolas Lœuillet2016-11-072-10/+21
| |\ \ | | |/ | |/| Replaced TokenStorage with TokenStorageInterface
| | * PHP CSNicolas Lœuillet2016-11-071-3/+2
| | |
| | * Replaced TokenStorage with TokenStorageInterfaceNicolas Lœuillet2016-11-072-7/+19
| | |
| * | Merge pull request #2552 from wallabag/reading-time-roundJeremy Benoist2016-11-061-1/+1
| |\ \ | | |/ | |/| Round readingtime to avoid crazy number
| | * Round readingtime to avoid crazy numberJeremy Benoist2016-11-061-1/+1
| |/ | | | | | | Like `8.666666666667 min`
| * Merge pull request #2546 from wallabag/update-parameters-docNicolas Lœuillet2016-11-063-0/+9
| |\ | | | | | | Updated default parameters.yml file in documentation
| | * Updated default parameters.yml file in documentationNicolas Lœuillet2016-11-063-0/+9
| |/
| * Merge pull request #2545 from wallabag/update-docNicolas Lœuillet2016-11-053-18/+3
| |\ | | | | | | Update the upgrade documentation
| | * Update the upgrade documentationNicolas Lœuillet2016-11-053-18/+3
| |/
| * Merge pull request #2536 from wallabag/prepare-213Nicolas Lœuillet2016-11-046-889/+465
| |\ | | | | | | Prepare wallabag 2.1.3 :rocket:
| | * Update CHANGELOGNicolas Lœuillet2016-11-042-920/+458
| | | | | | | | | | | | Usage of github-changes from @lalitkapoor
| | * Prepare wallabag 2.1.3 :rocket:Nicolas Lœuillet2016-11-046-19/+57
| |/
| * Merge pull request #2460 from wallabag/ui-changesNicolas Lœuillet2016-11-0413-135/+233
| |\ | | | | | | UI Changes
| | * Deal with more resolution issuesThomas Citharel2016-11-034-6/+22
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| | * Fix resolution issues and 'title' issuesThomas Citharel2016-11-036-36/+47
| | | | | | | | | | | | | | | | | | Also, modify editorconfig for css files. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| | * Re-add bottom paginationJeremy Benoist2016-10-2210-76/+68
| | | | | | | | | | | | Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
| | * remove padding on small widthsThomas Citharel2016-10-223-2/+6
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| | * WIPThomas Citharel2016-10-225-59/+134
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | Merge pull request #2534 from wallabag/default-sortNicolas Lœuillet2016-11-041-1/+1
| |\ \ | | | | | | | | Use created_at as default sort
| | * | Use created_at as default sortJeremy Benoist2016-11-041-1/+1
| |/ / | | | | | | | | | | | | Imported content use the real creation date. If we sort by id, it'll display contents in reverse order.
* | | Merge pull request #2600 from wallabag/install-assetsJeremy Benoist2016-11-191-0/+2
|\ \ \ | | | | | | | | Install assets for shortcuts
| * | | Install assets for shortcutsJeremy Benoist2016-11-181-0/+2
| | | |
* | | | Merge pull request #2601 from wallabag/store-http-statusNicolas Lœuillet2016-11-1923-0/+196
|\ \ \ \ | |/ / / |/| | | Added http_status in Entry entity
| * | | Check if status code is OKNicolas Lœuillet2016-11-182-0/+24
| | | |
| * | | Replace http status with a stringNicolas Lœuillet2016-11-182-3/+3
| | | | | | | | | | | | | | | | I don't want to have 0 if we don't fetch status code, I think it's better to have an empty string, mainly for filters
| * | | Added http_status in Entry entityNicolas Lœuillet2016-11-1823-0/+172
|/ / /
* | | Merge pull request #2593 from wallabag/test-clarifyJeremy Benoist2016-11-187-28/+28
|\ \ \ | | | | | | | | Put log in the most common failure tests
| * | | Fix testsJeremy Benoist2016-11-171-5/+5
| | | |
| * | | Put log in the most common failure testsJeremy Benoist2016-11-177-26/+26
| | | | | | | | | | | | | | | | So we’ll quickly be able to see what kind of test is failing when viewing Travis
* | | | Merge pull request #2592 from wallabag/mruminski-patch-1Jeremy Benoist2016-11-171-3/+3
|\ \ \ \ | |/ / / |/| | | Update messages.pl.yml
| * | | Update messages.pl.ymlMateusz Rumiński2016-11-171-3/+3
|/ / / | | | | | | translate action_mark_as_read section to polish
* | | Merge pull request #2547 from wallabag/add-option-markasreadJeremy Benoist2016-11-1728-39/+335
|\ \ \ | | | | | | | | Added a configuration to define the redirection after archiving an entry