aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Re-add one missing eventsave-changesJeremy Benoist2017-05-302-0/+5
|
* Save changesThomas Citharel2017-05-3011-7/+397
| | | | | | | | | | | | | | | | | | PHP CS Fixed Events on changes Renamed field First draft for migration (create table Change) Added setter for tag in EntryTaggedEvent Fixed migration for Change table Added API route for entry history Removed deletion history
* Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-302-2/+2
|\
| * Merge pull request #3146 from DamienCassou/fix-doc-urlJérémy Benoist2017-05-242-2/+2
| |\ | | | | | | Fix documentation URL for "How can I help to fix that?"
| | * Fix documentation URL for "How can I help to fix that?"Damien Cassou2017-05-242-2/+2
| |/
* | Merge pull request #3147 from wallabag/delete-confirmJérémy Benoist2017-05-3017-20/+65
|\ \ | | | | | | Add some deletion confirmation to avoid mistake
| * \ Merge pull request #3160 from wallabag/mruminski-patch-1Jérémy Benoist2017-05-301-8/+8
| |\ \ | | | | | | | | Update messages.pl.yml
| | * | Update messages.pl.ymlMateusz Rumiński2017-05-291-8/+8
| |/ / | | | | | | add missing translation
| * | update :de: messages.de.ymlSven Fischer2017-05-291-8/+8
| | |
| * | Add some deletion confirmation to avoid mistakeJeremy Benoist2017-05-2417-8/+53
| | |
* | | Merge pull request #3153 from wallabag/content-proxy-refactorThomas Citharel2017-05-2820-202/+266
|\ \ \ | |/ / |/| | Move Tags assigner to a separate file
| * | CSThomas Citharel2017-05-281-6/+0
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | CSThomas Citharel2017-05-284-5/+1
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | Move Tags assigner to a separate fileThomas Citharel2017-05-2720-200/+274
|/ / | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #3145 from wallabag/fix-soJérémy Benoist2017-05-241-4/+4
|\ \ | | | | | | Fix SO tests
| * | Fix SO testsJeremy Benoist2017-05-241-4/+4
|/ / | | | | | | SO switched to http yesterday
* | Switch back to latest guzzle-site-authenticatorJeremy Benoist2017-05-241-1/+1
| |
* | Merge pull request #3133 from wallabag/testing-travis-failureJérémy Benoist2017-05-193-37/+29
|\ \ | | | | | | Let's play !
| * | Ensure download_images_enabled is disabledJeremy Benoist2017-05-191-1/+20
| | | | | | | | | | | | | | | Even if the tests fail, that config must stay disabled after the test. Otherwise it might timeout on other test (because it'll try to save all other images)
| * | Fold migrations & fixtures command on TravisJeremy Benoist2017-05-192-36/+9
|/ /
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-1923-630/+753
|\|
| * Merge pull request #3130 from X-dark/masterJérémy Benoist2017-05-1913-13/+13
| |\ | | | | | | unify Download/Export wording.
| | * modify key name as wellCedric Girard2017-05-1813-13/+13
| | |
| | * unify Download/Export wording.Cedric Girard2017-05-189-9/+9
| |/ | | | | | | This fixes #2967
| * Merge pull request #3125 from wallabag/prepare-222Jérémy Benoist2017-05-172-601/+651
| |\ | | | | | | Prepare wallabag 2.2.3
| | * Prepare wallabag 2.2.3Nicolas Lœuillet2017-05-172-601/+651
| |/
| * Merge pull request #3117 from wallabag/fix-docNicolas Lœuillet2017-05-173-9/+10
| |\ | | | | | | Fixed documentation URL
| | * Fixed documentation URLNicolas Lœuillet2017-05-173-9/+10
| |/
| * Merge pull request #3124 from wallabag/lock-guzzle-authNicolas Lœuillet2017-05-172-7/+1
| |\ | | | | | | Lock guzzle-site-authenticator to avoid errors
| | * Lock guzzle-site-authenticator to avoid errorJeremy Benoist2017-05-162-7/+1
| |/
| * Merge pull request #3123 from X-dark/masterJérémy Benoist2017-05-161-1/+1
| |\ | | | | | | reorder contrib strings in about page
| | * reorder contrib strings in about pageCedric Girard2017-05-161-1/+1
| |/ | | | | | | this fixes #2891
| * Merge pull request #3095 from aaa2000/api-error-on-fail-fetch-contentThomas Citharel2017-05-102-4/+47
| |\ | | | | | | Create a new entry via API even when its content can't be retrieved
| | * Remove the created entry to avoid side effects on other testsadev2017-05-091-8/+18
| | |
| | * Create a new entry via API even when its content can't be retrievedadev2017-05-082-4/+37
| | | | | | | | | | | | Fix #2988
| * | Merge pull request #3076 from wallabag/hotfix/2979Nicolas Lœuillet2017-05-092-1/+30
| |\ \ | | | | | | | | Disable negative numbers in filters
| | * | Add some testsJeremy Benoist2017-05-092-3/+29
| | | |
| | * | Disable negative numbers in filtersMaxime Marinel2017-05-031-0/+3
| | | |
* | | | Update of the oc version of CoreBundleQuent-in2017-05-181-13/+13
| | | | | | | | | | | | I hope I didn't break everything with the ' and ".
* | | | Merge pull request #3122 from wallabag/delete-docThomas Citharel2017-05-17143-11106/+0
|\ \ \ \ | | | | | | | | | | Removed embedded documentation
| * | | | Removed embedded documentationNicolas Lœuillet2017-05-16143-11106/+0
|/ / / /
* | | | Merge pull request #3120 from aaa2000/fix-delete-annotation-userJérémy Benoist2017-05-153-2/+7
|\ \ \ \ | | | | | | | | | | Fix delete annotation when username is defined
| * | | | Fix delete annotation when username is definedadev2017-05-143-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an user set his name in "Config" > "User Information", he can't delete or update an annotation Fix #2382
* | | | | Merge pull request #3113 from wallabag/upgrade-craueJérémy Benoist2017-05-155-13/+14
|\ \ \ \ \ | | | | | | | | | | | | Upgraded CraueConfigBundle to 2.0
| * | | | | Upgraded CraueConfigBundle to 2.0Nicolas Lœuillet2017-05-125-13/+14
| |/ / / /
* | | | | Merge pull request #3110 from wallabag/add-logger-matching-rulesNicolas Lœuillet2017-05-123-2/+35
|\ \ \ \ \ | |/ / / / |/| | | | Added logger when we match Tagging rules
| * | | | Added tests on logs recordsNicolas Lœuillet2017-05-121-3/+22
| | | | |
| * | | | Fixed testsNicolas Lœuillet2017-05-121-1/+7
| | | | |
| * | | | Added logger when we match Tagging rulesNicolas Lœuillet2017-05-122-1/+9
|/ / / /
* | | | Merge pull request #3108 from wallabag/store-headersNicolas Lœuillet2017-05-114-4/+93
|\ \ \ \ | | | | | | | | | | Added headers field in Entry
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 05:14:31 +0000