Commit graph

3694 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
53e1892eb6 Merge pull request #3237 from matteocoder/master
Revised messages.it.yml file
2017-06-26 10:00:35 +02:00
matteocoder
559cbfdc2f Fixed broken lines and added new lines
In addition to fixing broken lines, I've also added a couple of lines from recent PRs.
2017-06-24 11:06:09 +02:00
matteocoder
fbb39b61bd Merge pull request #1 from matteocoder/matteocoder-messages.it
revised messages.it
2017-06-17 13:42:50 +02:00
matteocoder
508f248676 revised messages.it 2017-06-17 13:42:28 +02:00
Jérémy Benoist
a3477df5c9 Merge pull request #3202 from pVesian/master
Config label improvement #3199
2017-06-10 13:14:42 +02:00
Jeremy Benoist
3fd6790893
Update translations 2017-06-10 11:29:56 +02:00
Pierre de Vésian
491371a051 Config label improvement #3199 2017-06-09 12:11:48 +02:00
Nicolas Lœuillet
d716495f6c Merge pull request #3167 from wallabag/doc-github-template
Fix link in Github template
2017-05-31 09:06:21 +02:00
Jérémy Benoist
78de00e831 Fix link in Github template 2017-05-31 07:12:55 +02:00
Jérémy Benoist
82a590fddd Merge pull request #3146 from DamienCassou/fix-doc-url
Fix documentation URL for "How can I help to fix that?"
2017-05-24 13:54:57 +02:00
Damien Cassou
ac1509a66b
Fix documentation URL for "How can I help to fix that?" 2017-05-24 12:57:46 +02:00
Jérémy Benoist
f87e6547e8 Merge pull request #3130 from X-dark/master
unify Download/Export wording.
2017-05-19 10:07:01 +02:00
Cedric Girard
5f82fc23a7 modify key name as well 2017-05-18 17:17:21 +02:00
Cedric Girard
1dd76ac650 unify Download/Export wording.
This fixes #2967
2017-05-18 15:23:48 +02:00
Jérémy Benoist
6830d92558 Merge pull request #3125 from wallabag/prepare-222
Prepare wallabag 2.2.3
2017-05-17 17:48:51 +02:00
Nicolas Lœuillet
c0e8e6037b Prepare wallabag 2.2.3 2017-05-17 17:21:14 +02:00
Nicolas Lœuillet
afc9875f28 Merge pull request #3117 from wallabag/fix-doc
Fixed documentation URL
2017-05-17 10:40:35 +02:00
Nicolas Lœuillet
6b94ee51b8 Fixed documentation URL 2017-05-17 09:03:04 +02:00
Nicolas Lœuillet
4e88a6a651 Merge pull request #3124 from wallabag/lock-guzzle-auth
Lock guzzle-site-authenticator to avoid errors
2017-05-17 09:02:22 +02:00
Jeremy Benoist
8581fcae90
Lock guzzle-site-authenticator to avoid error 2017-05-16 23:34:42 +02:00
Jérémy Benoist
092ed4a787 Merge pull request #3123 from X-dark/master
reorder contrib strings in about page
2017-05-16 14:50:25 +02:00
Cedric Girard
8544c7e4b6 reorder contrib strings in about page
this fixes #2891
2017-05-16 14:17:13 +02:00
Thomas Citharel
91ba9a5975 Merge pull request #3095 from aaa2000/api-error-on-fail-fetch-content
Create a new entry via API even when its content can't be retrieved
2017-05-10 09:38:55 +02:00
adev
a9357a8311 Remove the created entry to avoid side effects on other tests 2017-05-09 23:19:24 +02:00
Nicolas Lœuillet
a2ae05a61c Merge pull request #3076 from wallabag/hotfix/2979
Disable negative numbers in filters
2017-05-09 13:56:44 +02:00
Jeremy Benoist
1b1647175d
Add some tests 2017-05-09 12:12:23 +02:00
Jérémy Benoist
c829b06ed8 Merge pull request #3097 from wallabag/update-license
Update graby* licenses
2017-05-09 09:47:20 +02:00
Jérémy Benoist
9d7d549712 Update graby* licenses 2017-05-09 09:22:50 +02:00
Jérémy Benoist
832fbd94c0 Merge pull request #3096 from aaa2000/fix-api-entries-pagination-with-perpage
Fix API pagination is broken if perPage is custom value
2017-05-09 09:12:15 +02:00
adev
b60a666df2 Fix API pagination is broken if perPage is custom value
Fix #2720
2017-05-08 16:27:16 +02:00
adev
08f29ae7b6 Create a new entry via API even when its content can't be retrieved
Fix #2988
2017-05-08 14:57:25 +02:00
Nicolas Lœuillet
f2beee5185 Merge pull request #3090 from aaa2000/translate-login-page-error
Translate error message in login page
2017-05-07 14:00:41 +02:00
adev
f3c300e485 Translate error message in login page
Fix #2933
2017-05-06 22:21:04 +02:00
Jérémy Benoist
6603a9d649 Merge pull request #3082 from aaa2000/fix-form-errors-display
Fix display the form errors correctly
2017-05-05 07:01:28 +02:00
adev
ab9eb5cdb7 Fix display the form errors correctly
Use `property_path` form option to map underscored form fields
to object properties

@see https://github.com/symfony/symfony/issues/9162#issuecomment-25431148

Fix #3067
2017-05-05 00:12:16 +02:00
Maxime Marinel
1267905d28 Disable negative numbers in filters 2017-05-03 11:08:56 +02:00
Nicolas Lœuillet
a7c8f54570 Merge pull request #3072 from wallabag/hotfix/3061
Small typo in documentation fix #3061
2017-05-02 15:46:45 +02:00
Maxime Marinel
0f26c285d4 Small typo in documentation fix #3061 2017-05-02 11:51:23 +02:00
Jérémy Benoist
9579003045 Merge pull request #3066 from wallabag/ignore-tests-exported-files
Ignore tests exported files
2017-04-29 22:51:32 +02:00
Thomas Citharel
d49cdfe2ef Ignore tests exported files 2017-04-29 19:41:14 +02:00
Jérémy Benoist
8ee18fdabc Merge pull request #3064 from gileri/master
Correct create_application en string
2017-04-29 15:43:42 +02:00
Éric Gillet
ef88b37eb5 Correct create_application en string 2017-04-29 12:30:12 +02:00
Jérémy Benoist
138c352cd7 Merge pull request #3052 from shtrom/fix-relative-symlinks
Make symfony-assets-install use `relative` symlinks
2017-04-25 14:15:01 +02:00
Olivier Mehani
f972af3f5b Make symfony-assets-install use relative symlinks
This facilitates packaging, when installing in a different work PREFIX
than the final install location.

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2017-04-22 21:45:30 +10:00
Jérémy Benoist
656395fde6 Merge pull request #3023 from mart-e/epub-notice-at-the-end
Add export notice at the end of the epub
2017-04-05 10:20:19 +02:00
Martin Trigaux
1b70990b01 Add export notice at the end of the epub
The text "Produced by wallabag with PHPePub" is the first page of any epub.

On ebooks reader, it is common (e.g. kobo) to use the first page as the cover of
unread books, which makes it more difficult to differentiate the books.

Move the Notices chapter at the end of the book.
2017-04-05 09:24:48 +02:00