summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.rst17
-rw-r--r--js/app/app.coffee6
-rw-r--r--js/app/directives/newsitemscroll.coffee4
-rw-r--r--js/public/app.js6
-rw-r--r--l10n/ar/news.po4
-rw-r--r--l10n/bg_BG/news.po4
-rw-r--r--l10n/bn_BD/news.po4
-rw-r--r--l10n/bs/news.po4
-rw-r--r--l10n/ca/news.po4
-rw-r--r--l10n/cs_CZ/news.po4
-rw-r--r--l10n/cy_GB/news.po4
-rw-r--r--l10n/da/news.po4
-rw-r--r--l10n/de/news.po4
-rw-r--r--l10n/de_DE/news.po4
-rw-r--r--l10n/el/news.po4
-rw-r--r--l10n/eo/news.po4
-rw-r--r--l10n/es/news.po4
-rw-r--r--l10n/es_AR/news.po4
-rw-r--r--l10n/et_EE/news.po4
-rw-r--r--l10n/eu/news.po4
-rw-r--r--l10n/fa/news.po4
-rw-r--r--l10n/fi_FI/news.po4
-rw-r--r--l10n/fr/news.po4
-rw-r--r--l10n/gl/news.po4
-rw-r--r--l10n/he/news.po4
-rw-r--r--l10n/hr/news.po4
-rw-r--r--l10n/hu_HU/news.po4
-rw-r--r--l10n/ia/news.po4
-rw-r--r--l10n/id/news.po4
-rw-r--r--l10n/is/news.po4
-rw-r--r--l10n/it/news.po4
-rw-r--r--l10n/ja_JP/news.po4
-rw-r--r--l10n/ka_GE/news.po4
-rw-r--r--l10n/ko/news.po4
-rw-r--r--l10n/ku_IQ/news.po4
-rw-r--r--l10n/lb/news.po4
-rw-r--r--l10n/lt_LT/news.po4
-rw-r--r--l10n/lv/news.po4
-rw-r--r--l10n/mk/news.po4
-rw-r--r--l10n/ms_MY/news.po4
-rw-r--r--l10n/my_MM/news.po4
-rw-r--r--l10n/nb_NO/news.po4
-rw-r--r--l10n/nl/news.po4
-rw-r--r--l10n/nn_NO/news.po4
-rw-r--r--l10n/oc/news.po4
-rw-r--r--l10n/pl/news.po4
-rw-r--r--l10n/pt_BR/news.po4
-rw-r--r--l10n/pt_PT/news.po4
-rw-r--r--l10n/ro/news.po4
-rw-r--r--l10n/ru/news.po4
-rw-r--r--l10n/si_LK/news.po4
-rw-r--r--l10n/sk_SK/news.po4
-rw-r--r--l10n/sl/news.po4
-rw-r--r--l10n/sq/news.po4
-rw-r--r--l10n/sr/news.po4
-rw-r--r--l10n/sr@latin/news.po4
-rw-r--r--l10n/sv/news.po4
-rw-r--r--l10n/ta_LK/news.po4
-rw-r--r--l10n/te.php15
-rw-r--r--l10n/te/news.po33
-rw-r--r--l10n/templates/news.pot2
-rw-r--r--l10n/th_TH/news.po4
-rw-r--r--l10n/tr/news.po4
-rw-r--r--l10n/ug/news.po4
-rw-r--r--l10n/uk/news.po4
-rw-r--r--l10n/ur_PK/news.po4
-rw-r--r--l10n/vi/news.po4
-rw-r--r--l10n/zh_CN.GB2312/news.po4
-rw-r--r--l10n/zh_CN/news.po4
-rw-r--r--l10n/zh_HK/news.po4
-rw-r--r--l10n/zh_TW/news.po4
-rw-r--r--templates/main.php2
72 files changed, 184 insertions, 157 deletions
diff --git a/README.rst b/README.rst
index 5e969e1be..deb085c6b 100644
--- a/README.rst
+++ b/README.rst
@@ -149,9 +149,20 @@ Performance Notices
-------------------
* Use MySQL or PostgreSQL for better database performance
-Known Problems
---------------
-* **Feeds are not updated anymore**: `this is a bug in the core backgroundjob system <https://github.com/owncloud/core/issues/3221>`_ deleting the :file:`owncloud/data/cron.lock` file gets the cron back up running
+Frequent Problems
+-----------------
+
+All feeds are not updated anymore
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+`This is a bug in the core backgroundjob system <https://github.com/owncloud/core/issues/3221>`_ deleting the :file:`owncloud/data/cron.lock` file gets the cron back up running
+
+All feeds are not updated and theres no cron.lock
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Check if the cronjob exists with **crontab -u www-data -e** (replace www-data with your httpd user)
+* Check if the cronjob is ever executed by placing an **error_log('updating')** in the `background job file <https://github.com/owncloud/news/blob/master/backgroundjob/task.php#L37>`_. If the cronjob runs, there should be an updating log statement in your httpd log.
+* If there is no **updating** statement in your logs check if your cronjob is executed by executing a different script
+* If your cron works fine but owncloud's cronjobs are never executed, file a bug in `core <https://github.com/owncloud/core/>`_
+
Configuration
-------------
diff --git a/js/app/app.coffee b/js/app/app.coffee
index 32a77a9e3..01e5df86d 100644
--- a/js/app/app.coffee
+++ b/js/app/app.coffee
@@ -27,18 +27,18 @@ angular.module('News', ['OC', 'ui']).config ($provide) ->
markReadTimeout: 500
scrollTimeout: 500
feedUpdateInterval: 1000*60*3 # miliseconds
- itemBatchSize: 20
+ itemBatchSize: 40
undoTimeout: 1000*10 # miliseconds
# the autoPageFactor defines how many articles must be left
# before it starts autopaging
- autoPageFactor: 10
+ autoPageFactor: 30
angular.module('News').run ['Persistence', 'Config',
(Persistence, Config) ->
Persistence.init()
-
+
setInterval ->
Persistence.getAllFeeds(null, false)
Persistence.getAllFolders(null, false)
diff --git a/js/app/directives/newsitemscroll.coffee b/js/app/directives/newsitemscroll.coffee
index 5d8345999..f0cf69543 100644
--- a/js/app/directives/newsitemscroll.coffee
+++ b/js/app/directives/newsitemscroll.coffee
@@ -37,7 +37,9 @@ angular.module('News').directive 'newsItemScroll', ['$rootScope', 'Config',
scrolling = true
, Config.ScrollTimeout
- if markingRead
+ # dont scroll if the value is set to false or there is already
+ # a mark read request
+ if markingRead and elm.attr('news-item-scroll') == 'true'
markingRead = false
setTimeout ->
markingRead = true
diff --git a/js/public/app.js b/js/public/app.js
index c345d54d5..2e801c8d0 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -41,9 +41,9 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
markReadTimeout: 500,
scrollTimeout: 500,
feedUpdateInterval: 1000 * 60 * 3,
- itemBatchSize: 20,
+ itemBatchSize: 40,
undoTimeout: 1000 * 10,
- autoPageFactor: 10
+ autoPageFactor: 30
});
});
@@ -285,7 +285,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
setTimeout(function() {
return scrolling = true;
}, Config.ScrollTimeout);
- if (markingRead) {
+ if (markingRead && elm.attr('news-item-scroll') === 'true') {
markingRead = false;
setTimeout(function() {
var $elems, feedItem, id, offset, _i, _len, _results;
diff --git a/l10n/ar/news.po b/l10n/ar/news.po
index dc97ad918..6138805e9 100644
--- a/l10n/ar/news.po
+++ b/l10n/ar/news.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/news.po b/l10n/bg_BG/news.po
index aa5fc0b0b..23e580ca2 100644
--- a/l10n/bg_BG/news.po
+++ b/l10n/bg_BG/news.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/news.po b/l10n/bn_BD/news.po
index e1c31f6ef..153d0825a 100644
--- a/l10n/bn_BD/news.po
+++ b/l10n/bn_BD/news.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/bs/news.po b/l10n/bs/news.po
index 043a9e09e..43aab42aa 100644
--- a/l10n/bs/news.po
+++ b/l10n/bs/news.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: shulc <atrobej@lavabit.com>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/ca/news.po b/l10n/ca/news.po
index d5dde7b8f..675f9b6e6 100644
--- a/l10n/ca/news.po
+++ b/l10n/ca/news.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: rogerc\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/news.po b/l10n/cs_CZ/news.po
index 54a402fff..86011ff87 100644
--- a/l10n/cs_CZ/news.po
+++ b/l10n/cs_CZ/news.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/news.po b/l10n/cy_GB/news.po
index 8bac1fc2f..093fc8929 100644
--- a/l10n/cy_GB/news.po
+++ b/l10n/cy_GB/news.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/da/news.po b/l10n/da/news.po
index 218f0a762..761abd148 100644
--- a/l10n/da/news.po
+++ b/l10n/da/news.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de/news.po b/l10n/de/news.po
index be6f19acf..f78cfecdb 100644
--- a/l10n/de/news.po
+++ b/l10n/de/news.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/news.po b/l10n/de_DE/news.po
index 7c76d3227..aa6363ec6 100644
--- a/l10n/de_DE/news.po
+++ b/l10n/de_DE/news.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/el/news.po b/l10n/el/news.po
index aae0490c2..080f9ca58 100644
--- a/l10n/el/news.po
+++ b/l10n/el/news.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: axil Pι <axilleas@archlinux.gr>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/eo/news.po b/l10n/eo/news.po
index 4bb0538cf..230f50067 100644
--- a/l10n/eo/news.po
+++ b/l10n/eo/news.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/news.po b/l10n/es/news.po
index 550938160..6c6a2f457 100644
--- a/l10n/es/news.po
+++ b/l10n/es/news.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"
+"POT-Creation-Date: 2013-07-05 01:17+0200\n"
+"PO-Revision-Date: 2013-07-04 07:54+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/news.po b/l10n/es_AR/news.po
index 945410033..b5e20c492 100644
--- a/l10n/es_AR/news.po
+++ b/l10n/es_AR/news.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-01 01:19+0200\n"
-"PO-Revision-Date: 2013-06-30 23:13+0000\n"