mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-07-01 03:20:43 +00:00
Code Issues Projects Releases Wiki Activity
2816 commits 14 branches 99 tags 148 MiB
Commit graph

2816 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Benoist bfb3ae01da Merge pull request #2323 from wallabag/footer-stats 
Add simple stats in footer
 2016-10-02 11:04:49 +02:00
Jeremy Benoist ae394b4078 Merge pull request #2329 from wallabag/Quent-in-patch-1 
Occitan version update
 2016-10-02 11:04:10 +02:00
Jeremy Benoist a4df48916d
Fix OC typos 
+ remove extra sentence
 2016-10-02 09:57:48 +02:00
Quent-in 1bcfeb0f4a Occitan version update 
to be ready for the future of Wallabag :)
 2016-10-01 18:23:37 +02:00
Nicolas Lœuillet c4bf7af96f Merge pull request #2322 from wallabag/v2-404 
Customize errors templates
 2016-10-01 16:35:48 +02:00
Jeremy Benoist 1264029cd4
Add simple stats in footer 2016-10-01 16:03:50 +02:00
Nicolas Lœuillet db5541e7a1 Merge pull request #2320 from wallabag/user-config 
Create user config in one place.
 2016-10-01 15:51:37 +02:00
Jeremy Benoist 40e219622a
Customize errors templates 
All error goes to the same template which only display the error message and the status code.
 2016-10-01 14:58:48 +02:00
Jeremy Benoist fb7354c4a4
Fix bad template name 
When a user register, the template displayed saying it should now check its email was misspelled.
Resulting in displaying the default one (with margin issue).
 2016-09-30 21:02:44 +02:00
Jeremy Benoist ca17abce2d
Create user config in one place 
Using a listener, user config is now created when a user:

- is created from the command line
- register (with or without email confirmation)
- is created from the config panel
 2016-09-30 21:01:36 +02:00
Jeremy Benoist 114c55c0a6
Merge remote-tracking branch 'origin/master' into 2.1 2016-09-30 13:27:19 +02:00
Jeremy Benoist 00d3f2a383 Merge pull request #2319 from pmartin/docker-php-gd-extension 
Docker : install PHP 'gd' extension
 2016-09-30 13:25:23 +02:00
Pascal MARTIN ecdefb11f7 Add PHP 'gd' extension to docker 
The gd extension is required to export entries as EPUB.
 2016-09-30 12:29:37 +02:00
Pascal MARTIN 56f0150e2a Fix doc: 'bin/console' instead of 'app/console' 2016-09-30 12:29:22 +02:00
Nicolas Lœuillet 555ed552ca Merge pull request #2318 from wallabag/refactor-templates 
Removed duplicated templates files
 2016-09-30 10:21:33 +02:00
Nicolas Lœuillet 2ff9991a1d
Removed duplicated templates files 2016-09-30 09:38:08 +02:00
Nicolas Lœuillet fb479be3a0 Merge pull request #2315 from wallabag/fixes-about-upgrade 
Fixes about upgrade
 2016-09-29 11:35:47 +02:00
Nicolas Lœuillet 2d8af6fc7f
Added french documentation about Redis and RabbitMQ 2016-09-29 11:01:15 +02:00
Sven Fischer c59e628afe Added links to async config in german doc 2016-09-29 10:43:53 +02:00
Sven Fischer 00283a3b0a add German redis.rst 2016-09-29 10:41:07 +02:00
Sven Fischer 080cb52fac add German rabbitmq.rst 2016-09-29 10:36:19 +02:00
Jeremy Benoist 37b63c170d Merge pull request #2316 from mruminski/2.1 
Update messages.pl.yml
 2016-09-29 07:20:23 +02:00
Mateusz Rumiński 02384d22ef Update messages.pl.yml 
add missing translation for Instapaper importer
 2016-09-29 01:04:06 +02:00
Nicolas Lœuillet ff5be9720b Added links to async config in french doc 2016-09-28 16:37:36 +02:00
Nicolas Lœuillet cb0096df41 Added links to async config in english doc 2016-09-28 16:37:02 +02:00
Julian Oster 34e4c12604 Little improvements to the german translation 2016-09-28 13:52:06 +02:00
Strubbl ff1f55c2a0 update German upgrade-2.0.x-2.1.y.rst 2016-09-28 12:26:29 +02:00
Nicolas Lœuillet 9866d39431
Fixed review 2016-09-28 11:59:35 +02:00
Nicolas Lœuillet eef8aeec8f
Reordered upgrade documentation 2016-09-28 11:13:20 +02:00
Nicolas Lœuillet 084fb0d303 Some fixes about upgrade from 2.0.x -> 2.1.0 2016-09-28 10:04:36 +02:00
Jeremy Benoist 92fa168344 Merge pull request #2313 from wallabag/fix-long-loading 
Remove CSS class who caused long loading on Firefox
 2016-09-27 21:58:06 +02:00
Nicolas Lœuillet 1ed965beb9
Remove CSS class who caused long loading on Firefox 
Fix #2302 #2281
 2016-09-27 20:52:30 +02:00
Jeremy Benoist a9e92b6609 Add Instapaper translations 2016-09-27 20:27:08 +02:00
Jeremy Benoist a7dda1f2bf Add Instapaper docs 2016-09-27 20:27:08 +02:00
Jeremy Benoist c7ea9b41f3 Add controller test for Instapaper 2016-09-27 20:27:08 +02:00
Jeremy Benoist ff1a5362f7 Add Instapaper import 
Also update ImportController with latest import (chrome, firefox & instapaper).
 2016-09-27 20:27:08 +02:00
Jeremy Benoist 55345331c4 Merge pull request #2309 from mruminski/2.1 
Update messages.pl.yml
 2016-09-27 08:00:58 +02:00
Mateusz Rumiński 20762cd1ab Update messages.pl.yml 
add missing translation for Firefox and Chrome imports
 2016-09-27 00:58:44 +02:00
Jeremy Benoist d6de23a100 Merge pull request #2192 from wallabag/import-browser-bookmarks 
Import Firefox & Chrome bookmarks into wallabag
 2016-09-26 14:47:02 +02:00
Nicolas Lœuillet fefef9d41b
Added tags for Firefox import 2016-09-26 13:40:10 +02:00
Jeremy Benoist 990adfb34c
Move prepareEntry to dedicated place 
Yeah first try was ugly, now each part are in the dedicated place.
Also, the date is hardly truncated to 10 chars because Firefox date are 16 chars long and Chrome are 17 chars long. So instead of divised them by a huge number, I prefer to truncate them.
 2016-09-26 07:30:02 +02:00
Jeremy Benoist 12d93e6896
Update Firefox file 
With real data, the previous looks more than a Chrome converted file.
Also, fix date conversion (hope so).
 2016-09-25 22:24:07 +02:00
Thomas Citharel 7e98ad9626 Merge pull request #2308 from wallabag/tags-duplicate 
Fix duplicate tags on import
 2016-09-25 16:11:06 +02:00
Jeremy Benoist 27acc6ddb8
Fix bad date format in Browser import 2016-09-25 15:32:02 +02:00
Jeremy Benoist f0fd82d039
Fix bad parameter for tests 2016-09-25 14:21:12 +02:00
Nicolas Lœuillet bd206a84d8
Fixed tests by removing clear() 2016-09-25 12:29:19 +02:00
Thomas Citharel 64b1229b2d
fix tests 2016-09-25 12:29:19 +02:00
Thomas Citharel 2c61db30b7
cs & fixes 2016-09-25 12:29:19 +02:00
Thomas Citharel 59201088b4
bring chrome and firefox as separate imports 2016-09-25 12:29:18 +02:00
Nicolas Lœuillet f7c55b3812
Added tests for Chrome bookmarks import 2016-09-25 12:29:18 +02:00