M.Dent
9402f537b6
Fix root not added to internationalized template search
2018-08-12 19:02:11 -04:00
zotlabs
2d29095348
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
2018-08-12 15:10:19 -07:00
zotlabs
ac03b4ccd7
make channel_remove less memory hungry
2018-08-12 15:09:02 -07:00
Mario Vavti
759a18685b
Merge remote-tracking branch 'mike/master' into dev
2018-08-12 14:07:16 +02:00
Mario
e07ab65d73
Merge branch 'oauth2-ui-pr' into 'dev'
...
Oauth2 ui pr
See merge request hubzilla/core!1255
2018-08-12 14:06:24 +02:00
Mario
26f51ece90
Merge branch 'oauth2' into 'dev'
...
Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim.
See merge request hubzilla/core!1254
2018-08-12 14:03:36 +02:00
Mario
99066ae939
Merge branch 'patch-16' into 'dev'
...
Add translation for missed string
See merge request hubzilla/core!1253
(cherry picked from commit 5ff0f09a45d3362dfa
2018-08-12 13:59:49 +02:00
Mario
5ff0f09a45
Merge branch 'patch-16' into 'dev'
...
Add translation for missed string
See merge request hubzilla/core!1253
2018-08-12 13:59:07 +02:00
zotlabs
5afe779ffc
prevent json-ld bombing, turn off browser autocomplete on channel sources creation
2018-08-11 16:16:54 -07:00
M.Dent
af042ccf07
OAuth2 UI and settings updates
2018-08-10 13:54:26 -04:00
M.Dent
e587fe5ce8
Add user_id = local_channel() to the where clause of updates
2018-08-10 13:54:07 -04:00
M.Dent
0b31c677f2
Fixes to OAuth2 connect-with-openid. Add zothash Claim. Add zotwebbie Claim.
2018-08-10 12:01:05 -04:00
Max Kostikov
d3362dfa0c
Add translation for missed string
2018-08-10 16:56:22 +02:00
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 4e6539efecee1fde42
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 c17f0fb44fedf83418
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 cbd8c0726505b3237b
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 3a6d3cb3960fe7004d4fd9d1ee
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
