Commit graph

3898 commits

Author SHA1 Message Date
Jeremy Benoist
c07ec4b682
Merge remote-tracking branch 'origin/master' into 2.3 2017-06-06 20:15:21 +02:00
Jérémy Benoist
6ed2627bb3 Merge pull request #3177 from wallabag/api-create-user-update
API user creation behing a toggle
2017-06-06 15:25:05 +02:00
Jérémy Benoist
9fe87bc2e2 Merge pull request #3165 from wallabag/it-translation-update
Update Italian translation
2017-06-06 11:44:18 +02:00
Jérémy Benoist
438329be46 Merge pull request #3180 from wallabag/mruminski-patch-1
Update PL translation
2017-06-02 21:02:07 +02:00
Jeremy Benoist
a1e6187406
Return 201 on user creation 2017-06-02 20:03:25 +02:00
Mateusz Rumiński
d0f7b0cc60 Update PL transation
add missing translation
2017-06-02 19:35:25 +02:00
Jérémy Benoist
044079967b Add 🇮🇹 translation 2017-06-02 11:45:45 +02:00
Jeremy Benoist
bf7f0cb5a3
Use a dedicated file for wallabag config 2017-06-02 11:33:11 +02:00
Jeremy Benoist
1b9cd91782
Add translation 2017-06-02 11:32:38 +02:00
Jeremy Benoist
426bb453d2
API user creation behing a toggle
I've added a toggle feature (in internal settings) so that user api creation can be disabled while form registration still can be enabled.
Also, the /api/user endpoint shouldn't require authentication. Even if we check the authentication when sending a GET request, to retrieve current user information.

I've moved all the internal settings definition to config to avoid duplicated place to define them.
I don't know why we didn't did that earlier.
2017-06-02 11:32:38 +02:00
Jérémy Benoist
a687c8d915 Merge pull request #2708 from jcharaoui/import-disablecontentupdate
Import disableContentUpdate
2017-06-02 11:26:37 +02:00
Jérémy Benoist
d06a1ebdfb Update messages.it.yml 2017-06-02 09:17:45 +02:00
Nicolas Lœuillet
14b8a7c950 Merge pull request #3176 from wallabag/fix-image-download
Replace images with & in url
2017-06-02 09:12:11 +02:00
Jeremy Benoist
9bf7752f73
CS 2017-06-01 22:58:38 +02:00
Jeremy Benoist
fcad69a427
Replace images with &
Images with `&` in the path weren’t well replaced because they might be with `&` in the html instead.

Replacing `&` with `&` fix the problem.
2017-06-01 22:50:33 +02:00
Jeremy Benoist
f5924e9547
Fix option attributes 2017-06-01 15:44:36 +02:00
Nicolas Lœuillet
5901516805 Merge pull request #3171 from wallabag/drop-fucking-sqlite
Defined MySQL as the default rdbms for wallabag
2017-06-01 14:46:01 +02:00
Jeremy Benoist
701d3066fb
We don't need that getter 2017-06-01 12:46:07 +02:00
Jeremy Benoist
ec97072152
No need to catch that Exception 2017-06-01 11:45:02 +02:00
Jeremy Benoist
6acadf8e98
Rewrote code & fix tests 2017-06-01 11:31:45 +02:00
Jérémy Benoist
5d03e2d1a5 Merge pull request #3172 from wallabag/more-scruti
More Scrutinizer issues fixed
2017-06-01 10:29:32 +02:00
Jeremy Benoist
843182c7cf
CS 2017-06-01 09:52:09 +02:00
Jeremy Benoist
d5c2cc54b5
Fix tests 2017-06-01 09:49:15 +02:00
Jeremy Benoist
432a24f502
CS 2017-06-01 09:48:14 +02:00
Jerome Charaoui
704803e182
Replace Wallabag v1 error strings with v2 strings 2017-06-01 09:48:14 +02:00
Jerome Charaoui
d0e9b3d640
Add disableContentUpdate import option
This commit also decouples the "import" and "update" functions inside
ContentProxy. If a content array is available, it must be passed to the
new importEntry method.
2017-06-01 09:48:14 +02:00
Jerome Charaoui
1c5da417e4
Put default fetching error title in global config 2017-06-01 09:43:01 +02:00
Jerome Charaoui
7aba665e48
Avoid returning objects passed by reference.
Objects are always passed by reference, so it doesn't make sense to
return an object which is passed by reference as it will always be the
same object. This change makes the code a bit more readable.
2017-06-01 09:43:01 +02:00
Jeremy Benoist
3a6af6c580
fixup! Set the right variable type 2017-06-01 09:36:01 +02:00
Jeremy Benoist
10bf812a9e
Both parameter wasn't used in the function, removing them 2017-06-01 09:30:38 +02:00
Jeremy Benoist
c3f7a2ca70
Set the right variable type 2017-06-01 09:30:20 +02:00
Jeremy Benoist
53da8ad844
Page parameter was never used in the function
It could have been used if we set the current page inside PreparePagerForEntries.
But we did that in each controller because we can have an OutOfRangeCurrentPageException
2017-06-01 09:29:18 +02:00
Nicolas Lœuillet
ec42e697ea
Changed default database name 2017-06-01 09:17:05 +02:00
Jérémy Benoist
2a0eec07a5 Merge pull request #3137 from aaa2000/isolated-tests
Isolated tests
2017-06-01 07:58:17 +02:00
Nicolas Lœuillet
46825cfffb
Fixed @tcitworld 's review 2017-05-31 22:50:18 +02:00
Nicolas Lœuillet
7d5e84fec1
Defined MySQL as the default rdbms for wallabag 2017-05-31 22:36:21 +02:00
Nicolas Lœuillet
2e05858e1a
Updated 🇮🇹 translations
Thank you @matteocoder
2017-05-31 22:20:44 +02:00
Nicolas Lœuillet
757ec837be Merge pull request #3077 from wallabag/add-tags-list-view
Added tags on list view
2017-05-31 21:18:14 +02:00
Nicolas Lœuillet
84b041e87f
Reduced border-radius for tags 2017-05-31 20:31:35 +02:00
Jérémy Benoist
ec8e7ffad4 Merge pull request #3106 from wallabag/api-content
Allow other fields to be send using API
2017-05-31 17:26:05 +02:00
adev
7ab5eb9508 Isolated tests
Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation.
2017-05-31 16:03:54 +02:00
Thomas Citharel
91775f36fe Add some flex magic
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-31 14:34:46 +02:00
Jérémy Benoist
4368a27152
PR has been merged in graby 2017-05-31 14:00:15 +02:00
Jeremy Benoist
695af58857
Fix tests following rebase 2017-05-31 14:00:15 +02:00
Jeremy Benoist
38a04dee34
CS 2017-05-31 14:00:15 +02:00
Jeremy Benoist
f0378b4d7c
Forced date can now be a timestamp too
Add adding more tests for forced content
2017-05-31 14:00:15 +02:00
Jeremy Benoist
9e349f08a6
Improve docs 2017-05-31 14:00:15 +02:00
Jeremy Benoist
0d6cfb884c
Remove htmlawed and use graby instead
Instead of using htmlawed (which is already used in graby) use graby directly (which require some refacto on graby side).
Still needs some tests.
2017-05-31 14:00:15 +02:00
Jeremy Benoist
cf05a1ae34
Reduce imported entries
Down from 2.2 minutes to 1.39 minutes
2017-05-31 14:00:15 +02:00
Jeremy Benoist
74a75f7d43
Use graby ContentExtractor to clean html
It might be better to re-use some graby functionalities to clean html instead of building a new system.
2017-05-31 14:00:15 +02:00