aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-10-021-1/+1
|\
| * Remove error message when creating ePub versionsPaulino Michelazzo2016-10-021-1/+1
| | | | | | | | | | | | Trying to create a ePub version, the first page shows a message of a “missing >”. This change solve this problem (and, for sure, in any download version that’s use HTML).
* | Merge pull request #2327 from wallabag/user-managementJeremy Benoist2016-10-0227-232/+829
|\ \ | | | | | | Add users management UI
| * | Disabled delete button for the logged userJeremy Benoist2016-10-021-1/+1
| | | | | | | | | | | | To avoid some bad things to happen…
| * | Cleanup & add link on baggy menuJeremy Benoist2016-10-023-60/+1
| | |
| * | Add users management UIJeremy Benoist2016-10-0226-223/+879
| | | | | | | | | | | | | | | | | | - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation)
* | | Merge pull request #2325 from wallabag/api-entries-existsNicolas Lœuillet2016-10-021-0/+32
|\ \ \ | | | | | | | | Add an exists endpoint in API
| * | | CSJeremy Benoist2016-10-021-1/+1
| | | |
| * | | Add an exists endpoint in APIJeremy Benoist2016-10-011-0/+32
| | | | | | | | | | | | | | | | It should allow third party to check if an url was already saved by a user
* | | | Merge pull request #2328 from wallabag/avoid-duplicate-urlNicolas Lœuillet2016-10-021-1/+1
|\ \ \ \ | |_|/ / |/| | | Avoid duplicate url with accents
| * | | Avoid duplicate url with accentsJeremy Benoist2016-10-011-1/+1
| |/ /
* | | Merge pull request #2326 from wallabag/update-quickstartJeremy Benoist2016-10-0212-50/+168
|\ \ \ | | | | | | | | Changed quickstart layout
| * | | Fixed french translationNicolas Lœuillet2016-10-011-3/+3
| | | |
| * | | Changed translationsNicolas Lœuillet2016-10-0111-10/+11
| | | |
| * | | Changed quickstart layoutNicolas Lœuillet2016-10-0112-50/+167
| | | |
* | | | Merge pull request #2324 from wallabag/edit-tagging-ruleJeremy Benoist2016-10-0213-4/+58
|\ \ \ \ | | | | | | | | | | Add ability to edit a tagging rule
| * | | | CSJeremy Benoist2016-10-011-2/+2
| | | | |
| * | | | Introduce validateRuleActionJeremy Benoist2016-10-011-5/+13
| | | | |
| * | | | Add ability to edit a tagging ruleJeremy Benoist2016-10-0113-1/+47
| | |/ / | |/| |
* | | | Merge pull request #2323 from wallabag/footer-statsJeremy Benoist2016-10-0213-4/+64
|\ \ \ \ | | | | | | | | | | Add simple stats in footer
| * | | | Add simple stats in footerJeremy Benoist2016-10-0113-4/+64
| | |/ / | |/| |
* | | | Fix OC typosJeremy Benoist2016-10-0211-20/+20
| | | | | | | | | | | | | | | | + remove extra sentence
* | | | Occitan version updateQuent-in2016-10-011-24/+26
| |/ / |/| | | | | to be ready for the future of Wallabag :)
* | | Merge pull request #2322 from wallabag/v2-404Nicolas Lœuillet2016-10-015-4/+103
|\ \ \ | | | | | | | | Customize errors templates
| * | | Customize errors templatesJeremy Benoist2016-10-015-4/+103
| |/ / | | | | | | | | | All error goes to the same template which only display the error message and the status code.
* | | Fix bad template nameJeremy Benoist2016-09-301-0/+0
| | | | | | | | | | | | | | | When a user register, the template displayed saying it should now check its email was misspelled. Resulting in displaying the default one (with margin issue).
* | | Create user config in one placeJeremy Benoist2016-09-305-36/+42
|/ / | | | | | | | | | | | | | | Using a listener, user config is now created when a user: - is created from the command line - register (with or without email confirmation) - is created from the config panel
* | Removed duplicated templates filesNicolas Lœuillet2016-09-3026-494/+18
| |
* | Merge pull request #2315 from wallabag/fixes-about-upgradeNicolas Lœuillet2016-09-291-1/+1
|\ \ | | | | | | Fixes about upgrade
| * | Reordered upgrade documentationNicolas Lœuillet2016-09-281-1/+0
| | |
| * | Some fixes about upgrade from 2.0.x -> 2.1.0Nicolas Lœuillet2016-09-281-0/+1
| | |
* | | Update messages.pl.ymlMateusz Rumiński2016-09-291-2/+2
|/ / | | | | add missing translation for Instapaper importer
* | Add Instapaper translationsJeremy Benoist2016-09-2711-52/+96
| |
* | Add controller test for InstapaperJeremy Benoist2016-09-274-0/+12
| |
* | Add Instapaper importJeremy Benoist2016-09-279-3/+308
| | | | | | | | Also update ImportController with latest import (chrome, firefox & instapaper).
* | Update messages.pl.ymlMateusz Rumiński2016-09-271-12/+12
| | | | | | add missing translation for Firefox and Chrome imports
* | Merge pull request #2192 from wallabag/import-browser-bookmarksJeremy Benoist2016-09-2624-7/+747
|\ \ | | | | | | Import Firefox & Chrome bookmarks into wallabag
| * | Move prepareEntry to dedicated placeJeremy Benoist2016-09-263-35/+42
| | | | | | | | | | | | | | | Yeah first try was ugly, now each part are in the dedicated place. Also, the date is hardly truncated to 10 chars because Firefox date are 16 chars long and Chrome are 17 chars long. So instead of divised them by a huge number, I prefer to truncate them.
| * | Update Firefox fileJeremy Benoist2016-09-251-12/+24
| | | | | | | | | | | | | | | With real data, the previous looks more than a Chrome converted file. Also, fix date conversion (hope so).
| * | Fix bad date format in Browser importJeremy Benoist2016-09-253-62/+23
| | |
| * | Fixed tests by removing clear()Nicolas Lœuillet2016-09-251-4/+0
| | |
| * | fix testsThomas Citharel2016-09-253-24/+24
| | |
| * | cs & fixesThomas Citharel2016-09-255-33/+14
| | |
| * | bring chrome and firefox as separate importsThomas Citharel2016-09-2523-189/+558
| | |
| * | Indentation and renamed fixtures fileNicolas Lœuillet2016-09-259-27/+27
| | |
| * | Add Chrome path for Mac OSNicolas Lœuillet2016-09-255-14/+4
| | |
| * | Import Firefox & Chrome bookmarks into wallabagThomas Citharel2016-09-2517-7/+431
| | |
* | | Fix tag count for PostgreSQLJeremy Benoist2016-09-252-8/+6
| | |
* | | CSJeremy Benoist2016-09-253-6/+4
| | |
* | | Use scheduled entity insertions to avoid tag duplicateJeremy Benoist2016-09-253-7/+24
| | | | | | | | | | | | Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 05:54:09 +0000