aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Re-use FOSUser master branchJeremy Benoist2016-11-221-2/+3
|
* These files aren’t used anymoreJeremy Benoist2016-11-227-14/+0
| | | | Translation were moved to the global one
* Merge pull request #2317 from wallabag/restricted-accessJeremy Benoist2016-11-2215-0/+61
|\ | | | | Added authentication for restricted access articles
| * Added documentation and missing translationsNicolas Lœuillet2016-11-2211-0/+11
| |
| * Added internal setting to enable/disable articles with paywallNicolas Lœuillet2016-11-222-0/+46
| |
| * Added authentication for restricted access articlesBertrand Dunogier2016-11-222-0/+4
| | | | | | | | Fix #438. Thank you so much @bdunogier
* | Added help about shortcutsNicolas Lœuillet2016-11-222-2/+2
|/
* Merge pull request #2613 from wallabag/fix-overlapThomas Citharel2016-11-221-0/+4
|\ | | | | Fix card action overlap
| * Fix card action overlapJeremy Benoist2016-11-201-0/+4
| | | | | | | | On smaller resolution
* | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-211-2/+4
|\ \
| * \ Merge pull request #2624 from Rurik19/masterJeremy Benoist2016-11-211-1/+3
| |\ \ | | | | | | | | Fix #2056 update config.yml
| | * | wrong spacesYuriy Evdokimov2016-11-211-2/+2
| | | |
| | * | Fix #2056 update config.ymlYuriy Evdokimov2016-11-211-1/+3
| | | | | | | | | | | | Resolves refresh token lifetime issue
| * | | Prepare wallabag 2.1.5 :rocket:Nicolas Lœuillet2016-11-211-1/+1
| |/ /
* | | Add ability to use Redis with passwordJeremy Benoist2016-11-201-0/+1
| | |
* | | Add missing translationsJeremy Benoist2016-11-2012-1/+16
| |/ |/|
* | Added shortcutNicolas Lœuillet2016-11-193-0/+14
| |
* | Added testsNicolas Lœuillet2016-11-191-1/+1
| |
* | Added a simple search engineNicolas Lœuillet2016-11-192-4/+8
| | | | | | | | Fix #18
* | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-193-25/+123
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .editorconfig # docs/de/index.rst # docs/de/user/import.rst # docs/en/index.rst # docs/en/user/configuration.rst # docs/en/user/import.rst # docs/fr/index.rst # docs/fr/user/import.rst # src/Wallabag/CoreBundle/Command/InstallCommand.php # src/Wallabag/CoreBundle/Resources/translations/messages.da.yml # src/Wallabag/CoreBundle/Resources/translations/messages.de.yml # src/Wallabag/CoreBundle/Resources/translations/messages.en.yml # src/Wallabag/CoreBundle/Resources/translations/messages.es.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml # src/Wallabag/CoreBundle/Resources/translations/messages.it.yml # src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml # src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml # src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml # src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig # web/bundles/wallabagcore/themes/baggy/css/style.min.css # web/bundles/wallabagcore/themes/baggy/js/baggy.min.js # web/bundles/wallabagcore/themes/material/css/style.min.css # web/bundles/wallabagcore/themes/material/js/material.min.js
| * Change version to 2.2.0-devNicolas Lœuillet2016-11-191-1/+1
| |
| * Prepare wallabag 2.1.4 :rocket:Nicolas Lœuillet2016-11-181-1/+1
| |
| * Changed display for material themeNicolas Lœuillet2016-11-141-2/+1
| |
| * Added creation date on entries viewNicolas Lœuillet2016-11-142-2/+3
| |
| * Display a bigger image in case of image contentJeremy Benoist2016-11-081-1/+6
| | | | | | | | | | | | 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
| * 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.
| * Prepare wallabag 2.1.3 :rocket:Nicolas Lœuillet2016-11-041-1/+1
| |
| * Merge pull request #2460 from wallabag/ui-changesNicolas Lœuillet2016-11-042-22/+111
| |\ | | | | | | UI Changes
| | * Deal with more resolution issuesThomas Citharel2016-11-031-1/+17
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| | * Fix resolution issues and 'title' issuesThomas Citharel2016-11-031-2/+9
| | | | | | | | | | | | | | | | | | Also, modify editorconfig for css files. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| | * Re-add bottom paginationJeremy Benoist2016-10-221-1/+0
| | | | | | | | | | | | 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-221-1/+0
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| | * WIPThomas Citharel2016-10-221-17/+85
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Replace http status with a stringNicolas Lœuillet2016-11-181-1/+1
| | | | | | | | | | | | 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-181-0/+47
| | |
* | | Fix migrationJeremy Benoist2016-11-172-8/+14
| | |
* | | Added a configuration to define the redirection after archiving an entryNicolas Lœuillet2016-11-161-0/+42
| | | | | | | | | | | | Fix #496
* | | Added CSS class on linksNicolas Lœuillet2016-11-162-8/+8
| | |
* | | Fix keyboard navigation on quickstart viewThomas Citharel2016-11-151-0/+5
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | fix next/prev pageThomas Citharel2016-11-152-13/+6
| | |
* | | Bring navigation (with right, left and enter) on material entries page. ↵Thomas Citharel2016-11-157-24/+105
| | | | | | | | | | | | | | | | | | | | | | | | Supports going to next and previous page ! Also better indentation for js files (changed editorconfig for them). Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Reorganized JS folders for shortcutsNicolas Lœuillet2016-11-159-46/+71
| | |
* | | es6 importsThomas Citharel2016-11-156-39/+44
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Added new shortcutsNicolas Lœuillet2016-11-152-2/+36
| | |
* | | Changed FOSJSRouting format in configNicolas Lœuillet2016-11-151-1/+12
| | |
* | | Added shortcutsNicolas Lœuillet2016-11-154-0/+19
| | |
* | | Added unmark.it sharingNicolas Lœuillet2016-11-0916-0/+62
| | | | | | | | | | | | Fix #668
* | | Merge pull request #2548 from wallabag/pinboardJeremy Benoist2016-11-081-0/+13
|\ \ \ | | | | | | | | Add Pinboard import
| * | | Add Pinboard importJeremy Benoist2016-11-041-0/+13
| | | |
* | | | Removed Maintenance bundleNicolas Lœuillet2016-11-062-11/+0
|/ / /