]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
7 years agoFixed last merge who caused CSS/JS bugs
Nicolas Lœuillet [Tue, 30 Aug 2016 11:52:28 +0000 (13:52 +0200)] 
Fixed last merge who caused CSS/JS bugs

7 years agoMerge remote-tracking branch 'origin/master' into 2.1
Jeremy Benoist [Sun, 28 Aug 2016 14:15:27 +0000 (16:15 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.1

7 years agoMerge pull request #2243 from wallabag/feature-untagged-entries
Jeremy Benoist [Sun, 28 Aug 2016 13:56:17 +0000 (15:56 +0200)] 
Merge pull request #2243 from wallabag/feature-untagged-entries

Add untagged entries

7 years agoAdd missing translations 2243/head
Jeremy Benoist [Sun, 28 Aug 2016 13:30:53 +0000 (15:30 +0200)] 
Add missing translations

7 years agoAdd tests for untagged entries
Nicolas Lœuillet [Fri, 26 Aug 2016 19:01:56 +0000 (21:01 +0200)] 
Add tests for untagged entries

7 years agoAdd untagged entries
Nicolas Lœuillet [Fri, 26 Aug 2016 14:55:41 +0000 (16:55 +0200)] 
Add untagged entries
Fix #1631

7 years agoMerge pull request #2245 from wallabag/change-page-title
Jeremy Benoist [Sun, 28 Aug 2016 12:33:46 +0000 (14:33 +0200)] 
Merge pull request #2245 from wallabag/change-page-title

Changed where page title is displayed

7 years agoOccitan version
Quent-in [Sat, 27 Aug 2016 10:24:18 +0000 (12:24 +0200)] 
Occitan version

Occitan translation, I hope I properly put it where it has to be.
If there reminds other textes to translate, please let me know!

7 years agoChanged where page title is displayed 2245/head
Nicolas Lœuillet [Fri, 26 Aug 2016 19:26:21 +0000 (21:26 +0200)] 
Changed where page title is displayed

7 years agoMerge pull request #2240 from wallabag/add-icon-public-share
Jeremy Benoist [Fri, 26 Aug 2016 10:14:36 +0000 (12:14 +0200)] 
Merge pull request #2240 from wallabag/add-icon-public-share

Add icon for public share link

7 years agoMerge pull request #2241 from modos189/v2-issue-1991
Jeremy Benoist [Fri, 26 Aug 2016 05:26:42 +0000 (07:26 +0200)] 
Merge pull request #2241 from modos189/v2-issue-1991

Fix issue #1991: correction of the height field to add articles

7 years agoFix issue #1991: correction of the height field to add articles 2241/head
Alexandr Danilov [Thu, 25 Aug 2016 22:13:35 +0000 (01:13 +0300)] 
Fix issue #1991: correction of the height field to add articles

7 years agoAdd icon for public share link 2240/head
Nicolas Lœuillet [Thu, 25 Aug 2016 14:19:21 +0000 (16:19 +0200)] 
Add icon for public share link

7 years agoMerge pull request #2238 from modos189/v2-improve-view
Thomas Citharel [Thu, 25 Aug 2016 13:55:30 +0000 (15:55 +0200)] 
Merge pull request #2238 from modos189/v2-improve-view

V2 improve view

7 years agoMerge pull request #2237 from wallabag/add-original-url-public-entry
Nicolas Lœuillet [Thu, 25 Aug 2016 13:39:15 +0000 (15:39 +0200)] 
Merge pull request #2237 from wallabag/add-original-url-public-entry

Add original link in public view of the article

7 years agoRemove text about original URL in public view 2237/head
Nicolas Lœuillet [Thu, 25 Aug 2016 13:32:38 +0000 (15:32 +0200)] 
Remove text about original URL in public view

7 years agoA new version of the plugin tinydot with update on window resize 2238/head
Alexandr Danilov [Thu, 25 Aug 2016 13:22:47 +0000 (16:22 +0300)] 
A new version of the plugin tinydot with update on window resize

7 years agoChanges in the login form:
Alexandr Danilov [Thu, 25 Aug 2016 13:09:55 +0000 (16:09 +0300)] 
Changes in the login form:
* The alignment of the login form centered in WebKit
* Indent after the reference password recovery

7 years agoAdd original link in public view of the article
Nicolas Lœuillet [Thu, 25 Aug 2016 12:39:33 +0000 (14:39 +0200)] 
Add original link in public view of the article

7 years agoMerge pull request #1904 from wallabag/feature-public-mode
Jeremy Benoist [Thu, 25 Aug 2016 07:30:51 +0000 (09:30 +0200)] 
Merge pull request #1904 from wallabag/feature-public-mode

Share entry with a public URL

7 years agoUpdate test 1904/head
Jeremy Benoist [Wed, 24 Aug 2016 20:29:36 +0000 (22:29 +0200)] 
Update test

and some cleanup

7 years agoHandle share_entry
Jeremy Benoist [Wed, 24 Aug 2016 19:56:02 +0000 (21:56 +0200)] 
Handle share_entry

- share_entry needs to be in the migration too
- and it needs a translation

7 years agoHandle table prefix in migration
Jeremy Benoist [Wed, 24 Aug 2016 19:38:26 +0000 (21:38 +0200)] 
Handle table prefix in migration

and fix migration for name field in oauth table

7 years agoMerge pull request #2236 from wallabag/allow-failure-php-7.1
Jeremy Benoist [Wed, 24 Aug 2016 09:39:17 +0000 (11:39 +0200)] 
Merge pull request #2236 from wallabag/allow-failure-php-7.1

Allow failure for PHP 7.1

7 years agoMerge pull request #2186 from wallabag/addRegistration
Jeremy Benoist [Wed, 24 Aug 2016 09:13:00 +0000 (11:13 +0200)] 
Merge pull request #2186 from wallabag/addRegistration

Add option to disable registration

7 years agoAllow failure for PHP 7.1 2236/head
Jeremy Benoist [Wed, 24 Aug 2016 08:49:43 +0000 (10:49 +0200)] 
Allow failure for PHP 7.1

Got tired of `EE/home/travis/build.sh: line 45:  4445 Segmentation fault      (core dumped) phpunit -v` using PHP 7.1.0beta3

7 years agoAdd simple test 2186/head
Nicolas Lœuillet [Wed, 24 Aug 2016 08:28:43 +0000 (10:28 +0200)] 
Add simple test

7 years agoMerge pull request #2234 from cstuder/patch-1
Nicolas Lœuillet [Wed, 24 Aug 2016 07:11:14 +0000 (09:11 +0200)] 
Merge pull request #2234 from cstuder/patch-1

Fixes mailto link in documentation

7 years agoMerge pull request #2235 from wallabag/german-doc-config
Nicolas Lœuillet [Wed, 24 Aug 2016 07:10:55 +0000 (09:10 +0200)] 
Merge pull request #2235 from wallabag/german-doc-config

Add configuration for german documentation

7 years agoChange annotation for uuid field
Nicolas Lœuillet [Wed, 24 Aug 2016 07:07:49 +0000 (09:07 +0200)] 
Change annotation for uuid field

7 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

7 years agoFixes mailto link in german translation 2234/head
Christian Studer [Wed, 24 Aug 2016 06:43:38 +0000 (08:43 +0200)] 
Fixes mailto link in german translation

7 years agoFixes mailto link in french translation
Christian Studer [Wed, 24 Aug 2016 06:43:17 +0000 (08:43 +0200)] 
Fixes mailto link in french translation

7 years agoFixes mailto link
Christian Studer [Wed, 24 Aug 2016 06:22:35 +0000 (08:22 +0200)] 
Fixes mailto link

7 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

7 years agoChange links on baggy theme
Nicolas Lœuillet [Tue, 23 Aug 2016 14:55:49 +0000 (16:55 +0200)] 
Change links on baggy theme

7 years agoChange share entry behavior
Nicolas Lœuillet [Tue, 23 Aug 2016 14:49:12 +0000 (16:49 +0200)] 
Change share entry behavior

7 years agoAdd translations
Nicolas Lœuillet [Wed, 27 Apr 2016 19:31:12 +0000 (21:31 +0200)] 
Add translations

7 years agoImprove migration
Nicolas Lœuillet [Mon, 18 Apr 2016 20:45:52 +0000 (22:45 +0200)] 
Improve migration

7 years agoAdd test and fix migration
Nicolas Lœuillet [Fri, 15 Apr 2016 11:42:13 +0000 (13:42 +0200)] 
Add test and fix migration

7 years agoAdd Cache on Share Action
Nicolas Lœuillet [Wed, 13 Apr 2016 20:26:02 +0000 (22:26 +0200)] 
Add Cache on Share Action

7 years agoAdd migration
Nicolas Lœuillet [Sun, 10 Apr 2016 19:48:11 +0000 (21:48 +0200)] 
Add migration

7 years agoShare entry with a public URL
Nicolas Lœuillet [Sun, 10 Apr 2016 15:33:15 +0000 (17:33 +0200)] 
Share entry with a public URL

7 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)

7 years agoMerge pull request #2218 from wallabag/api-delete-tags-1982
Nicolas Lœuillet [Tue, 23 Aug 2016 09:51:13 +0000 (11:51 +0200)] 
Merge pull request #2218 from wallabag/api-delete-tags-1982

Delete tag or tags by label

7 years agoCS
Jeremy Benoist [Sun, 24 Jul 2016 10:14:52 +0000 (12:14 +0200)] 
CS

7 years agoProper parameter name, simplify logic & phpdoc
Thomas Citharel [Sun, 24 Jul 2016 09:41:04 +0000 (11:41 +0200)] 
Proper parameter name, simplify logic & phpdoc

7 years agoAdd option to disable registration
Thomas Citharel [Sat, 2 Jul 2016 12:35:52 +0000 (14:35 +0200)] 
Add option to disable registration

7 years agoRemove duplicate pager on baggy 2218/head
Jeremy Benoist [Tue, 23 Aug 2016 05:36:43 +0000 (07:36 +0200)] 
Remove duplicate pager on baggy

7 years agoAdd some tests
Jeremy Benoist [Sun, 24 Jul 2016 08:55:49 +0000 (10:55 +0200)] 
Add some tests

Also, retrieve tag from the request instead of the query (which will be the same but it's more easy to test).

Moved down `deleteTagAction` because it conflicted with the new action:

  api_delete_tag => /api/tags/{tag}.{_format}
  api_delete_tags_label => /api/tags/label.{_format}

And finally, throw exception when a tag is not found before removing it.

7 years agoCS
Thomas Citharel [Sat, 25 Jun 2016 17:25:50 +0000 (19:25 +0200)] 
CS

7 years agoDelete tag or tags by label
Thomas Citharel [Sat, 25 Jun 2016 16:37:41 +0000 (18:37 +0200)] 
Delete tag or tags by label

Tests not included

7 years agoFix typos in field name
Jeremy Benoist [Fri, 17 Jun 2016 21:57:35 +0000 (23:57 +0200)] 
Fix typos in field name

7 years agoadded name on client
Thomas Citharel [Sat, 21 May 2016 16:09:38 +0000 (18:09 +0200)] 
added name on client

7 years agoAdd tests for tag list routes
Nicolas Lœuillet [Sat, 30 Apr 2016 13:03:22 +0000 (15:03 +0200)] 
Add tests for tag list routes

7 years agoTranslations and baggy view for tags
Nicolas Lœuillet [Wed, 20 Apr 2016 08:04:32 +0000 (10:04 +0200)] 
Translations and baggy view for tags

7 years agoLinks on each tag in Tags view
Nicolas Lœuillet [Thu, 14 Apr 2016 13:03:22 +0000 (15:03 +0200)] 
Links on each tag in Tags view

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

7 years agoMerge remote-tracking branch 'origin/master' into 2.1
Jeremy Benoist [Mon, 22 Aug 2016 21:03:16 +0000 (23:03 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.1

7 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

7 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

7 years agoAdded name on client
Thomas Citharel [Sat, 21 May 2016 16:09:38 +0000 (18:09 +0200)] 
Added name on client

- Fix typos in field name
- Added migration for name field in API client table

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2171

7 years agoUpgrade PHPUnit to version 5
Jeremy Benoist [Sun, 24 Jul 2016 09:15:51 +0000 (11:15 +0200)] 
Upgrade PHPUnit to version 5

- Fix deprecated getMock
- Use PHPUnit 4 for PHP 5.5 build

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2201

7 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

7 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

7 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

7 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

7 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

7 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

7 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.

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

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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

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

7 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.

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

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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 years agoMerge pull request #2202 from wallabag/fix-phpdoc
Jeremy Benoist [Sun, 24 Jul 2016 09:49:21 +0000 (11:49 +0200)] 
Merge pull request #2202 from wallabag/fix-phpdoc

add some missing phpdoc parameters

7 years agoadd some missing phpdoc parameters 2202/head
Thomas Citharel [Sun, 24 Jul 2016 09:47:03 +0000 (11:47 +0200)] 
add some missing phpdoc parameters

7 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

7 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"

7 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

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

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

7 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

7 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)

7 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