Commit graph

4160 commits

Author SHA1 Message Date
Jérémy Benoist
d83d25dade Merge pull request #3323 from egilli/fix-export-link-with-baggy
Fix export links in baggy theme
2017-08-14 17:45:16 +02:00
Étienne Gilli
aa29fc4ec6 Fix export links in baggy theme 2017-08-13 18:03:32 +02:00
Jérémy Benoist
73b3d449b1 Merge pull request #3322 from braco/patch-1
Update Readme with crucial information
2017-08-12 09:32:51 +02:00
braco
d0804524a1 Update Readme with crucial information 2017-08-10 14:54:58 -04:00
Jérémy Benoist
4d2758dfa0 Merge pull request #3319 from Quent-in/2.3
Translation : OC small changes
2017-08-10 10:13:09 +02:00
Quent-in
0d7d472c91 Small change
Apostrophe par erreur, et "aller À votre compte" et non "sur", pas choquant mais mieux je pense en OC.
2017-08-09 18:40:19 +02:00
Jérémy Benoist
86ecd2b543 Merge pull request #3314 from nclsHart/fix-3313
Reduce number of queries on tag list
2017-08-08 19:48:47 +02:00
Jérémy Benoist
aff1dd4ff1 Merge pull request #3317 from wallabag/mruminski-patch-1
Update messages.pl.yml
2017-08-08 19:38:43 +02:00
Mateusz Rumiński
e86ee7fd1e Update messages.pl.yml
add polish translation for credentials
2017-08-08 15:45:44 +02:00
Nicolas Hart
935e9fffb4 Reduce number of queries on tag list 2017-08-06 23:02:32 +02:00
Jérémy Benoist
f11a3cf21c Merge pull request #3312 from Quent-in/2.3
Occitan language updates
2017-08-06 15:39:04 +02:00
Quent-in
1aa5b75804 Correction apostrophe encadrée par simples apostrophes 2017-08-05 20:20:18 +02:00
Quent-in
efeaadcf9d Correction indent. L538
Correction indentation suite rapport Travis
2017-08-05 19:48:45 +02:00
Jérémy Benoist
fccc3a2e07 Merge pull request #3311 from nclsHart/makefile-webpack
Fix make build by replacing grunt with webpack
2017-08-05 19:19:09 +02:00
Quent-in
162740b798 Update
2FA : choix des occitanophones interrogés : autentificacion en dos temps.
+ fautes de frappes
2017-08-05 15:19:34 +02:00
Quent-in
86de3eb766 Update OC: correction fautes de frappe 2017-08-05 15:14:34 +02:00
Quent-in
5942d358b7 Update with new strings
L538 : not quite sure about the number of space.
2017-08-05 14:58:15 +02:00
Quent-in
a4fcb2e5c6 Update registration using API 2017-08-05 14:46:33 +02:00
Nicolas Hart
5385fda8ab Fix make build by replacing grunt with webpack 2017-08-05 00:21:05 +02:00
Jérémy Benoist
8b5bef48d5 Merge pull request #3301 from nclsHart/list-user-command
Add list users command
2017-08-02 07:25:02 +02:00
Nicolas Hart
f7a4b44136 add search argument and limit option to list users command 2017-07-31 23:20:41 +02:00
Nicolas Hart
af31cfed76 Add list user command 2017-07-30 22:04:29 +02:00
Jérémy Benoist
882da5c5eb Merge pull request #3297 from nclsHart/commands-better-rendering
Better rendering for all core commands
2017-07-30 08:31:04 +02:00
Jérémy Benoist
4fc7eba349 Merge pull request #3298 from nclsHart/fix-namespace-phpdoc
Fix some namespaces and phpdoc
2017-07-30 08:27:39 +02:00
Jérémy Benoist
e492f8da13 Merge pull request #3299 from nclsHart/missing-method-prepare-entry
Add missing abstract method prepareEntry in BrowserImport
2017-07-30 08:10:50 +02:00
Nicolas Hart
fe312015d2 Add missing abstract method prepareEntry in BrowserImport 2017-07-29 22:59:11 +02:00
Nicolas Hart
52b84c11a5 Fix some namespaces and phpdoc 2017-07-29 22:51:50 +02:00
Nicolas Hart
e1b33efb3d Better rendering for all core commands 2017-07-29 11:09:02 +02:00
Jérémy Benoist
d69a66a58e Merge pull request #3290 from nclsHart/fix-3019
Add a dedicated title for all entries page
2017-07-29 09:34:29 +02:00
Jeremy Benoist
bde23a44f8
Empty currentTag should be null
And when a parameter is null, it won't appear in the url like `?tag=`.
2017-07-28 08:07:11 +02:00
Jérémy Benoist
233eb91be4 Merge pull request #3291 from nclsHart/show-user-io
Better rendering for show user command using symfony style
2017-07-28 07:38:15 +02:00
Jérémy Benoist
e56f82142a Merge pull request #3292 from nclsHart/remove-getdoctrine
Remove unused method getDoctrine in several commands
2017-07-28 07:36:27 +02:00
Jérémy Benoist
6f9aba78a7 Merge pull request #3293 from nclsHart/remove-unused-use
Remove unused use statement in install command
2017-07-28 07:35:48 +02:00
Nicolas Hart
04f19537e7 Remove unused use statement in install command 2017-07-27 23:51:01 +02:00
Nicolas Hart
a19e212f43 Remove unused method getDoctrine in several commands 2017-07-27 23:44:12 +02:00
Nicolas Hart
d58199f362 Better rendering for show user command using symfony style 2017-07-27 23:34:57 +02:00
Nicolas Hart
383215866f add a dedicated title for all entries page 2017-07-27 23:08:08 +02:00
Jérémy Benoist
839edf32cc Merge pull request #3280 from Simounet/fix/2.3-date
Fix updatePublishedAt on already parsed article's date
2017-07-25 16:54:43 +02:00
Jérémy Benoist
35c1f1376c Merge pull request #3284 from wallabag/travis-7.2
Testing on PHP 7.2
2017-07-24 17:38:41 +02:00
Jeremy Benoist
ff9f89fd23
Add a test for updatePublishedAt
To avoid error when a content is re-submitted and it previously add a
published date.

Also, fix the `testPostSameEntry`
2017-07-24 17:07:47 +02:00
Simounet
b236d3f627
Fix updatePublishedAt on already parsed article's date 2017-07-24 16:39:07 +02:00
Jérémy Benoist
9ab45e6813 Testing on PHP 7.2 2017-07-24 15:48:53 +02:00
Jérémy Benoist
ea127a401b Merge pull request #3283 from wallabag/fix-language-validation
Put the final URL in data test
2017-07-24 13:54:01 +02:00
Jeremy Benoist
459374022f
CS 2017-07-24 11:52:43 +02:00
Jeremy Benoist
c6c45673af
Put the final URL in data test 2017-07-24 11:13:53 +02:00
Jérémy Benoist
f39152ad6e Merge pull request #3266 from egilli/export-domain-as-author
Use the article publisher as author for exported files
2017-07-11 09:21:49 +02:00
Jérémy Benoist
c7fcca533d Merge pull request #3270 from wallabag/do-not-allow-html-api
Disallow html for API templating formats
2017-07-11 07:30:30 +02:00
Jérémy Benoist
9aa11176b8 Merge pull request #3264 from wallabag/trait-timestamps
Add EntityTimestampsTrait to handle dates
2017-07-11 07:30:08 +02:00
Étienne Gilli
eeabca8090 Make updateAuthor code simpler to read 2017-07-10 10:08:20 +02:00
Jérémy Benoist
337e807297 Merge pull request #3267 from wallabag/revert-client-credentials
Revert client_credentials grant types
2017-07-09 21:22:28 +02:00