]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
7 years agoMerge pull request #2839 from foxmask/master
Jeremy Benoist [Sun, 5 Feb 2017 11:34:20 +0000 (12:34 +0100)] 
Merge pull request #2839 from foxmask/master

scripts/update.sh: 18: scripts/update.sh: composer.phar: not found

7 years agoMerge pull request #2838 from wallabag/Quent-in-patch-1
Jeremy Benoist [Sat, 4 Feb 2017 20:54:43 +0000 (21:54 +0100)] 
Merge pull request #2838 from wallabag/Quent-in-patch-1

Update Oc version

7 years agoMerge pull request #2840 from wallabag/fix-frameworkbundle
Jeremy Benoist [Sat, 4 Feb 2017 20:53:26 +0000 (21:53 +0100)] 
Merge pull request #2840 from wallabag/fix-frameworkbundle

Restored correct version for framework-extra-bundle

7 years agoRestored correct version for framework-extra-bundle 2840/head
Nicolas Lœuillet [Sat, 4 Feb 2017 17:26:16 +0000 (18:26 +0100)] 
Restored correct version for framework-extra-bundle

The bundle was fixed in latest version.

7 years agoscripts/update.sh: 18: scripts/update.sh: composer.phar: not found 2839/head
FoxMaSk [Sat, 4 Feb 2017 16:02:25 +0000 (17:02 +0100)] 
scripts/update.sh: 18: scripts/update.sh: composer.phar: not found

when composer.phar is not globally installed, we should add "./" in front of "composer.phar" to run it from the current folder.

7 years agoUpdate Oc version 2838/head
Quent-in [Sat, 4 Feb 2017 14:21:13 +0000 (15:21 +0100)] 
Update Oc version

I'll be ready for next train

7 years agoMerge pull request #2818 from Kdecherf/fix-search-bar
Nicolas Lœuillet [Fri, 3 Feb 2017 08:04:33 +0000 (09:04 +0100)] 
Merge pull request #2818 from Kdecherf/fix-search-bar

Fix nav-panel-search height

7 years agoAdded minified CSS files 2818/head
Nicolas Lœuillet [Thu, 2 Feb 2017 13:19:47 +0000 (14:19 +0100)] 
Added minified CSS files

7 years agoFix nav-panel-search height
Kevin Decherf [Tue, 31 Jan 2017 21:17:40 +0000 (22:17 +0100)] 
Fix nav-panel-search height

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoMerge pull request #2831 from wallabag/Quent-in-patch-1
Jeremy Benoist [Thu, 2 Feb 2017 16:11:40 +0000 (17:11 +0100)] 
Merge pull request #2831 from wallabag/Quent-in-patch-1

Update of CraueConfigBundle in Occitan

7 years agoUpdate of CraueConfigBundle in Occitan 2831/head
Quent-in [Thu, 2 Feb 2017 15:29:28 +0000 (16:29 +0100)] 
Update of CraueConfigBundle in Occitan

7 years agoMerge pull request #2824 from wallabag/simplify-strings
Nicolas Lœuillet [Thu, 2 Feb 2017 14:35:22 +0000 (15:35 +0100)] 
Merge pull request #2824 from wallabag/simplify-strings

Renamed Developer section to API client management

7 years agoFreezed sensio/framework-extra-bundle version 2824/head
Nicolas Lœuillet [Thu, 2 Feb 2017 13:39:17 +0000 (14:39 +0100)] 
Freezed sensio/framework-extra-bundle version

7 years agoMerge pull request #2826 from wallabag/jlnostr-patch-1
Jeremy Benoist [Thu, 2 Feb 2017 08:13:21 +0000 (09:13 +0100)] 
Merge pull request #2826 from wallabag/jlnostr-patch-1

Translate missing strings for de-DE.

7 years agoMerge pull request #2829 from wallabag/mruminski-patch-1
Jeremy Benoist [Thu, 2 Feb 2017 08:12:52 +0000 (09:12 +0100)] 
Merge pull request #2829 from wallabag/mruminski-patch-1

Update polish strings

7 years agoUpdate polish strings 2829/head
Mateusz Rumiński [Wed, 1 Feb 2017 21:29:03 +0000 (22:29 +0100)] 
Update polish strings

update missing polish strings

7 years agoTranslate missing strings for de-DE. 2826/head
Julian Oster [Wed, 1 Feb 2017 21:06:04 +0000 (22:06 +0100)] 
Translate missing strings for de-DE.

7 years agoUpdate german strings.
Julian Oster [Wed, 1 Feb 2017 20:29:59 +0000 (21:29 +0100)] 
Update german strings.

7 years agoRenamed Developer section to API client management
Nicolas Lœuillet [Wed, 1 Feb 2017 09:11:45 +0000 (10:11 +0100)] 
Renamed Developer section to API client management

7 years agoMerge pull request #2816 from wallabag/add-details-update
Nicolas Lœuillet [Tue, 31 Jan 2017 13:09:51 +0000 (14:09 +0100)] 
Merge pull request #2816 from wallabag/add-details-update

Added details about upgrade from 2.1.x or 2.2.0

7 years agoAdded details about upgrade from 2.1.x or 2.2.0 2816/head
Nicolas Lœuillet [Tue, 31 Jan 2017 11:53:22 +0000 (12:53 +0100)] 
Added details about upgrade from 2.1.x or 2.2.0

7 years agoMerge pull request #2812 from wallabag/prepare-221
Nicolas Lœuillet [Tue, 31 Jan 2017 10:31:45 +0000 (11:31 +0100)] 
Merge pull request #2812 from wallabag/prepare-221

Prepare wallabag 2.2.1 :rocket:

7 years agoPrepare wallabag 2.2.1 :rocket: 2812/head
Nicolas Lœuillet [Tue, 31 Jan 2017 10:06:35 +0000 (11:06 +0100)] 
Prepare wallabag 2.2.1 :rocket:

7 years agoMerge pull request #2809 from wallabag/fix-22-migrations
Nicolas Lœuillet [Tue, 31 Jan 2017 10:03:58 +0000 (11:03 +0100)] 
Merge pull request #2809 from wallabag/fix-22-migrations

Fixed duplicate entry for share_public in craue_setting_table

7 years agoAdded check in migration about uuid field 2809/head
Nicolas Lœuillet [Mon, 30 Jan 2017 20:21:49 +0000 (21:21 +0100)] 
Added check in migration about uuid field

7 years agoFixed duplicate entry for share_public in craue_setting_table
Nicolas Lœuillet [Mon, 30 Jan 2017 15:22:03 +0000 (16:22 +0100)] 
Fixed duplicate entry for share_public in craue_setting_table

7 years agoMerge pull request #2790 from wallabag/prepare-220
Nicolas Lœuillet [Fri, 27 Jan 2017 18:03:13 +0000 (19:03 +0100)] 
Merge pull request #2790 from wallabag/prepare-220

Prepare wallabag 2.2.0 🚀

7 years agoPrepare wallabag 2.2.0 :rocket: 2790/head
Nicolas Lœuillet [Fri, 27 Jan 2017 16:23:16 +0000 (17:23 +0100)] 
Prepare wallabag 2.2.0 :rocket:

7 years agoMerge pull request #2789 from wallabag/add-index-starred-archived
Nicolas Lœuillet [Fri, 27 Jan 2017 13:46:50 +0000 (14:46 +0100)] 
Merge pull request #2789 from wallabag/add-index-starred-archived

Added indexes on is_archived and is_starred

7 years agoFixed check on index 2789/head
Nicolas Lœuillet [Fri, 27 Jan 2017 11:10:52 +0000 (12:10 +0100)] 
Fixed check on index

7 years agoAdded indexes on is_archived and is_starred
Nicolas Lœuillet [Fri, 27 Jan 2017 10:44:04 +0000 (11:44 +0100)] 
Added indexes on is_archived and is_starred

7 years agoMerge pull request #2416 from wallabag/2.2
Jeremy Benoist [Fri, 27 Jan 2017 08:34:32 +0000 (09:34 +0100)] 
Merge pull request #2416 from wallabag/2.2

wallabag 2.2.0

7 years agoMerge remote-tracking branch 'origin/master' into 2.2 2416/head
Jeremy Benoist [Thu, 26 Jan 2017 12:32:07 +0000 (13:32 +0100)] 
Merge remote-tracking branch 'origin/master' into 2.2

7 years agoMerge pull request #2646 from wallabag/explain-migrations-in-doc
Nicolas Lœuillet [Thu, 26 Jan 2017 12:15:06 +0000 (13:15 +0100)] 
Merge pull request #2646 from wallabag/explain-migrations-in-doc

Added explanations about migrations

7 years agoMerge pull request #2787 from wallabag/lock-rulerz
Jeremy Benoist [Thu, 26 Jan 2017 10:33:42 +0000 (11:33 +0100)] 
Merge pull request #2787 from wallabag/lock-rulerz

Lock kphoen/rulerz to avoid breaking changes

7 years agoLock kphoen/rulerz to avoid breaking changes 2787/head
Jeremy Benoist [Thu, 26 Jan 2017 10:01:25 +0000 (11:01 +0100)] 
Lock kphoen/rulerz to avoid breaking changes

7 years agoMerge pull request #2750 from wallabag/rename-uuid
Jeremy Benoist [Wed, 25 Jan 2017 12:57:26 +0000 (13:57 +0100)] 
Merge pull request #2750 from wallabag/rename-uuid

Added migration to rename uuid to uid

7 years agoAdded migration for SQLite 2750/head
Nicolas Lœuillet [Wed, 25 Jan 2017 11:59:04 +0000 (12:59 +0100)] 
Added migration for SQLite

7 years agoMoved queries in a separate file 2646/head
Nicolas Lœuillet [Wed, 25 Jan 2017 11:34:20 +0000 (12:34 +0100)] 
Moved queries in a separate file

7 years agoMerge pull request #2774 from wallabag/cli-export
Thomas Citharel [Tue, 24 Jan 2017 20:07:49 +0000 (21:07 +0100)] 
Merge pull request #2774 from wallabag/cli-export

add cli export

7 years agoFix phpcs and tests 2774/head
Thomas Citharel [Tue, 24 Jan 2017 19:42:02 +0000 (20:42 +0100)] 
Fix phpcs and tests

7 years agoFixed update script
Nicolas Lœuillet [Mon, 23 Jan 2017 13:43:00 +0000 (14:43 +0100)] 
Fixed update script

7 years agoAdded hardcoded SQL for migration to 2.2
Nicolas Lœuillet [Mon, 23 Jan 2017 13:16:00 +0000 (14:16 +0100)] 
Added hardcoded SQL for migration to 2.2

7 years agoAdded information about latest migrations
Nicolas Lœuillet [Fri, 13 Jan 2017 13:51:37 +0000 (14:51 +0100)] 
Added information about latest migrations

7 years agoAdd translation for :de:
Julian Oster [Thu, 24 Nov 2016 21:52:01 +0000 (22:52 +0100)] 
Add translation for :de:

7 years agoAdded french translation
Nicolas Lœuillet [Thu, 24 Nov 2016 21:21:18 +0000 (22:21 +0100)] 
Added french translation

7 years agoAdded explanations about migrations
Nicolas Lœuillet [Thu, 24 Nov 2016 20:15:07 +0000 (21:15 +0100)] 
Added explanations about migrations

7 years agoadd filepath test
Thomas Citharel [Sun, 22 Jan 2017 12:19:46 +0000 (13:19 +0100)] 
add filepath test

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoadd cli export
Thomas Citharel [Sun, 22 Jan 2017 11:51:14 +0000 (12:51 +0100)] 
add cli export

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoMerge pull request #2763 from janLo/sort-tags
Thomas Citharel [Wed, 18 Jan 2017 14:15:19 +0000 (15:15 +0100)] 
Merge pull request #2763 from janLo/sort-tags

Sort list of available tags

7 years agoMerge pull request #2759 from wallabag/prepare-216 2.1.6
Nicolas Lœuillet [Wed, 18 Jan 2017 09:24:24 +0000 (10:24 +0100)] 
Merge pull request #2759 from wallabag/prepare-216

Prepare wallabag 2.1.6 :rocket:

7 years agoOrder tags by slug 2763/head
Jan Losinski [Tue, 17 Jan 2017 18:22:20 +0000 (19:22 +0100)] 
Order tags by slug

This adds an orderBy clause to findAllTags(). This makes the list of
tags more useful, as the tags appear in alphanumerical order instead of
somehow random.

Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
7 years agoPrepare wallabag 2.1.6 :rocket: 2759/head
Nicolas Lœuillet [Tue, 17 Jan 2017 09:46:41 +0000 (10:46 +0100)] 
Prepare wallabag 2.1.6 :rocket:

7 years agoMerge pull request #2758 from wallabag/fix-public-sharing
Nicolas Lœuillet [Tue, 17 Jan 2017 10:59:14 +0000 (11:59 +0100)] 
Merge pull request #2758 from wallabag/fix-public-sharing

Fixed possible JS injection via the title edition

7 years agoFixed possible JS injection via the title edition 2758/head
Nicolas Lœuillet [Tue, 17 Jan 2017 09:09:04 +0000 (10:09 +0100)] 
Fixed possible JS injection via the title edition

7 years agoAdded migration to rename uuid to uid
Nicolas Lœuillet [Sat, 14 Jan 2017 12:46:20 +0000 (13:46 +0100)] 
Added migration to rename uuid to uid

7 years agoMerge pull request #2742 from wallabag/fix-og-image-false
Nicolas Lœuillet [Tue, 10 Jan 2017 20:25:27 +0000 (21:25 +0100)] 
Merge pull request #2742 from wallabag/fix-og-image-false

Avoid false preview image

7 years agoUse latest bdunogier/guzzle-site-authenticator 2742/head
Jeremy Benoist [Tue, 10 Jan 2017 17:50:55 +0000 (18:50 +0100)] 
Use latest bdunogier/guzzle-site-authenticator

7 years agoFix registration.submit test
Jeremy Benoist [Tue, 10 Jan 2017 17:50:45 +0000 (18:50 +0100)] 
Fix registration.submit test

7 years agoAvoid false preview image
Jeremy Benoist [Tue, 10 Jan 2017 16:42:34 +0000 (17:42 +0100)] 
Avoid false preview image

If the website doesn't provide an og_image, the value will be false and so it'll be saved like that in the database.
We prefer to leave it as null instead of false.

7 years agoUpdate deps
Jeremy Benoist [Tue, 10 Jan 2017 16:35:17 +0000 (17:35 +0100)] 
Update deps

7 years agoMerge pull request #2733 from wallabag/fix-no-matching-response
Jeremy Benoist [Sun, 8 Jan 2017 09:22:31 +0000 (10:22 +0100)] 
Merge pull request #2733 from wallabag/fix-no-matching-response

Fixed API error No matching accepted Response format could be determined

7 years agoMerge pull request #2736 from lex111/patch-1
Thomas Citharel [Wed, 4 Jan 2017 21:43:58 +0000 (22:43 +0100)] 
Merge pull request #2736 from lex111/patch-1

Update copyright year

7 years agoUpdate copyright year in COPYING.md 2736/head
Alexey Py [Wed, 4 Jan 2017 21:06:09 +0000 (00:06 +0300)] 
Update copyright year in COPYING.md

7 years agoUpdate copyright year
Alexey Py [Wed, 4 Jan 2017 20:57:33 +0000 (23:57 +0300)] 
Update copyright year

7 years agoMerge pull request #2735 from wallabag/remove-small-readingtime
Nicolas Lœuillet [Fri, 30 Dec 2016 14:45:19 +0000 (15:45 +0100)] 
Merge pull request #2735 from wallabag/remove-small-readingtime

Removed the small element on reading time

7 years agoMerge pull request #2729 from Simounet/fix/double-overlay-right-sidenav
Nicolas Lœuillet [Fri, 30 Dec 2016 14:01:39 +0000 (15:01 +0100)] 
Merge pull request #2729 from Simounet/fix/double-overlay-right-sidenav

Fix double overlay on expanded right sidenav

7 years agoMerge pull request #2728 from Simounet/fix/side-nav-scrolling
Nicolas Lœuillet [Fri, 30 Dec 2016 13:57:39 +0000 (14:57 +0100)] 
Merge pull request #2728 from Simounet/fix/side-nav-scrolling

Fix right side-nav scrolling on low height window

7 years agoRemoved the small element on reading time 2735/head
Nicolas Lœuillet [Fri, 30 Dec 2016 13:17:18 +0000 (14:17 +0100)] 
Removed the small element on reading time

7 years agoFix double overlay on expanded right sidenav 2729/head
Simounet [Thu, 29 Dec 2016 18:17:36 +0000 (19:17 +0100)] 
Fix double overlay on expanded right sidenav

7 years agoFix action's icons position 2728/head
Simounet [Fri, 30 Dec 2016 12:54:13 +0000 (13:54 +0100)] 
Fix action's icons position

7 years agoFix right side-nav scrolling on low height window
Simounet [Thu, 29 Dec 2016 18:17:36 +0000 (19:17 +0100)] 
Fix right side-nav scrolling on low height window

7 years agoMerge pull request #2725 from lapineige/master
Nicolas Lœuillet [Fri, 30 Dec 2016 12:50:44 +0000 (13:50 +0100)] 
Merge pull request #2725 from lapineige/master

Share to Shaarli - Include tags

7 years agoFixed API error 'No matching accepted Response format could be determined' 2733/head
Nicolas Lœuillet [Fri, 30 Dec 2016 12:23:02 +0000 (13:23 +0100)] 
Fixed API error 'No matching accepted Response format could be determined'

7 years agoMerge pull request #2732 from Simounet/fix/firefox-addon-url
Nicolas Lœuillet [Fri, 30 Dec 2016 12:18:22 +0000 (13:18 +0100)] 
Merge pull request #2732 from Simounet/fix/firefox-addon-url

Firefox add-on URL updated

7 years agoFirefox add-on URL updated 2732/head
Simounet [Fri, 30 Dec 2016 11:01:38 +0000 (12:01 +0100)] 
Firefox add-on URL updated

7 years agoMerge pull request #2730 from Simounet/feature/all-actions-on-mobile
Nicolas Lœuillet [Fri, 30 Dec 2016 10:10:47 +0000 (11:10 +0100)] 
Merge pull request #2730 from Simounet/feature/all-actions-on-mobile

Access to search, filters, export on mobile

7 years agoMerge pull request #2731 from llune/patch-2
Nicolas Lœuillet [Fri, 30 Dec 2016 07:55:15 +0000 (08:55 +0100)] 
Merge pull request #2731 from llune/patch-2

Minor typo fix

7 years agoMinor typo fix 2731/head
llune [Fri, 30 Dec 2016 01:20:58 +0000 (02:20 +0100)] 
Minor typo fix

7 years agoAccess to search, filters, export on mobile 2730/head
Simounet [Thu, 29 Dec 2016 18:19:51 +0000 (19:19 +0100)] 
Access to search, filters, export on mobile

7 years agoMerge pull request #2702 from wallabag/add-index-uuid
Nicolas Lœuillet [Thu, 29 Dec 2016 09:54:07 +0000 (10:54 +0100)] 
Merge pull request #2702 from wallabag/add-index-uuid

Added index on entry.uuid

7 years agoRenamed uuid to uid 2702/head
Nicolas Lœuillet [Thu, 29 Dec 2016 09:09:44 +0000 (10:09 +0100)] 
Renamed uuid to uid

7 years agoMerge pull request #2724 from Simounet/fix/reading-time
Thomas Citharel [Wed, 28 Dec 2016 17:11:01 +0000 (18:11 +0100)] 
Merge pull request #2724 from Simounet/fix/reading-time

Fix entry reading time

7 years agoShare tags to Shaarli - Material theme 2725/head
lapineige [Wed, 28 Dec 2016 11:27:09 +0000 (12:27 +0100)] 
Share tags to Shaarli - Material theme

7 years agoShare tags to Shaarli - Baggy theme
lapineige [Wed, 28 Dec 2016 11:27:00 +0000 (12:27 +0100)] 
Share tags to Shaarli - Baggy theme

7 years agoMerge pull request #2723 from wallabag/fix-export-tag-space
Nicolas Lœuillet [Wed, 28 Dec 2016 08:10:14 +0000 (09:10 +0100)] 
Merge pull request #2723 from wallabag/fix-export-tag-space

Fixed export by tags with a tag which contains space

7 years agoFix entry reading time 2724/head
Simounet [Tue, 27 Dec 2016 21:37:24 +0000 (22:37 +0100)] 
Fix entry reading time

7 years agoFixed export by tags with a tag which contains space 2723/head
Nicolas Lœuillet [Tue, 27 Dec 2016 20:26:53 +0000 (21:26 +0100)] 
Fixed export by tags with a tag which contains space

7 years agoChanged uuid type in database
Nicolas Lœuillet [Fri, 23 Dec 2016 08:49:22 +0000 (09:49 +0100)] 
Changed uuid type in database

7 years agoFixed index on entry.uuid and changed uuid field type
Nicolas Lœuillet [Sun, 18 Dec 2016 13:09:56 +0000 (14:09 +0100)] 
Fixed index on entry.uuid and changed uuid field type

7 years agoAdded index on table creation
Nicolas Lœuillet [Wed, 14 Dec 2016 09:11:33 +0000 (10:11 +0100)] 
Added index on table creation

7 years agoAdded index on entry.uuid
Nicolas Lœuillet [Wed, 14 Dec 2016 08:47:07 +0000 (09:47 +0100)] 
Added index on entry.uuid
Useful for entry sharing

7 years agoMerge pull request #2696 from wallabag/run-migration
Nicolas Lœuillet [Fri, 23 Dec 2016 08:31:41 +0000 (09:31 +0100)] 
Merge pull request #2696 from wallabag/run-migration

Run migration on each test

7 years agoFix bad migration for PostreSQL 2696/head
Jeremy Benoist [Fri, 23 Dec 2016 08:00:13 +0000 (09:00 +0100)] 
Fix bad migration for PostreSQL

Queries weren’t executed for PostgreSQL, bad syntax.

7 years agoMerge pull request #2714 from Simounet/fix/entry-card-shadow
Jeremy Benoist [Tue, 20 Dec 2016 13:52:50 +0000 (14:52 +0100)] 
Merge pull request #2714 from Simounet/fix/entry-card-shadow

Fix the box shadow on the card entry

7 years agoFix the box shadow on the card entry 2714/head
Simounet [Tue, 20 Dec 2016 12:04:51 +0000 (13:04 +0100)] 
Fix the box shadow on the card entry

7 years agoBe consistent between migration & schema definition
Jeremy Benoist [Mon, 19 Dec 2016 13:24:19 +0000 (14:24 +0100)] 
Be consistent between migration & schema definition

7 years agofixup! Run migration in test, ready for MySQL
Jeremy Benoist [Tue, 13 Dec 2016 09:41:47 +0000 (10:41 +0100)] 
fixup! Run migration in test, ready for MySQL

7 years agoUse actual database name
Jeremy Benoist [Tue, 13 Dec 2016 09:31:53 +0000 (10:31 +0100)] 
Use actual database name

We can't retrieve the environment within the migration.
And when we ran migration on Travis, database name isn't `database_name` but `test_database_name`.
Retrieve the database name from the connection is more accurate

7 years agopocket_consumer_key can be null
Jeremy Benoist [Tue, 13 Dec 2016 08:35:54 +0000 (09:35 +0100)] 
pocket_consumer_key can be null