Commit Graph

22390 Commits

Author SHA1 Message Date
M.Dent
bad4ea6e65 Add wiki_preprocess hook and documentation 2018-10-10 22:46:00 -04:00
Mario Vavti
802ccdff4a fix issue in zot finger 2018-10-10 23:00:59 +02:00
Mario Vavti
ba50de15ea revert gitlab-ci until we have a working configuration 2018-10-10 20:15:35 +02:00
Mario Vavti
f105f70ded missing install 2018-10-10 15:47:55 +02:00
Mario Vavti
f0cd084738 one last try for now 2018-10-10 15:45:54 +02:00
Mario Vavti
ae5158b676 sigh... 2018-10-10 15:36:16 +02:00
Mario Vavti
bfd45a0017 lets try this 2018-10-10 15:27:43 +02:00
Mario Vavti
78be0c66da add some dependencies for gd 2018-10-10 15:21:54 +02:00
Mario Vavti
562cde37f4 probably that is the way to do it 2018-10-10 15:15:09 +02:00
Mario Vavti
263dea0e36 wrong package name 2018-10-10 15:06:19 +02:00
Mario Vavti
de743e35d0 add php-gd and use php7 image 2018-10-10 15:01:42 +02:00
Mario Vavti
09a46d0c74 gitlab-ci example file 2018-10-10 14:54:13 +02:00
Mario Vavti
97fcc495f2 fix minor issue in dark and light schemas 2018-10-10 14:01:03 +02:00
Mario Vavti
d2e366a46f Merge remote-tracking branch 'mike/master' into dev 2018-10-10 13:33:15 +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
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
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
f0b7a7e5d3 typo 2018-10-08 11:38:45 +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
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
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
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
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 Vavti
65dcb39bac those 3px make a difference on medium sized screens 2018-10-06 21:01:00 +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