]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
8 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

8 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

8 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

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

and some cleanup

8 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

8 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

8 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

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

8 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

8 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

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

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

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

8 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

8 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

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

8 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

8 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

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

8 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

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

8 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

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

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

8 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

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

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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

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 remote-tracking branch 'origin/master' into 2.1
Jeremy Benoist [Wed, 20 Jul 2016 10:02:02 +0000 (12:02 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.1

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 #2183 from wallabag/tags-entries-view-baggy
Jeremy Benoist [Mon, 18 Jul 2016 13:17:33 +0000 (15:17 +0200)] 
Merge pull request #2183 from wallabag/tags-entries-view-baggy

Bring tags on entries view to baggy

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 agoBring tags on entries view to baggy 2183/head
Thomas Citharel [Fri, 1 Jul 2016 11:59:30 +0000 (13:59 +0200)] 
Bring tags on entries view to baggy

Also, a couple of UI improvement and CSS fixing

8 years agoMerge pull request #2174 from wallabag/api-filter-tags
Nicolas Lœuillet [Fri, 1 Jul 2016 08:35:45 +0000 (10:35 +0200)] 
Merge pull request #2174 from wallabag/api-filter-tags

Add filter for tags on API

8 years agofix merge issue 2174/head
Thomas Citharel [Wed, 29 Jun 2016 18:52:37 +0000 (20:52 +0200)] 
fix merge issue

8 years agoAdd filter for tags on API
Thomas Citharel [Sat, 25 Jun 2016 14:27:38 +0000 (16:27 +0200)] 
Add filter for tags on API

8 years agoMerge pull request #2176 from wallabag/add-since-parameter
Nicolas Lœuillet [Wed, 29 Jun 2016 07:34:39 +0000 (09:34 +0200)] 
Merge pull request #2176 from wallabag/add-since-parameter

Add since parameter

8 years agoCS 2176/head
Thomas Citharel [Sat, 25 Jun 2016 21:19:21 +0000 (23:19 +0200)] 
CS

8 years agoAdd since parameter
Thomas Citharel [Sat, 25 Jun 2016 19:05:50 +0000 (21:05 +0200)] 
Add since parameter

8 years agoMerge pull request #2170 from wallabag/addTagsOnEntriesView
Nicolas Lœuillet [Fri, 24 Jun 2016 12:23:38 +0000 (14:23 +0200)] 
Merge pull request #2170 from wallabag/addTagsOnEntriesView

Add tags on entries view and minor ui fixes

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 agouniformize tags on article view too 2170/head
Thomas Citharel [Fri, 24 Jun 2016 10:07:45 +0000 (12:07 +0200)] 
uniformize tags on article view too

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 agoadd line to other languages
Thomas Citharel [Fri, 24 Jun 2016 09:45:42 +0000 (11:45 +0200)] 
add line to other languages

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 #2169 from wallabag/fix-fonts
Jeremy Benoist [Fri, 24 Jun 2016 07:20:52 +0000 (09:20 +0200)] 
Merge pull request #2169 from wallabag/fix-fonts

fix font paths

8 years agominor ui fixes
Thomas Citharel [Thu, 23 Jun 2016 21:13:25 +0000 (23:13 +0200)] 
minor ui fixes

8 years agofix typo on icons
Thomas Citharel [Thu, 23 Jun 2016 20:51:09 +0000 (22:51 +0200)] 
fix typo on icons

8 years agoAdd tags on entries view
Thomas Citharel [Thu, 23 Jun 2016 07:06:54 +0000 (09:06 +0200)] 
Add tags on entries view

Should be tested on old browsers

8 years agofix font paths 2169/head
Thomas Citharel [Thu, 23 Jun 2016 20:10:12 +0000 (22:10 +0200)] 
fix font paths