Mario Vavti
|
ca5a1d0853
|
fix minor issue in dark and light schemas
(cherry picked from commit 97fcc495f2)
|
2018-10-10 14:03:12 +02:00 |
|
Mario Vavti
|
97fcc495f2
|
fix minor issue in dark and light schemas
|
2018-10-10 14:01:03 +02:00 |
|
zotlabs
|
4e69467b14
|
SECURITY: signature issue
(cherry picked from commit c6f3298f78)
|
2018-10-10 13:34:54 +02:00 |
|
Mario Vavti
|
d2e366a46f
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-10-10 13:33:15 +02:00 |
|
Mario Vavti
|
94905a71ac
|
fix even more wiki issues
(cherry picked from commit c06b37b798)
|
2018-10-10 11:07:00 +02:00 |
|
Mario Vavti
|
c7644ad29d
|
fix some more wiki issues
(cherry picked from commit d29caa099a)
|
2018-10-10 11:06:39 +02:00 |
|
M.Dent
|
0daa462207
|
Fix escaping quote for wiki_delete_page
(cherry picked from commit 1ccca9863c)
|
2018-10-10 11:06:07 +02:00 |
|
M.Dent
|
d8f79f48e9
|
Rework Wiki encoding scheme.
(cherry picked from commit 709665846e)
|
2018-10-10 11:05:34 +02:00 |
|
M.Dent
|
bf878dc446
|
Implement custom escaping
(cherry picked from commit 93a310582f)
|
2018-10-10 11:04:58 +02:00 |
|
Mario Vavti
|
c06b37b798
|
fix even more wiki issues
|
2018-10-10 11:01:13 +02:00 |
|
Mario Vavti
|
30e3580856
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-10-10 10:39:42 +02:00 |
|
Mario Vavti
|
d29caa099a
|
fix some more wiki issues
|
2018-10-10 10:39:28 +02:00 |
|
Manuel Jiménez Friaza
|
d1270aab4d
|
Fixed some errors in Spanish translation
(cherry picked from commit a7b03c1cea)
|
2018-10-10 09:23:32 +02:00 |
|
Mario
|
cd55298616
|
Merge branch 'dev' into 'dev'
Fixed some errors in Spanish translation
See merge request hubzilla/core!1323
|
2018-10-10 09:22:32 +02:00 |
|
zotlabs
|
c6f3298f78
|
SECURITY: signature issue
|
2018-10-09 22:37:53 -07:00 |
|
M. Dent
|
350db4ed9f
|
Merge branch 'fix-wiki-escaping' into 'dev'
Fix escaping quote for wiki_delete_page
See merge request hubzilla/core!1324
|
2018-10-10 03:04:31 +02:00 |
|
M.Dent
|
1ccca9863c
|
Fix escaping quote for wiki_delete_page
|
2018-10-09 21:01:05 -04:00 |
|
Manuel Jiménez Friaza
|
a7b03c1cea
|
Fixed some errors in Spanish translation
|
2018-10-09 11:48:08 +02:00 |
|
zotlabs
|
2cb52f8875
|
Merge branch 'dev'
|
2018-10-08 20:58:16 -07:00 |
|
zotlabs
|
2c797807cd
|
whitespace
|
2018-10-08 20:56:20 -07:00 |
|
Mario
|
37b94bf5fa
|
Merge branch 'fix-wiki-escaping' into 'dev'
Fix wiki escaping (Regression tests needed)
See merge request hubzilla/core!1321
|
2018-10-08 21:20:17 +02:00 |
|
Manuel Jiménez Friaza
|
cbbe4b33a3
|
Update Spanish translation
(cherry picked from commit e877a001ab)
|
2018-10-08 21:10:04 +02:00 |
|
Mario
|
a00a849952
|
Merge branch 'dev' into 'dev'
Update Spanish translation
See merge request hubzilla/core!1322
|
2018-10-08 21:08:39 +02:00 |
|
Manuel Jiménez Friaza
|
e877a001ab
|
Update Spanish translation
|
2018-10-08 19:57:11 +02:00 |
|
M.Dent
|
709665846e
|
Rework Wiki encoding scheme.
|
2018-10-08 13:35:18 -04:00 |
|
M.Dent
|
93a310582f
|
Implement custom escaping
|
2018-10-08 13:35:18 -04:00 |
|
Mario Vavti
|
9f4219773e
|
typo
(cherry picked from commit f0b7a7e5d3)
|
2018-10-08 11:39:25 +02:00 |
|
Mario Vavti
|
f0b7a7e5d3
|
typo
|
2018-10-08 11:38:45 +02:00 |
|
Mario Vavti
|
97502f4c04
|
the root cause for doubled entries is fixed now
(cherry picked from commit e0568f33e8)
|
2018-10-08 11:27:06 +02:00 |
|
Mario Vavti
|
737f660011
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-10-08 11:26:14 +02:00 |
|
Mario Vavti
|
e0568f33e8
|
the root cause for doubled entries is fixed now
|
2018-10-08 11:25:49 +02:00 |
|
Max Kostikov
|
2ba95758eb
|
Prevent links damage on foreign channel repost for cloned
(cherry picked from commit d9efb037e3)
|
2018-10-08 11:20:34 +02:00 |
|
Mario
|
fc3d0233af
|
Merge branch 'patch-8' into 'dev'
New russian translation
See merge request hubzilla/core!1319
|
2018-10-08 11:19:14 +02:00 |
|
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 |
|