]> git.wh0rd.org Git - tt-rss.git/log
tt-rss.git
8 years agoimprovements for catchupFeedInGroup()
Andrew Dolgov [Mon, 21 Mar 2016 18:40:40 +0000 (21:40 +0300)]
improvements for catchupFeedInGroup()

8 years agoaf_redditimgur: relax youtube matching a bit
Andrew Dolgov [Sun, 20 Mar 2016 09:05:23 +0000 (12:05 +0300)]
af_redditimgur: relax youtube matching a bit

8 years agofix previous wrt single-image imgur pages
Andrew Dolgov [Sun, 20 Mar 2016 09:03:39 +0000 (12:03 +0300)]
fix previous wrt single-image imgur pages

8 years agoaf_redditimgur: fix handling of imgur albums, implement debugging (method=testurl)
Andrew Dolgov [Sun, 20 Mar 2016 08:30:56 +0000 (11:30 +0300)]
af_redditimgur: fix handling of imgur albums, implement debugging (method=testurl)

8 years agopass feed information to hook_article_export_feed
Andrew Dolgov [Tue, 1 Mar 2016 11:42:15 +0000 (14:42 +0300)]
pass feed information to hook_article_export_feed

8 years agoadd PluginHost.HOOK_ARTICLE_EXPORT_FEED
Andrew Dolgov [Tue, 1 Mar 2016 11:39:36 +0000 (14:39 +0300)]
add PluginHost.HOOK_ARTICLE_EXPORT_FEED

8 years agorewrite_relative_url: only skip urls like magnet: instead of everything with :
Andrew Dolgov [Sat, 20 Feb 2016 09:06:47 +0000 (12:06 +0300)]
rewrite_relative_url: only skip urls like magnet: instead of everything with :

8 years agoRevert "rewrite_relative_url: do not skip urls containing :"
Andrew Dolgov [Sat, 20 Feb 2016 09:02:34 +0000 (12:02 +0300)]
Revert "rewrite_relative_url: do not skip urls containing :"

This reverts commit a547fef6ab4da1d3691ac0f24aca8e9bb545bc25.

8 years agorewrite_relative_url: do not skip urls containing :
Andrew Dolgov [Sat, 20 Feb 2016 08:57:37 +0000 (11:57 +0300)]
rewrite_relative_url: do not skip urls containing :

8 years agopref_filters: sort rules by reg_exp when displaying index
Andrew Dolgov [Fri, 19 Feb 2016 15:52:54 +0000 (18:52 +0300)]
pref_filters: sort rules by reg_exp when displaying index

8 years agoMerge branch 'master' of git.tt-rss.org:fox/tt-rss
Andrew Dolgov [Fri, 19 Feb 2016 06:39:29 +0000 (09:39 +0300)]
Merge branch 'master' of git.tt-rss.org:fox/tt-rss

8 years agoMerge branch 'remove-srcsrc-local-cache' into 'master'
Andrew Dolgov [Fri, 19 Feb 2016 06:39:11 +0000 (09:39 +0300)]
Merge branch 'remove-srcsrc-local-cache' into 'master'

Remove srcset and sizes attributes from img tag if locally caching images.

As discussed in <https://tt-rss.org/forum/viewtopic.php?f=1&t=3624#p21886>

See merge request !27

8 years agoRemove srcset and sizes attributes from img tag if locally caching images.
JustAMacUser [Fri, 19 Feb 2016 06:35:11 +0000 (01:35 -0500)]
Remove srcset and sizes attributes from img tag if locally caching images.

8 years agoerror handler: do not log last query, truncate error message to a smaller length
Andrew Dolgov [Wed, 17 Feb 2016 13:42:13 +0000 (16:42 +0300)]
error handler: do not log last query, truncate error message to a smaller length

8 years agominitemplator: use proper constructor
Andrew Dolgov [Wed, 17 Feb 2016 09:29:42 +0000 (12:29 +0300)]
minitemplator: use proper constructor

8 years agogenerate_syndicated_feed: pass article id to sanitize()
Andrew Dolgov [Thu, 11 Feb 2016 17:11:01 +0000 (20:11 +0300)]
generate_syndicated_feed: pass article id to sanitize()

8 years agoMerge branch 'dont-wrap-excerpt' into 'master'
Andrew Dolgov [Mon, 8 Feb 2016 09:27:27 +0000 (12:27 +0300)]
Merge branch 'dont-wrap-excerpt' into 'master'

Make sure author and excerpt spans don't wrap even if active.

In combined display mode with an article collapsed via keyboard nav,
the article remains active, which lets the excerpt bubble out to several
lines depending on display width. Keep the excerpt nowrap always.

While here, fix the author display; nowrap always to keep the name
from splitting across lines in rare cases.

See merge request !26

8 years agoMake sure author and excerpt spans don't wrap even if active.
Todd Vierling [Sun, 7 Feb 2016 18:04:50 +0000 (13:04 -0500)]
Make sure author and excerpt spans don't wrap even if active.

In combined display mode with an article collapsed via keyboard nav,
the article remains active, which lets the excerpt bubble out to several
lines depending on display width. Keep the excerpt nowrap always.

While here, fix the author display; nowrap always to keep the name
from splitting across lines in rare cases.

8 years agoMerge branch 'new_tab_mac_fix' into 'master'
Andrew Dolgov [Sun, 7 Feb 2016 19:17:03 +0000 (22:17 +0300)]
Merge branch 'new_tab_mac_fix' into 'master'

Make "open in new tab" hotkey handler support mac "cmd+click" way (non-expanded mode)

https://tt-rss.org/forum/viewtopic.php?f=10&t=3682

See merge request !25

8 years agoMake "open in new tab" hotkey handler support mac "cmd+click" way (non-expanded mode)
Kostiantyn Moroz [Sun, 7 Feb 2016 18:48:24 +0000 (18:48 +0000)]
Make "open in new tab" hotkey handler support mac "cmd+click" way (non-expanded mode)

8 years agosanitize: allow <xml:namespace> (thanks, livejournal)
Andrew Dolgov [Fri, 5 Feb 2016 08:31:13 +0000 (11:31 +0300)]
sanitize: allow <xml:namespace> (thanks, livejournal)

8 years agoupdate_rss_feed: disable support for http 304 for the time being
Andrew Dolgov [Tue, 2 Feb 2016 11:51:02 +0000 (14:51 +0300)]
update_rss_feed: disable support for http 304 for the time being

8 years agoaf_redditimgur: add option for previous
Andrew Dolgov [Sun, 31 Jan 2016 11:14:31 +0000 (14:14 +0300)]
af_redditimgur: add option for previous

8 years agoaf_redditimgur: add (disabled) wip content dupe checker
Andrew Dolgov [Sun, 31 Jan 2016 11:01:18 +0000 (14:01 +0300)]
af_redditimgur: add (disabled) wip content dupe checker

8 years agoinline feed update: set feed as needing update if open_basedir is set + plugins need...
Andrew Dolgov [Sat, 30 Jan 2016 10:40:56 +0000 (13:40 +0300)]
inline feed update: set feed as needing update if open_basedir is set + plugins need curl

8 years agopref-labels: remove obsolete searching code
Andrew Dolgov [Sat, 30 Jan 2016 10:03:00 +0000 (13:03 +0300)]
pref-labels: remove obsolete searching code

8 years agopref-feeds: allow searching by feed_url
Andrew Dolgov [Sat, 30 Jan 2016 10:02:15 +0000 (13:02 +0300)]
pref-feeds: allow searching by feed_url

8 years agofix item_id not being properly escaped in pref_feeds::process_category_order() (possi...
Andrew Dolgov [Fri, 29 Jan 2016 14:24:59 +0000 (17:24 +0300)]
fix item_id not being properly escaped in pref_feeds::process_category_order() (possible sql injection)

8 years agocreate_published_article: only use readability if enabled in the plugin
Andrew Dolgov [Fri, 29 Jan 2016 12:48:44 +0000 (15:48 +0300)]
create_published_article: only use readability if enabled in the plugin

8 years agoenable support for readability (if af_readability is enabled) in shareanything bookma...
Andrew Dolgov [Fri, 29 Jan 2016 12:38:05 +0000 (15:38 +0300)]
enable support for readability (if af_readability is enabled) in shareanything bookmarklet

8 years agoremove reddit textnode hack since the feed is broken in a different way now
Andrew Dolgov [Wed, 27 Jan 2016 05:52:45 +0000 (08:52 +0300)]
remove reddit textnode hack since the feed is broken in a different way now

8 years agofix multiple issues with archived feeds
Andrew Dolgov [Tue, 26 Jan 2016 16:03:05 +0000 (19:03 +0300)]
fix multiple issues with archived feeds

8 years agoonly stop inline feed updates with open_basedir enabled if there are any plugins...
Andrew Dolgov [Tue, 26 Jan 2016 08:45:47 +0000 (11:45 +0300)]
only stop inline feed updates with open_basedir enabled if there are any plugins that require CURL enabled

add plugin->flags() returning array with additional plugin information, currently only CURL requirement (optional)

8 years agoprevent frontend updating of feeds on view if open_basedir is set to prevent plugins...
Andrew Dolgov [Sat, 23 Jan 2016 09:13:03 +0000 (12:13 +0300)]
prevent frontend updating of feeds on view if open_basedir is set to prevent plugins potentially not working correctly (i.e. if backend system has open_basedir disabled)

8 years agoaf_redditimgur: implement a hack to deal with reddit rss feed being currently broken
Andrew Dolgov [Sat, 23 Jan 2016 08:51:17 +0000 (11:51 +0300)]
af_redditimgur: implement a hack to deal with reddit rss feed being currently broken

8 years agoupdate_rss_feed: escape dumped content while debugging
Andrew Dolgov [Fri, 22 Jan 2016 23:17:24 +0000 (02:17 +0300)]
update_rss_feed: escape dumped content while debugging

8 years agosanitize: allow <description>
Andrew Dolgov [Fri, 22 Jan 2016 23:17:00 +0000 (02:17 +0300)]
sanitize: allow <description>

8 years agoparser: properly support tag subtrees instead of text content for article content
Andrew Dolgov [Fri, 22 Jan 2016 22:48:32 +0000 (01:48 +0300)]
parser: properly support tag subtrees instead of text content for article content

8 years agoRevert "parser: use node->c14n() instead of expecting html in nodeValue"
Andrew Dolgov [Fri, 22 Jan 2016 22:24:13 +0000 (01:24 +0300)]
Revert "parser: use node->c14n() instead of expecting html in nodeValue"

This reverts commit 1383514ad9e7630a3d9627e052780b8fcadab25a.

8 years agoparser: use node->c14n() instead of expecting html in nodeValue
Andrew Dolgov [Fri, 22 Jan 2016 22:04:24 +0000 (01:04 +0300)]
parser: use node->c14n() instead of expecting html in nodeValue

8 years agorebase translations
Andrew Dolgov [Sun, 17 Jan 2016 13:34:59 +0000 (16:34 +0300)]
rebase translations

8 years agoMerge branch 'po_fixes' into 'master'
Andrew Dolgov [Sun, 17 Jan 2016 13:33:32 +0000 (16:33 +0300)]
Merge branch 'po_fixes' into 'master'

Fixes to .po files

There were a few minor problems in the .po files, mostly invalid headers. Nothing serious, but the fixes are also quite simple.

See merge request !24

8 years agoadd feed debugger to update.php
Andrew Dolgov [Sun, 17 Jan 2016 11:24:20 +0000 (14:24 +0300)]
add feed debugger to update.php

8 years agoaf_psql_trgm: fix min_title_length not being used while processing articles
Andrew Dolgov [Sun, 17 Jan 2016 08:32:10 +0000 (11:32 +0300)]
af_psql_trgm: fix min_title_length not being used while processing articles

8 years agoget_article_tags: while getting tags from cache check if article entry actually exists
Andrew Dolgov [Thu, 14 Jan 2016 09:12:35 +0000 (12:12 +0300)]
get_article_tags: while getting tags from cache check if article entry actually exists

8 years agoupdates: auto-disable CURL if open_basedir is enabled, notify possible issues w/...
Andrew Dolgov [Wed, 13 Jan 2016 15:12:31 +0000 (18:12 +0300)]
updates: auto-disable CURL if open_basedir is enabled, notify possible issues w/ plugins

8 years agoupdate static version 16.1
Andrew Dolgov [Tue, 12 Jan 2016 13:44:14 +0000 (16:44 +0300)]
update static version

8 years agoAdded (untranslated/fuzzy) boilerplate for messages with plural forms for tr_TR.
Eduardo M KALINOWSKI [Sat, 9 Jan 2016 17:10:21 +0000 (15:10 -0200)]
Added (untranslated/fuzzy) boilerplate for messages with plural forms for tr_TR.

8 years agoAdded Plural-Forms to ca_CA and nb_NO.
Eduardo M KALINOWSKI [Sat, 9 Jan 2016 17:03:45 +0000 (15:03 -0200)]
Added Plural-Forms to ca_CA and nb_NO.

8 years agoThe code for Denmark is DK, rename to reflect that.
Eduardo M KALINOWSKI [Sat, 9 Jan 2016 16:50:26 +0000 (14:50 -0200)]
The code for Denmark is DK, rename to reflect that.

8 years agoFixed some small errors in the headers.
Eduardo M KALINOWSKI [Sat, 9 Jan 2016 16:49:36 +0000 (14:49 -0200)]
Fixed some small errors in the headers.

8 years agoCorrect Plural-Forms for pt_PT.
Eduardo M KALINOWSKI [Sat, 9 Jan 2016 16:29:20 +0000 (14:29 -0200)]
Correct Plural-Forms for pt_PT.

8 years agoadd some hacks to hopefully mitigate headlines memory leaks
Andrew Dolgov [Sun, 10 Jan 2016 22:11:26 +0000 (01:11 +0300)]
add some hacks to hopefully mitigate headlines memory leaks

8 years agoremove option ALLOW_DUPLICATE_POSTS as confusing/useless
Andrew Dolgov [Thu, 7 Jan 2016 19:01:35 +0000 (22:01 +0300)]
remove option ALLOW_DUPLICATE_POSTS as confusing/useless

8 years agofix broken article processing if ALLOW_DUPLICATE_POSTS is enabled
Andrew Dolgov [Thu, 7 Jan 2016 18:49:31 +0000 (21:49 +0300)]
fix broken article processing if ALLOW_DUPLICATE_POSTS is enabled

8 years agocache_starred_images: set filename when sending cached image
Andrew Dolgov [Wed, 6 Jan 2016 18:00:53 +0000 (21:00 +0300)]
cache_starred_images: set filename when sending cached image

8 years agodo not automatically call cleanup_tags() in housekeeping tasks
Andrew Dolgov [Mon, 4 Jan 2016 07:42:24 +0000 (10:42 +0300)]
do not automatically call cleanup_tags() in housekeeping tasks

8 years agoMerge branch 'lang_pt_BR' into 'master'
Andrew Dolgov [Mon, 4 Jan 2016 07:39:04 +0000 (10:39 +0300)]
Merge branch 'lang_pt_BR' into 'master'

pt_BR translation update

I've updated the pt_BR translation, adding missing strings and correctly some other strings to make them more consistent across the application.

See merge request !23

8 years agopt_BR translation improvements.
Eduardo M KALINOWSKI [Sun, 3 Jan 2016 17:41:27 +0000 (15:41 -0200)]
pt_BR translation improvements.

8 years agoCorrected Language field in header.
Eduardo M KALINOWSKI [Sun, 3 Jan 2016 10:39:23 +0000 (08:39 -0200)]
Corrected Language field in header.

8 years agoUpdated pt_BR translation.
Eduardo M KALINOWSKI [Sat, 2 Jan 2016 18:57:47 +0000 (16:57 -0200)]
Updated pt_BR translation.

8 years agoCorrected Plural-Forms, as there are only two possible forms in Portuguese.
Eduardo M KALINOWSKI [Tue, 29 Dec 2015 21:56:16 +0000 (19:56 -0200)]
Corrected Plural-Forms, as there are only two possible forms in Portuguese.

8 years agoMerge branch 'update-new-feeds-first-postgres' into 'master'
Andrew Dolgov [Thu, 31 Dec 2015 13:58:08 +0000 (16:58 +0300)]
Merge branch 'update-new-feeds-first-postgres' into 'master'

Update new feeds first in postgres

As disscussed in the forum: https://tt-rss.org/forum/viewtopic.php?f=10&t=3644&p=21594#p21594,

this fixes a bug where newly added feeds wouldn't be updated if the number of total feeds exceeded the DAEMON_FEED_LIMIT.

See merge request !22

8 years agoUpdate new feeds first in postgres
Thomas Kramer [Thu, 31 Dec 2015 11:54:52 +0000 (12:54 +0100)]
Update new feeds first in postgres

8 years agotag_is_valid: check numeric tags properly
Andrew Dolgov [Wed, 30 Dec 2015 12:14:01 +0000 (15:14 +0300)]
tag_is_valid: check numeric tags properly

8 years agogetfeedname: fix for non-numeric feeds (tags)
Andrew Dolgov [Wed, 30 Dec 2015 12:11:39 +0000 (15:11 +0300)]
getfeedname: fix for non-numeric feeds (tags)

8 years agoMerge branch 'af_unburn_fetch_only_headers' into 'master'
Andrew Dolgov [Fri, 25 Dec 2015 12:10:45 +0000 (15:10 +0300)]
Merge branch 'af_unburn_fetch_only_headers' into 'master'

af_unburn: Fetch only the headers in order to get the real article URL.

As discussed in the forum https://tt-rss.org/forum/viewtopic.php?f=8&t=3631 , this change makes af_unburn download only the headers in order to find the real URL, saving bandwidth.

See merge request !21

8 years agoFetch only the headers in order to get the real article URL.
Eduardo M KALINOWSKI [Fri, 25 Dec 2015 11:59:51 +0000 (09:59 -0200)]
Fetch only the headers in order to get the real article URL.

8 years agosanitize: clear out @srcset/@sizes on images leading to http sites when running over...
Andrew Dolgov [Thu, 17 Dec 2015 06:59:53 +0000 (09:59 +0300)]
sanitize: clear out @srcset/@sizes on images leading to http sites when running over https

8 years agoMerge branch 'master' of git.tt-rss.org:fox/tt-rss
Andrew Dolgov [Mon, 7 Dec 2015 17:07:37 +0000 (20:07 +0300)]
Merge branch 'master' of git.tt-rss.org:fox/tt-rss

8 years agocatchup_feed: proper fix for mysql 5.7
Andrew Dolgov [Mon, 7 Dec 2015 17:07:13 +0000 (20:07 +0300)]
catchup_feed: proper fix for mysql 5.7

8 years agottrss_gc: return true
Andrew Dolgov [Mon, 7 Dec 2015 12:25:31 +0000 (15:25 +0300)]
ttrss_gc: return true

8 years agofix previous, owner_uid not passed in daemon context
Andrew Dolgov [Mon, 7 Dec 2015 12:06:32 +0000 (15:06 +0300)]
fix previous, owner_uid not passed in daemon context

8 years agodo not discard custom set article tags when updating from source
Andrew Dolgov [Mon, 7 Dec 2015 08:54:24 +0000 (11:54 +0300)]
do not discard custom set article tags when updating from source

8 years agoMerge branch 'af-readability' into 'master'
Andrew Dolgov [Sat, 5 Dec 2015 21:22:29 +0000 (00:22 +0300)]
Merge branch 'af-readability' into 'master'

Fix array checking method in 2 places, add array check in one location for af_readability

See: https://tt-rss.org/gitlab/fox/tt-rss/merge_requests/19

Update method of array checking to is_array() in 2 locations, add the same check in another location that could have compared a NULL.

See merge request !20

8 years agoFix array checking method in 2 places, add array check in one location
Troy Engel [Sat, 5 Dec 2015 21:03:01 +0000 (15:03 -0600)]
Fix array checking method in 2 places, add array check in one location

8 years agoRevert "Fix accidental use of emtpy array: [E_WARNING (2) plugins/af_readability...
Troy Engel [Sat, 5 Dec 2015 20:49:54 +0000 (14:49 -0600)]
Revert "Fix accidental use of emtpy array: [E_WARNING (2) plugins/af_readability/init.php:186 Invalid argument supplied for foreach()]"

This reverts commit beaddcba961cd187e6d3ce968b94610838d70b54.

8 years agoformat_headlines_list: fix pg_num_rows() called incorrectly when firstid check failed
Andrew Dolgov [Sat, 5 Dec 2015 01:04:44 +0000 (04:04 +0300)]
format_headlines_list: fix pg_num_rows() called incorrectly when firstid check failed

8 years agocalculate_article_hash: strip tags before hashing fields
Andrew Dolgov [Sat, 5 Dec 2015 00:10:57 +0000 (03:10 +0300)]
calculate_article_hash: strip tags before hashing fields

8 years agoFix accidental use of emtpy array: [E_WARNING (2) plugins/af_readability/init.php...
Troy Engel [Fri, 4 Dec 2015 19:45:10 +0000 (13:45 -0600)]
Fix accidental use of emtpy array: [E_WARNING (2) plugins/af_readability/init.php:186 Invalid argument supplied for foreach()]

8 years agosanity_check: enforce minimum php version (5.4)
Andrew Dolgov [Fri, 4 Dec 2015 16:03:57 +0000 (19:03 +0300)]
sanity_check: enforce minimum php version (5.4)

8 years agostore formatted backtrace to sql log
Andrew Dolgov [Fri, 4 Dec 2015 12:58:20 +0000 (15:58 +0300)]
store formatted backtrace to sql log

8 years agodisable inner p width restriction for now
Andrew Dolgov [Fri, 4 Dec 2015 08:38:00 +0000 (11:38 +0300)]
disable inner p width restriction for now

8 years agocompat patches for php7
Andrew Dolgov [Fri, 4 Dec 2015 06:29:58 +0000 (09:29 +0300)]
compat patches for php7

8 years agoset_basic_feed_info: fix missing column
Andrew Dolgov [Thu, 3 Dec 2015 16:21:17 +0000 (19:21 +0300)]
set_basic_feed_info: fix missing column

8 years agoRevert "set_basic_feed_info: bail out if feed doesn't exist"
Andrew Dolgov [Thu, 3 Dec 2015 16:18:50 +0000 (19:18 +0300)]
Revert "set_basic_feed_info: bail out if feed doesn't exist"

This reverts commit d77bd1a5d213ed0e1d923e0c12ae16f022e92653.

8 years agoset_basic_feed_info: bail out if feed doesn't exist
Andrew Dolgov [Thu, 3 Dec 2015 13:16:42 +0000 (16:16 +0300)]
set_basic_feed_info: bail out if feed doesn't exist

8 years agologger: record last query before logged error
Andrew Dolgov [Thu, 3 Dec 2015 13:15:28 +0000 (16:15 +0300)]
logger: record last query before logged error

8 years agoget_article_filters: check if action.type is set
Andrew Dolgov [Thu, 3 Dec 2015 12:33:47 +0000 (15:33 +0300)]
get_article_filters: check if action.type is set

8 years agocatchup maybe add workaround for mysql 5.7 derived_merge
Andrew Dolgov [Thu, 3 Dec 2015 12:33:36 +0000 (15:33 +0300)]
catchup maybe add workaround for mysql 5.7 derived_merge

8 years agofilters: add to previous on JS side
Andrew Dolgov [Thu, 3 Dec 2015 07:25:30 +0000 (10:25 +0300)]
filters: add to previous on JS side

8 years agofilters: do not strip_tags() on regexps
Andrew Dolgov [Thu, 3 Dec 2015 07:17:32 +0000 (10:17 +0300)]
filters: do not strip_tags() on regexps

8 years agoupdate sanity_config
Andrew Dolgov [Tue, 1 Dec 2015 07:11:40 +0000 (10:11 +0300)]
update sanity_config

8 years agoMerge branch 'german-translation' into 'master'
Andrew Dolgov [Tue, 1 Dec 2015 07:09:32 +0000 (10:09 +0300)]
Merge branch 'german-translation' into 'master'

German translation

See merge request !16

8 years agoMerge branch 'lang_it' into 'master'
Andrew Dolgov [Tue, 1 Dec 2015 07:09:05 +0000 (10:09 +0300)]
Merge branch 'lang_it' into 'master'

updated italian translation

Translation for recently added strings

See merge request !17

8 years agoupdated italian translation
dedioste [Mon, 30 Nov 2015 20:59:05 +0000 (21:59 +0100)]
updated italian translation

8 years agoRevert "Fix missing SESSION_CHECK_ADDRESS in config"
Heiko Adams [Mon, 30 Nov 2015 09:42:11 +0000 (10:42 +0100)]
Revert "Fix missing SESSION_CHECK_ADDRESS in config"

This reverts commit 635ecdb9fa039adb8a0e8ead045bfda023e72bc4.

8 years agoUpdate german translation
Heiko Adams [Mon, 30 Nov 2015 09:30:24 +0000 (10:30 +0100)]
Update german translation

8 years agoMerge remote-tracking branch 'origin/master' into german-translation
Heiko Adams [Mon, 30 Nov 2015 09:29:44 +0000 (10:29 +0100)]
Merge remote-tracking branch 'origin/master' into german-translation

8 years agoMerge branch 'translation_update' into 'master'
Andrew Dolgov [Mon, 30 Nov 2015 08:58:39 +0000 (11:58 +0300)]
Merge branch 'translation_update' into 'master'

Translation update

See merge request !15