Commit Graph

22491 Commits

Author SHA1 Message Date
Mario
13c08f9660 Merge branch 'patch-2' into 'dev'
Prevent links damage on foreign channel repost for cloned

See merge request hubzilla/core!1307
2018-10-08 11:18:28 +02:00
zotlabs
82528e2f38 hubzilla core issue #1278 - page update always reloads if noscript content is enabled
(cherry picked from commit 69584f541d)
2018-10-08 11:14:37 +02:00
M.Dent
90a983a7e5 Fix too many arguments
(cherry picked from commit 60d5443f00)
2018-10-08 11:12:28 +02:00
M. Dent
58a9cde61d Fix (potential) runaway cron
(cherry picked from commit 108855aca2)
2018-10-08 11:12:09 +02:00
Mario Vavti
a00aae702d Merge remote-tracking branch 'mike/master' into dev 2018-10-08 11:05:53 +02:00
zotlabs
69584f541d hubzilla core issue #1278 - page update always reloads if noscript content is enabled 2018-10-07 22:12:49 -07:00
M. Dent
855f4b869a Merge branch 'fix-runaway-cron' into 'dev'
Fix too many arguments in ClearQueue() queries

See merge request hubzilla/core!1320
2018-10-08 01:30:20 +02:00
M.Dent
60d5443f00 Fix too many arguments 2018-10-07 19:18:35 -04:00
Max Kostikov
527b0a7065 Update hstrings.php 2018-10-08 00:31:32 +02:00
Max Kostikov
22a7c21886 New russian translation 2018-10-08 00:30:35 +02:00
M. Dent
484d240e7e Merge branch 'fix-runaway-cron' into 'dev'
Fix (potential) runaway cron

See merge request hubzilla/core!1318
2018-10-07 19:43:03 +02:00
M. Dent
108855aca2 Fix (potential) runaway cron 2018-10-07 19:43:03 +02:00
M.Dent
8ca321df7c Add missing else clause
(cherry picked from commit 259db3778c)
2018-10-07 08:43:58 +02:00
zotlabs
ed97800c80 use hubloc_store_lowlevel to ensure all hubloc columns are initialised
(cherry picked from commit 52be5c1660)
2018-10-07 08:43:28 +02:00
zotlabs
78c6f40093 minor app cleanup
(cherry picked from commit 835e222af0)
2018-10-07 08:43:03 +02:00
Mario Vavti
5acd166d18 Merge remote-tracking branch 'mike/master' into dev 2018-10-07 08:39:29 +02:00
M. Dent
3efeeecace Merge branch 'dev' into 'dev'
Add missing else clause

See merge request hubzilla/core!1317
2018-10-07 05:05:27 +02:00
M.Dent
259db3778c Add missing else clause 2018-10-06 23:02:22 -04:00
zotlabs
52be5c1660 use hubloc_store_lowlevel to ensure all hubloc columns are initialised 2018-10-06 14:47:40 -07:00
Mario Vavti
f85cce714f return success for postgres
(cherry picked from commit 2d9fe72215)
2018-10-06 23:13:01 +02:00
Mario Vavti
2eb93387c2 fix issue #1281 - hubloc default values
(cherry picked from commit dd3ec468f6)
2018-10-06 23:12:38 +02:00
Mario Vavti
2d9fe72215 return success for postgres 2018-10-06 23:10:52 +02:00
Mario Vavti
dd3ec468f6 fix issue #1281 - hubloc default values 2018-10-06 23:05:45 +02:00
Mario
88d28cd6fe minor version 2018-10-06 21:02:11 +02:00
Mario Vavti
b4035c2d19 those 3px make a difference on medium sized screens
(cherry picked from commit 65dcb39bac)
2018-10-06 21:01:27 +02:00
Mario Vavti
65dcb39bac those 3px make a difference on medium sized screens 2018-10-06 21:01:00 +02:00
Mario Vavti
b92bb0bd28 give apps some more space and prevent linebreaks in app names. Add ellipsis to too long names.
(cherry picked from commit 62433b5f05)
2018-10-06 20:56:47 +02:00
Mario Vavti
0a840c02f7 another db update to get rid of the old view bookmarks entries
(cherry picked from commit 6ffdf3880f)
2018-10-06 20:56:23 +02:00
Mario Vavti
62433b5f05 give apps some more space and prevent linebreaks in app names. Add ellipsis to too long names. 2018-10-06 20:55:28 +02:00
Mario Vavti
6ffdf3880f another db update to get rid of the old view bookmarks entries 2018-10-06 20:48:29 +02:00
Mario Vavti
9bfa5c82d1 move profile assign selector to profile settings and personal menu selector to channel_home settings and get rid of misc channel settings section.
(cherry picked from commit 66cf085272)
2018-10-06 20:34:57 +02:00
Mario Vavti
66cf085272 move profile assign selector to profile settings and personal menu selector to channel_home settings and get rid of misc channel settings section. 2018-10-06 20:29:32 +02:00
Mario Vavti
567448e2fd this did not actually make sense
(cherry picked from commit d174531931)
2018-10-06 17:44:53 +02:00
Mario Vavti
d174531931 this did not actually make sense 2018-10-06 17:43:37 +02:00
Mario Vavti
a38ded702f strings and force import_system_apps() on std_version change
(cherry picked from commit cd5f255966)
2018-10-06 17:21:49 +02:00
Mario Vavti
cd5f255966 strings and force import_system_apps() on std_version change 2018-10-06 17:20:23 +02:00
Mario Vavti
d1a3561585 rename widget titles
(cherry picked from commit da8b276699)
2018-10-06 16:53:59 +02:00
Mario Vavti
da8b276699 rename widget titles 2018-10-06 16:52:42 +02:00
Mario Vavti
5aa0304149 version RC1 2018-10-06 16:43:28 +02:00
Mario Vavti
7877e2467e rename grid to network (for consistency) and activity to stream (as seen in osada) because it makes much more sense.
(cherry picked from commit 96277372d5)
2018-10-06 16:41:19 +02:00
Mario Vavti
96277372d5 rename grid to network (for consistency) and activity to stream (as seen in osada) because it makes much more sense. 2018-10-06 16:40:30 +02:00
Mario Vavti
98ee99071c pubstream app
(cherry picked from commit b8991750c5)
2018-10-06 16:09:05 +02:00
Mario Vavti
b8991750c5 pubstream app 2018-10-06 16:08:15 +02:00
Mario Vavti
97acfd23fb randprof app
(cherry picked from commit 18726737d0)
2018-10-06 15:28:17 +02:00
Mario Vavti
18726737d0 randprof app 2018-10-06 15:27:46 +02:00
Mario Vavti
af05fa3e85 remote diagnostics app
(cherry picked from commit 6a297a8f3d)
2018-10-06 15:22:27 +02:00
Mario Vavti
6a297a8f3d remote diagnostics app 2018-10-06 15:21:22 +02:00
Mario Vavti
309904b15a admin should not be an app imho - we can not install/delete admin abilities. Remove suggest channels from base apps.
(cherry picked from commit 453ce4df3b)
2018-10-06 15:12:56 +02:00
Mario Vavti
453ce4df3b admin should not be an app imho - we can not install/delete admin abilities. Remove suggest channels from base apps. 2018-10-06 15:12:13 +02:00
Mario Vavti
02537b80b2 gallery is not a core app
(cherry picked from commit 9850d18420)
2018-10-06 15:02:29 +02:00