]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
8 years agoAdd configuration for german documentation 2235/head
Nicolas Lœuillet [Wed, 24 Aug 2016 06:53:20 +0000 (08:53 +0200)] 
Add configuration for german documentation

8 years agoMerge pull request #2230 from modos189/issue_2055
Nicolas Lœuillet [Tue, 23 Aug 2016 15:24:46 +0000 (17:24 +0200)] 
Merge pull request #2230 from modos189/issue_2055

Cut entries title in card view: continued

8 years agoReplacement plugin dotdotdot (6.7 KB) on my tinydot (315 bytes) 2230/head
Alexandr Danilov [Tue, 23 Aug 2016 09:58:35 +0000 (12:58 +0300)] 
Replacement plugin dotdotdot (6.7 KB) on my tinydot (315 bytes)

8 years agoUpdate SymfonyRequirements
Jeremy Benoist [Tue, 23 Aug 2016 05:24:00 +0000 (07:24 +0200)] 
Update SymfonyRequirements

8 years agoSimplify the initialization of the plugin dotdotdot
Alexandr Danilov [Mon, 22 Aug 2016 20:59:20 +0000 (23:59 +0300)] 
Simplify the initialization of the plugin dotdotdot

8 years agoAdded the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that allows...
Alexandr Danilov [Mon, 22 Aug 2016 20:34:44 +0000 (23:34 +0300)] 
Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that allows you to clip a text on the second line and fixed cut entries title in card view

8 years agoMerge pull request #2226 from wallabag/prepare-207
Nicolas Lœuillet [Mon, 22 Aug 2016 08:40:24 +0000 (10:40 +0200)] 
Merge pull request #2226 from wallabag/prepare-207

Prepare wallabag 2.0.7

8 years agoPrepare wallabag 2.0.7 2226/head
Nicolas Lœuillet [Mon, 22 Aug 2016 08:08:21 +0000 (10:08 +0200)] 
Prepare wallabag 2.0.7

8 years agoMerge pull request #2222 from wallabag/add-date-on-article-view
Nicolas Lœuillet [Mon, 22 Aug 2016 07:40:21 +0000 (09:40 +0200)] 
Merge pull request #2222 from wallabag/add-date-on-article-view

Added creation date and reading time on article view

8 years agoDisplay text on baggy 2222/head
Jeremy Benoist [Sun, 21 Aug 2016 20:22:34 +0000 (22:22 +0200)] 
Display text on baggy

Instead of using icons (which aren't available) display real text for reading time & creation date

8 years agoMerge pull request #2221 from wallabag/replace-favorite-star
Jeremy Benoist [Sun, 21 Aug 2016 20:11:20 +0000 (22:11 +0200)] 
Merge pull request #2221 from wallabag/replace-favorite-star

Replaced favorite word/icon with star one

8 years agoMerge pull request #2224 from wallabag/avoid-exception-import
Thomas Citharel [Sat, 20 Aug 2016 12:31:32 +0000 (14:31 +0200)] 
Merge pull request #2224 from wallabag/avoid-exception-import

Avoid breaking import when fetching fail

8 years agoAvoid breaking import when fetching fail 2224/head
Jeremy Benoist [Fri, 19 Aug 2016 21:52:19 +0000 (23:52 +0200)] 
Avoid breaking import when fetching fail

graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf).

Import doesn't handle that case and break the whole import.
With that commit the import isn't stopped but the entry is just skipped.

Also, as a  bonus, I've added extra test on WallabagImportV2 when the json is empty.

8 years agoChanged code indentation
Nicolas Lœuillet [Thu, 18 Aug 2016 13:36:28 +0000 (15:36 +0200)] 
Changed code indentation

8 years agoFixed some translations 2221/head
Nicolas Lœuillet [Thu, 18 Aug 2016 13:30:28 +0000 (15:30 +0200)] 
Fixed some translations

8 years agoAdded creation date and reading time on article view
Nicolas Lœuillet [Thu, 18 Aug 2016 13:23:19 +0000 (15:23 +0200)] 
Added creation date and reading time on article view
Fix #2034

8 years agoReplaced favorite word/icon with star one
Nicolas Lœuillet [Thu, 18 Aug 2016 09:58:35 +0000 (11:58 +0200)] 
Replaced favorite word/icon with star one
Fix #2041

8 years agoMerge pull request #2220 from Rurik19/master
Jeremy Benoist [Thu, 18 Aug 2016 09:56:02 +0000 (11:56 +0200)] 
Merge pull request #2220 from Rurik19/master

Enable PATCH method for CORS in API part

8 years agoEnable PATCH method for CORS in API part 2220/head
Rurik19 [Thu, 18 Aug 2016 09:30:32 +0000 (14:30 +0500)] 
Enable PATCH method for CORS in API part

8 years agoMerge pull request #2134 from wallabag/hhvm
Jeremy Benoist [Wed, 17 Aug 2016 16:00:17 +0000 (18:00 +0200)] 
Merge pull request #2134 from wallabag/hhvm

Run tests on an uptodate HHVM

8 years agoRun tests on an uptodate HHVM 2134/head
Jeremy Benoist [Fri, 3 Jun 2016 12:24:54 +0000 (14:24 +0200)] 
Run tests on an uptodate HHVM

Using some tricks from symfony/symfony

8 years agoMerge pull request #2095 from wallabag/fix-2auth-form
Jeremy Benoist [Wed, 17 Aug 2016 13:17:07 +0000 (15:17 +0200)] 
Merge pull request #2095 from wallabag/fix-2auth-form

Fix form user display when 2FA is disabled

8 years agoCS 2095/head
Jeremy Benoist [Wed, 17 Aug 2016 12:18:28 +0000 (14:18 +0200)] 
CS

8 years agoFix tests
Jeremy Benoist [Wed, 17 Aug 2016 09:40:35 +0000 (11:40 +0200)] 
Fix tests

Ensure tests after the InstallCommand test will have a clean database.
Previous attempt failed because of a foreign key

Also, nightly on Travis seems to target PHP 7.2-dev, so I put 7.1 in requirement and moved nightly in allowed failures.
And it seems xdebug isn't shipped with PHP 7.1, so I added a workaround to avoid build to fail when trying to remove xdebug.ini file.

8 years agoDisable autobranch & commit
Jeremy Benoist [Wed, 17 Aug 2016 10:31:16 +0000 (12:31 +0200)] 
Disable autobranch & commit

8 years agoEnable Zappr
Jeremy Benoist [Wed, 17 Aug 2016 10:29:47 +0000 (12:29 +0200)] 
Enable Zappr

8 years agoFix form user display for baggy theme
Nicolas Lœuillet [Fri, 12 Aug 2016 11:55:30 +0000 (13:55 +0200)] 
Fix form user display for baggy theme

8 years agoFix form user display when 2FA is disabled
Nicolas Lœuillet [Wed, 18 May 2016 13:02:00 +0000 (15:02 +0200)] 
Fix form user display when 2FA is disabled

8 years agoMerge pull request #2216 from Rurik19/master
Nicolas Lœuillet [Tue, 16 Aug 2016 12:22:43 +0000 (14:22 +0200)] 
Merge pull request #2216 from Rurik19/master

Enable CORS headers for OAUTH part

8 years agoEnable CORS headers for OAUTH part 2216/head
Rurik19 [Fri, 12 Aug 2016 08:01:53 +0000 (13:01 +0500)] 
Enable CORS headers for OAUTH part

8 years agoChanged URL for scrutinizer in README
Nicolas Lœuillet [Thu, 11 Aug 2016 18:57:06 +0000 (20:57 +0200)] 
Changed URL for scrutinizer in README

8 years agoMerge pull request #2212 from wallabag/prepare-206
Nicolas Lœuillet [Wed, 10 Aug 2016 13:03:43 +0000 (15:03 +0200)] 
Merge pull request #2212 from wallabag/prepare-206

Prepare release 2.0.6

8 years agoPrepare release 2.0.6 2212/head
Nicolas Lœuillet [Wed, 10 Aug 2016 12:26:13 +0000 (14:26 +0200)] 
Prepare release 2.0.6

8 years agoMerge pull request #2200 from charno6/patch-1
Thomas Citharel [Sat, 23 Jul 2016 20:58:26 +0000 (22:58 +0200)] 
Merge pull request #2200 from charno6/patch-1

Fixed typo in entry:notice:entry_saved

8 years agoFixed typo in entry:notice:entry_saved 2200/head
charno6 [Sat, 23 Jul 2016 20:40:23 +0000 (22:40 +0200)] 
Fixed typo in entry:notice:entry_saved

"Eintag" to "Eintrag"

8 years agoMerge pull request #2199 from Simounet/facto/social-links
Jeremy Benoist [Thu, 21 Jul 2016 14:17:53 +0000 (16:17 +0200)] 
Merge pull request #2199 from Simounet/facto/social-links

Handling socials links into a config file

8 years agophp-cs-fixer pass 2199/head
Simounet [Wed, 20 Jul 2016 21:08:04 +0000 (23:08 +0200)] 
php-cs-fixer pass

8 years agoChrome extension URL updated
Simounet [Wed, 20 Jul 2016 20:55:43 +0000 (22:55 +0200)] 
Chrome extension URL updated

8 years agoMerge pull request #2198 from Simounet/fix/image-inside-figure
Thomas Citharel [Wed, 20 Jul 2016 18:44:47 +0000 (20:44 +0200)] 
Merge pull request #2198 from Simounet/fix/image-inside-figure

FIX image inside a figure element max-width

8 years agoFIX image inside a figure element max-width (baggy theme) 2198/head
Simounet [Wed, 20 Jul 2016 18:23:55 +0000 (20:23 +0200)] 
FIX image inside a figure element max-width (baggy theme)

8 years agoFIX image inside a figure element max-width
Simounet [Wed, 20 Jul 2016 17:30:29 +0000 (19:30 +0200)] 
FIX image inside a figure element max-width

8 years agoHandling socials links into a config file
Simounet [Mon, 6 Jun 2016 18:59:20 +0000 (20:59 +0200)] 
Handling socials links into a config file

8 years agoMerge pull request #2195 from wallabag/remove-bin
Nicolas Lœuillet [Wed, 20 Jul 2016 09:38:55 +0000 (11:38 +0200)] 
Merge pull request #2195 from wallabag/remove-bin

Remove binary from repo

8 years agoRemove binary from repo 2195/head
Jeremy Benoist [Wed, 20 Jul 2016 08:44:46 +0000 (10:44 +0200)] 
Remove binary from repo

Since Composer 1.2, binaries are re-installed from vendors if there aren't found.
This avoid us to commit binaries vendors into the repo.

:warning: You have to update your Composer to the 1.2 (`composer selfupdate`)

8 years agoMerge pull request #2048 from wallabag/travis-php-7.1
Nicolas Lœuillet [Tue, 19 Jul 2016 09:24:26 +0000 (11:24 +0200)] 
Merge pull request #2048 from wallabag/travis-php-7.1

Run PHP 7.1 on Travis

8 years agoMerge pull request #2194 from benages/patch-2
Jeremy Benoist [Mon, 18 Jul 2016 20:56:02 +0000 (22:56 +0200)] 
Merge pull request #2194 from benages/patch-2

Fixed spelling Artúclos --> Artículos

8 years agoFixed spelling Artúclos --> Artículos 2194/head
benages [Mon, 18 Jul 2016 19:53:53 +0000 (21:53 +0200)] 
Fixed spelling Artúclos --> Artículos

8 years agoRun PHP 7.1 on Travis 2048/head
Jeremy Benoist [Mon, 9 May 2016 08:42:11 +0000 (10:42 +0200)] 
Run PHP 7.1 on Travis

- Using nightly (as of now it's PHP 7.1 alpha)
- Force guzzle to be at least 5.3.1 (which fix some bugs in PHP 7)

8 years agoMerge pull request #2185 from wallabag/fix-3rd-party-links
Thomas Citharel [Sat, 2 Jul 2016 10:33:33 +0000 (12:33 +0200)] 
Merge pull request #2185 from wallabag/fix-3rd-party-links

Fix 3rd-Party Apps links (Chrome & Firefox)

8 years agoRemove fr part 2185/head
Thomas Citharel [Sat, 2 Jul 2016 09:56:14 +0000 (11:56 +0200)] 
Remove fr part

8 years agoFix 3rd-Party Apps links (Chrome & Firefox)
Thomas Citharel [Sat, 2 Jul 2016 09:50:32 +0000 (11:50 +0200)] 
Fix 3rd-Party Apps links (Chrome & Firefox)

8 years agoMerge pull request #2172 from wallabag/more-tests
Nicolas Lœuillet [Fri, 24 Jun 2016 12:22:47 +0000 (14:22 +0200)] 
Merge pull request #2172 from wallabag/more-tests

Change the way to login user in tests

8 years agoChange the way to login user in tests 2172/head
Jeremy Benoist [Fri, 24 Jun 2016 09:55:45 +0000 (11:55 +0200)] 
Change the way to login user in tests

Instead of using a HTTP request we just login user like FOSUser does.
It allows us to mock service in container for functional tests.

Also, fix a bad config name in fos_user for firewall

And finally, add functional test to PocketImport

8 years agoRemove useless spaces
Jeremy Benoist [Fri, 24 Jun 2016 09:28:07 +0000 (11:28 +0200)] 
Remove useless spaces

8 years agoMerge pull request #2157 from wallabag/lower-upper-readingtime
Jeremy Benoist [Thu, 23 Jun 2016 09:38:10 +0000 (11:38 +0200)] 
Merge pull request #2157 from wallabag/lower-upper-readingtime

Handle only upper or only lower reading filter

8 years agoAdd some tests about readingTime 2157/head
Jeremy Benoist [Thu, 23 Jun 2016 08:46:47 +0000 (10:46 +0200)] 
Add some tests about readingTime

8 years agoMerge pull request #2165 from wallabag/translation-typos
Jeremy Benoist [Thu, 23 Jun 2016 08:43:06 +0000 (10:43 +0200)] 
Merge pull request #2165 from wallabag/translation-typos

Fix a few french translations typos

8 years agofixup! Handle only upper or only lower reading filter
Jeremy Benoist [Fri, 17 Jun 2016 22:22:04 +0000 (00:22 +0200)] 
fixup! Handle only upper or only lower reading filter

8 years agoHandle only upper or only lower reading filter
Jeremy Benoist [Fri, 17 Jun 2016 21:48:51 +0000 (23:48 +0200)] 
Handle only upper or only lower reading filter

When we select only one value in the reading time filter, we need to perform a query with only one value (greater than OR lower than).

8 years agoFix a few french translations typos 2165/head
Thomas Citharel [Wed, 22 Jun 2016 19:50:41 +0000 (21:50 +0200)] 
Fix a few french translations typos

8 years agoMerge pull request #2132 from wallabag/sf3.1
Nicolas Lœuillet [Thu, 23 Jun 2016 07:18:18 +0000 (09:18 +0200)] 
Merge pull request #2132 from wallabag/sf3.1

Jump to Symfony 3.1

8 years agoFix bad loading fixtures 2132/head
Jeremy Benoist [Wed, 22 Jun 2016 21:15:09 +0000 (23:15 +0200)] 
Fix bad loading fixtures

Since doctrine/data-fixtures 1.2.0 fixtures seems to be badly loaded.
No time for investigate but reverting back to 1.1.* is fixing issues.

8 years agoJump to Symfony 3.1
Jeremy Benoist [Wed, 1 Jun 2016 19:27:35 +0000 (21:27 +0200)] 
Jump to Symfony 3.1

8 years agoMerge pull request #2160 from wallabag/bin-cs-fixer
Nicolas Lœuillet [Mon, 20 Jun 2016 10:11:53 +0000 (12:11 +0200)] 
Merge pull request #2160 from wallabag/bin-cs-fixer

Update symlink to php-cs-fixer

8 years agoUpdate symlink to php-cs-fixer 2160/head
Jeremy Benoist [Mon, 20 Jun 2016 09:22:30 +0000 (11:22 +0200)] 
Update symlink to php-cs-fixer

8 years agoMerge pull request #2155 from wallabag/php-cs-fixer
Nicolas Lœuillet [Mon, 20 Jun 2016 07:35:55 +0000 (09:35 +0200)] 
Merge pull request #2155 from wallabag/php-cs-fixer

Use friendsofphp instead of fabpot

8 years agoMerge pull request #2156 from wallabag/delete-redirect
Nicolas Lœuillet [Mon, 20 Jun 2016 07:35:41 +0000 (09:35 +0200)] 
Merge pull request #2156 from wallabag/delete-redirect

Try to find bad redirection after delete

8 years agoTry to find bad redirection after delete 2156/head
Jeremy Benoist [Fri, 17 Jun 2016 20:18:48 +0000 (22:18 +0200)] 
Try to find bad redirection after delete

Instead of checking for the whole absolute url, we just check with the relative url.
If the referer ends with the relative url of the deleted entry, don't redirect to the referer.

8 years agoUse friendsofphp instead of fabpot 2155/head
Jeremy Benoist [Fri, 17 Jun 2016 20:03:29 +0000 (22:03 +0200)] 
Use friendsofphp instead of fabpot

The fabpot's one is now depreacted

8 years agoMerge pull request #2148 from wallabag/start-german-docu
Jeremy Benoist [Thu, 16 Jun 2016 04:50:21 +0000 (06:50 +0200)] 
Merge pull request #2148 from wallabag/start-german-docu

translate documentation to German

8 years agotranslate documentation to German 2148/head
Sven Fischer [Mon, 23 May 2016 19:41:00 +0000 (21:41 +0200)] 
translate documentation to German

8 years agoMerge pull request #2145 from even-allmighty/master
Jeremy Benoist [Mon, 13 Jun 2016 09:51:37 +0000 (11:51 +0200)] 
Merge pull request #2145 from even-allmighty/master

Corrected Regex for lighttpd rewrite

8 years agoCorrected Regex for lighttpd rewrite 2145/head
Even Allmighty [Mon, 13 Jun 2016 08:35:05 +0000 (10:35 +0200)] 
Corrected Regex for lighttpd rewrite

8 years agoMerge pull request #2118 from wallabag/prepare-205
Nicolas Lœuillet [Tue, 31 May 2016 19:45:01 +0000 (21:45 +0200)] 
Merge pull request #2118 from wallabag/prepare-205

Prepare wallabag 2.0.5

8 years agoPrepare wallabag 2.0.5 2118/head
Nicolas Lœuillet [Mon, 23 May 2016 14:54:46 +0000 (16:54 +0200)] 
Prepare wallabag 2.0.5

8 years agoMerge pull request #2122 from wallabag/fix-tags-deletion
Nicolas Lœuillet [Tue, 31 May 2016 09:31:16 +0000 (11:31 +0200)] 
Merge pull request #2122 from wallabag/fix-tags-deletion

Fix the deletion of Tags/Entries relation when delete an entry

8 years agoChange ManyToMany between entry & tag 2122/head
Jeremy Benoist [Mon, 30 May 2016 12:34:11 +0000 (14:34 +0200)] 
Change ManyToMany between entry & tag

Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed

8 years agoDisplay a message when saving an entry failed
Jeremy Benoist [Mon, 30 May 2016 12:32:41 +0000 (14:32 +0200)] 
Display a message when saving an entry failed

When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.

8 years agoMove fixtures to the right place
Jeremy Benoist [Mon, 30 May 2016 12:18:47 +0000 (14:18 +0200)] 
Move fixtures to the right place

8 years agoFix the deletion of Tags/Entries relation when delete an entry
Nicolas Lœuillet [Sat, 28 May 2016 11:38:59 +0000 (13:38 +0200)] 
Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121

8 years agoMerge pull request #2052 from danbartram/feature-filter-unread
Jeremy Benoist [Fri, 27 May 2016 07:57:51 +0000 (09:57 +0200)] 
Merge pull request #2052 from danbartram/feature-filter-unread

Add unread filter to entries pages

8 years agoMerge pull request #2112 from Poorchop/docs-proposal
Nicolas Lœuillet [Thu, 26 May 2016 18:50:11 +0000 (20:50 +0200)] 
Merge pull request #2112 from Poorchop/docs-proposal

Docs proposal

8 years agoMerge pull request #2111 from wallabag/translate-android-docu-pics-to-english
Nicolas Lœuillet [Tue, 24 May 2016 11:41:56 +0000 (13:41 +0200)] 
Merge pull request #2111 from wallabag/translate-android-docu-pics-to-english

add screenshots of android docu in English

8 years agoadd screenshots of android docu in English 2111/head
Sven Fischer [Mon, 23 May 2016 19:16:53 +0000 (21:16 +0200)] 
add screenshots of android docu in English

8 years agoUpdate installation instructions 2112/head
Poorchop [Mon, 23 May 2016 17:22:12 +0000 (13:22 -0400)] 
Update installation instructions

-Fix grammar
-Add SELinux section

8 years agoUpdate FAQ
Poorchop [Mon, 23 May 2016 17:18:20 +0000 (13:18 -0400)] 
Update FAQ

-Fix grammar
-Add notes about MTA, firewall, and SELinux

8 years agoMerge pull request #2109 from Poorchop/grammar
Nicolas Lœuillet [Mon, 23 May 2016 05:50:47 +0000 (07:50 +0200)] 
Merge pull request #2109 from Poorchop/grammar

Improve English translation

8 years agoImprove English translation 2109/head
Poorchop [Mon, 23 May 2016 05:04:17 +0000 (01:04 -0400)] 
Improve English translation

8 years agoDon't cut entries title in card view 2104/head
Baptiste Mille-Mathias [Sat, 21 May 2016 08:39:49 +0000 (10:39 +0200)] 
Don't cut entries title in card view

Stop cutting titles arbitrary at caracter 42.

8 years agoMerge pull request #2097 from bmillemathias/issue_2045
Nicolas Lœuillet [Thu, 19 May 2016 07:19:01 +0000 (09:19 +0200)] 
Merge pull request #2097 from bmillemathias/issue_2045

Fix image path in 2-factor authentification email

8 years agoMerge pull request #2098 from wallabag/cs-2092
Nicolas Lœuillet [Thu, 19 May 2016 07:18:16 +0000 (09:18 +0200)] 
Merge pull request #2098 from wallabag/cs-2092

CS

8 years agoCS 2098/head
Jeremy Benoist [Thu, 19 May 2016 05:41:54 +0000 (07:41 +0200)] 
CS

8 years agoMerge pull request #2092 from Rurik19/issue2089
Jeremy Benoist [Thu, 19 May 2016 05:39:30 +0000 (07:39 +0200)] 
Merge pull request #2092 from Rurik19/issue2089

Starred and Archived clears if article is already exists

8 years agoForgot a double quote 2097/head
Baptiste Mille-Mathias [Wed, 18 May 2016 23:51:50 +0000 (01:51 +0200)] 
Forgot a double quote

8 years agoFix image path in 2-factor authentification email
Baptiste Mille-Mathias [Wed, 18 May 2016 19:18:41 +0000 (21:18 +0200)] 
Fix image path in 2-factor authentification email

Fix the broken url to image ressource hosted on wallabag.org

8 years agoMerge pull request #2093 from wallabag/replace-dots-material
Jeremy Benoist [Wed, 18 May 2016 12:58:50 +0000 (14:58 +0200)] 
Merge pull request #2093 from wallabag/replace-dots-material

Replace vertical dots in material theme with horizontal dots

8 years agoMerge pull request #2094 from wallabag/update-contributing
Jeremy Benoist [Wed, 18 May 2016 12:58:45 +0000 (14:58 +0200)] 
Merge pull request #2094 from wallabag/update-contributing

Update CONTRIBUTING file

8 years agoUpdate CONTRIBUTING file 2094/head
Nicolas Lœuillet [Wed, 18 May 2016 12:33:06 +0000 (14:33 +0200)] 
Update CONTRIBUTING file
Fix #2059

8 years agoReplace vertical dots in material theme with horizontal dots 2093/head
Nicolas Lœuillet [Wed, 18 May 2016 12:29:41 +0000 (14:29 +0200)] 
Replace vertical dots in material theme with horizontal dots

8 years agoTests for issue #2089 2092/head
Yuriy Evdokimov [Wed, 18 May 2016 10:37:07 +0000 (15:37 +0500)] 
Tests for issue #2089