aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #3138 from Kdecherf/2835-tagsNicolas Lœuillet2017-05-312-5/+7
|\ \ \
| * | | TagController: ignore ActionMarkAsRead when removing tag from entryKevin Decherf2017-05-312-5/+7
* | | | Merge pull request #3161 from wallabag/scrutinizer-2.3Nicolas Lœuillet2017-05-313-11/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | CSJeremy Benoist2017-05-301-1/+1
| * | | Use a better way to set input for commandJeremy Benoist2017-05-301-1/+0
| * | | Fix some Scrutinizer issuesJeremy Benoist2017-05-303-10/+5
| | |/ | |/|
* | | Merge pull request #3143 from wallabag/fix-wllbg2-importNicolas Lœuillet2017-05-311-2/+2
|\ \ \ | |_|/ |/| |
| * | Add testsJeremy Benoist2017-05-301-2/+2
| * | Fixed is_starred for wallabag v2 importNicolas Lœuillet2017-05-241-1/+1
* | | Merge pull request #3065 from wallabag/api-creation-endpointJérémy Benoist2017-05-304-7/+171
|\ \ \ | |_|/ |/| |
| * | Remove unknown validation_groupsJeremy Benoist2017-05-301-3/+1
| * | Re-use `NewUserType` to validate registrationJeremy Benoist2017-05-302-43/+101
| * | WIPThomas Citharel2017-05-293-0/+108
* | | Merge pull request #3147 from wallabag/delete-confirmJérémy Benoist2017-05-3017-20/+65
|\ \ \ | |/ / |/| |
| * | Update messages.pl.ymlMateusz Rumiński2017-05-291-8/+8
| * | update :de: messages.de.ymlSven Fischer2017-05-291-8/+8
| * | Add some deletion confirmation to avoid mistakeJeremy Benoist2017-05-2417-8/+53
| |/
* | CSThomas Citharel2017-05-284-5/+1
* | Move Tags assigner to a separate fileThomas Citharel2017-05-2711-64/+105
|/
* Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-1918-28/+47
|\
| * modify key name as wellCedric Girard2017-05-1813-13/+13
| * unify Download/Export wording.Cedric Girard2017-05-189-9/+9
| * Fixed documentation URLNicolas Lœuillet2017-05-173-9/+10
| * reorder contrib strings in about pageCedric Girard2017-05-161-1/+1
| * Merge pull request #3095 from aaa2000/api-error-on-fail-fetch-contentThomas Citharel2017-05-101-4/+13
| |\
| | * Create a new entry via API even when its content can't be retrievedadev2017-05-081-4/+13
| * | Merge pull request #3076 from wallabag/hotfix/2979Nicolas Lœuillet2017-05-091-1/+10
| |\ \
| | * | Add some testsJeremy Benoist2017-05-091-3/+9
| | * | Disable negative numbers in filtersMaxime Marinel2017-05-031-0/+3
* | | | Update of the oc version of CoreBundleQuent-in2017-05-181-13/+13
* | | | Added logger when we match Tagging rulesNicolas Lœuillet2017-05-122-1/+9
* | | | Replaced json_array with arrayNicolas Lœuillet2017-05-111-4/+4
* | | | Added headers field in EntryNicolas Lœuillet2017-05-112-1/+34
* | | | Merge pull request #3101 from wallabag/credentials-new-extrafieldsJérémy Benoist2017-05-103-9/+31
|\ \ \ \
| * | | | Handle empty configurationJeremy Benoist2017-05-101-1/+1
| * | | | Skip auth when no credentials are foundJeremy Benoist2017-05-093-9/+31
* | | | | Retrieve tag / tags value from query or requestJeremy Benoist2017-05-091-2/+2
|/ / / /
* | | | Merge pull request #2751 from bdunogier/2.2-guzzle_subscribers_improvementJérémy Benoist2017-05-093-11/+48
|\ \ \ \
| * | | | CSJeremy Benoist2017-05-091-1/+1
| * | | | Changed parsing of login_extra_fields in guzzle authBertrand Dunogier2017-05-041-1/+27
| * | | | Improved Guzzle subscribers extensibilityBertrand Dunogier2017-05-042-9/+20
* | | | | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-096-5/+15
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update graby* licensesJérémy Benoist2017-05-091-2/+2
| * | | | Fix API pagination is broken if perPage is custom valueadev2017-05-081-1/+2
| | |_|/ | |/| |
| * | | Translate error message in login pageadev2017-05-061-1/+1
| * | | Fix display the form errors correctlyadev2017-05-054-1/+11
| | |/ | |/|
* | | Merge pull request #3022 from wallabag/webpackThomas Citharel2017-05-098-75/+77
|\ \ \
| * | | Fix review againThomas Citharel2017-05-071-36/+38
| * | | Fix reviewsAline2017-05-073-8/+7
| * | | Fix according to reviewThomas Citharel2017-05-041-1/+1