harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,597 Commits 6 Branches 36 Tags 152 MiB
23b30fdd10
Commit Graph

23597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti
7890157f52 revert debug comment from the last commit 2018-08-09 23:07:50 +02:00
Mario Vavti
b3d1ea4cd5 fix zid leaking to nonzot sites if markdown is enabled 2018-08-09 17:03:20 +02:00
Mario Vavti
7c842f3170 search form action for channel search needs the channel address 
(cherry picked from commit 054c5da294)
 2018-08-09 15:50:49 +02:00
Mario Vavti
054c5da294 search form action for channel search needs the channel address 2018-08-09 15:47:57 +02:00
Mario Vavti
5c5a808290 Merge remote-tracking branch 'mike/master' into dev 2018-08-09 11:07:38 +02:00
Mario Vavti
5c30b2f271 update install.txt 2018-08-08 09:10:03 +02:00
Mario
ce2216f544 Merge branch 'patch-15' into 'dev' 
Add XMLreader in PHP requirements

See merge request hubzilla/core!1252
 2018-08-08 09:07:26 +02:00
zotlabs
1d13cc1601 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-08-06 21:32:45 -07:00
zotlabs
166879b8b0 bring some Zot6 libraries and interfaces to red/hubzilla 2018-08-06 17:43:22 -07:00
zotlabs
aeb9d5cd90 create alter_pdl hook 2018-08-05 23:19:33 -07:00
zotlabs
8e9d076216 ability for addons to create .pdl files and load them automatically 2018-08-04 13:50:49 -07:00
Max Kostikov
0d48cb959f Add XMLreader in PHP requirements 2018-08-03 19:32:51 +02:00
zotlabs
d908f53607 add app_options field 2018-08-02 22:49:30 -07:00
Mario
238551b024 Merge branch 'fixactivityorderwithfilters' into 'master' 
Add GET for filtered forums

See merge request hubzilla/core!1251

(cherry picked from commit 4e6539efec)

ee1fde42 Add GET for filtered forums
 2018-08-02 20:17:16 +02:00
Mario
4e6539efec Merge branch 'fixactivityorderwithfilters' into 'master' 
Add GET for filtered forums

See merge request hubzilla/core!1251
 2018-08-02 20:16:25 +02:00
zotlabs
c806279fa9 update certs 2018-08-01 21:32:05 -07:00
DM42.Net (Matt Dent)
ee1fde4262 Add GET for filtered forums 2018-08-01 21:14:48 -04:00
zotlabs
4d0611b7d4 hubzilla core issue #1258 2018-08-01 16:12:44 -07:00
Mario
1358303e42 Merge branch 'dev' into 'dev' 
Update Spanish translation

See merge request hubzilla/core!1249

(cherry picked from commit c17f0fb44f)

edf83418 Update Spanish translation
 2018-07-31 14:42:18 +02:00
Mario
c17f0fb44f Merge branch 'dev' into 'dev' 
Update Spanish translation

See merge request hubzilla/core!1249
 2018-07-31 14:42:01 +02:00
Mario Vavti
569cd6c57c Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-07-31 14:39:51 +02:00
zotlabs
0cfaf34a22 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-30 18:11:49 -07:00
zotlabs
e8aeecc4c9 When checking permissions ignore checking site "Block Public" settings in cases where site permissions aren't applicable 2018-07-30 17:41:37 -07:00
Manuel Jiménez Friaza
edf834188d Update Spanish translation 2018-07-30 12:03:03 +02:00
Mario
4e402dca7d Merge branch 'patch-13' into 'dev' 
Workaround on possible error with php2po

See merge request hubzilla/core!1247
 2018-07-30 10:01:19 +02:00
Mario
7f6bf7170a Merge branch 'patch-9' into 'dev' 
Respect navbar translations

See merge request hubzilla/core!1243

(cherry picked from commit cbd8c07265)

05b3237b Update nav.php
 2018-07-30 10:00:24 +02:00
Mario
0ed9d3c62c Merge branch 'patch-8' into 'dev' 
Fix navbar missed translations

See merge request hubzilla/core!1242

(cherry picked from commit 3a6d3cb396)

0fe7004d Update Apps.php
4fd9d1ee Update Apps.php
 2018-07-30 10:00:01 +02:00
gia vec
149071bf0c Update network.php 
(cherry picked from commit 8db006d9a1)
 2018-07-30 09:48:24 +02:00
Mario
720e691f33 Merge branch 'patch-1' into 'master' 
Update network.php

See merge request hubzilla/core!1248
 2018-07-30 09:47:41 +02:00
zotlabs
32614e4074 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-07-29 18:00:56 -07:00
zotlabs
9dc5a3bfc9 this may conflict 2018-07-29 17:59:40 -07:00
gia vec
8db006d9a1 Update network.php 2018-07-29 19:19:37 +02:00
Max Kostikov
cb4afd39bd Workaround on possible error 2018-07-29 16:26:33 +02:00
Max Kostikov
e078caffd8 Update php2po.php 2018-07-29 14:20:01 +02:00
Max Kostikov
90a9febb6c Workaround on possible error 2018-07-29 12:05:53 +02:00
Mario Vavti
d00761628f fix sql empty query error in db update 1216 
(cherry picked from commit e4a1286aae)
 2018-07-29 08:06:29 +02:00
Mario Vavti
e4a1286aae fix sql empty query error in db update 1216 2018-07-29 08:05:41 +02:00
Mario
08a8011456 Merge branch 'patch-12' into 'dev' 
Process msgctxt plurals

See merge request hubzilla/core!1246
 2018-07-29 07:14:09 +02:00
Mario Vavti
6c10af29ee verrsion bump 2018-07-29 07:09:46 +02:00
Mario Vavti
ae62d6fb86 wrong class name 
(cherry picked from commit 5dbd11c6ed)
 2018-07-29 07:05:29 +02:00
zotlabs
d2e0ecd6a3 fix unsanitised xchan_name 
(cherry picked from commit 9701516228)
 2018-07-29 07:05:07 +02:00
zotlabs
13386ddbd7 SECURITY: sanitise vcard fields 
(cherry picked from commit 2367d94a42)
 2018-07-29 07:04:38 +02:00
Mario Vavti
643b6f0aa3 version 2018-07-29 07:00:30 +02:00
Mario Vavti
45d262d6c0 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-07-29 06:59:10 +02:00
Mario Vavti
5dbd11c6ed wrong class name 2018-07-29 06:58:35 +02:00
Mario Vavti
3fcb6df0f1 Merge remote-tracking branch 'mike/master' into dev 2018-07-29 06:43:55 +02:00
zotlabs
9701516228 fix unsanitised xchan_name 2018-07-28 17:17:12 -07:00
Max Kostikov
77dfe63d90 Process msgctxt plurals 2018-07-29 02:11:27 +02:00
zotlabs
2367d94a42 SECURITY: sanitise vcard fields 2018-07-28 15:33:20 -07:00
Mario
d85c849668 Merge branch 'patch-11' into 'dev' 
Plural form strings export added

See merge request hubzilla/core!1245
 2018-07-28 21:23:31 +02:00