Commit Graph

1071 Commits

Author SHA1 Message Date
bf3dc999e7 Add ability to edit a tagging rule 2016-10-01 16:52:05 +02:00
c4bf7af96f Merge pull request #2322 from wallabag/v2-404
Customize errors templates
2016-10-01 16:35:48 +02:00
1264029cd4 Add simple stats in footer 2016-10-01 16:03:50 +02:00
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
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
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
2ff9991a1d Removed duplicated templates files 2016-09-30 09:38:08 +02:00
fb479be3a0 Merge pull request #2315 from wallabag/fixes-about-upgrade
Fixes about upgrade
2016-09-29 11:35:47 +02:00
02384d22ef Update messages.pl.yml
add missing translation for Instapaper importer
2016-09-29 01:04:06 +02:00
eef8aeec8f Reordered upgrade documentation 2016-09-28 11:13:20 +02:00
c146f6940a Assets work
* ES6 all the things !

* ESLint checks everything

* CSS fixes (use stylelint)

* Fix #2231
2016-09-28 10:30:18 +02:00
084fb0d303 Some fixes about upgrade from 2.0.x -> 2.1.0 2016-09-28 10:04:36 +02:00
a9e92b6609 Add Instapaper translations 2016-09-27 20:27:08 +02:00
c7ea9b41f3 Add controller test for Instapaper 2016-09-27 20:27:08 +02:00
ff1a5362f7 Add Instapaper import
Also update ImportController with latest import (chrome, firefox & instapaper).
2016-09-27 20:27:08 +02:00
20762cd1ab Update messages.pl.yml
add missing translation for Firefox and Chrome imports
2016-09-27 00:58:44 +02:00
d6de23a100 Merge pull request #2192 from wallabag/import-browser-bookmarks
Import Firefox & Chrome bookmarks into wallabag
2016-09-26 14:47:02 +02:00
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
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
27acc6ddb8 Fix bad date format in Browser import 2016-09-25 15:32:02 +02:00
bd206a84d8 Fixed tests by removing clear() 2016-09-25 12:29:19 +02:00
64b1229b2d fix tests 2016-09-25 12:29:19 +02:00
2c61db30b7 cs & fixes 2016-09-25 12:29:19 +02:00
59201088b4 bring chrome and firefox as separate imports 2016-09-25 12:29:18 +02:00
06d13ddfbc Indentation and renamed fixtures file 2016-09-25 12:28:55 +02:00
efe659ab84 Add Chrome path for Mac OS 2016-09-25 12:28:55 +02:00
ae669126e7 Import Firefox & Chrome bookmarks into wallabag 2016-09-25 12:28:54 +02:00
289875836a Fix tag count for PostgreSQL 2016-09-25 12:23:44 +02:00
82fc3290d4 CS 2016-09-25 12:03:49 +02:00
401135852c Use scheduled entity insertions to avoid tag duplicate
Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import.
2016-09-25 12:03:49 +02:00
faa86e06ba Fix tags count in menu
Move enable cache for Tag in the Entity because function `find*` should return result and not a Query
2016-09-25 12:03:49 +02:00
13a522dfbd Display a message when async import won’t work
Mostly if Redis or RabbitMQ isn’t installed / launched.
I guess it’ll avoid some issues.
2016-09-24 19:56:15 +02:00
637aa17e6b Merge pull request #2301 from wallabag/fix-rss-feeds
fix feeds not syncing on android app
2016-09-22 07:51:05 +02:00
389d55f86b fix feeds not syncing on android app 2016-09-21 19:51:19 +02:00
a94108f574 Update messages.pl.yml
add missing translation
2016-09-19 22:53:02 +02:00
267b9d62dc Update wallabag_user.pl.yml
add missing "
2016-09-19 22:37:03 +02:00
a00bed8b59 polish version
create wallabag_user.pl.yml file
2016-09-19 20:42:55 +02:00
d7b4b2c72c Merge remote-tracking branch 'origin/master' into 2.1 2016-09-19 11:23:07 +02:00
da18a4682f Merge pull request #1941 from wallabag/v2-asynchronous-jobs
Use asynchronous jobs for imports
2016-09-19 07:15:40 +02:00
45d94a98f7 Fix issue #2296: epub export with + in the title. 2016-09-18 14:43:54 +02:00
59b97fae99 Avoid losing entry when fetching fail
Instead of just say “Failed to save entry” we’ll save the entry at all cost and try to fetch content. If fetching content failed, the entry will still be saved at least, but without content.
2016-09-17 07:40:56 +02:00
fbb319f064 Missing some migrations
and CS
2016-09-16 22:58:33 +02:00
ebe0787e09 Moved Pocket token to user config 2016-09-16 22:22:25 +02:00
4fc998245c Only display message in queue for admin
Instead of for EVERYONE
2016-09-16 20:08:07 +02:00
458beef0a9 Fixed label for mark as read link in entry view
Fix #2286
2016-09-15 15:32:01 +02:00
c6b68dc1df Merge pull request #2287 from wallabag/remove-footer
Remove footer part
2016-09-15 14:21:21 +02:00
e77cde4531 Remove FooterController 2016-09-15 11:11:24 +02:00
15b1917142 Update messages.oc.yml
L44 : vosautres, general form
vosaltres : local and catalan form
vosaultres : doesnt exist ^^
2016-09-14 17:54:09 +02:00
ac87e0db2a AMPQ -> AMQP 2016-09-14 10:18:02 +02:00
c80cc01afa Change flash message for queued articles 2016-09-13 21:09:05 +02:00