Commit graph

22136 commits

Author SHA1 Message Date
zotlabs
248d20c347 Merge branch 'red' 2018-08-13 20:36:40 -07:00
zotlabs
62925c4c3f oidc cleanup and discovery 2018-08-13 20:24:04 -07:00
zotlabs
d95a1a34dd put photo updated timestamp into actor record 2018-08-13 17:27:46 -07:00
zotlabs
4fdf5d28ca minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to 'portable_id', fixed/simplified cgi auth mode 2018-08-13 17:24:48 -07:00
Mario
b78c9a2251 Merge branch 'add-template-overrides' into 'dev'
Add template overrides

See merge request hubzilla/core!1256
2018-08-13 14:06:36 +02:00
M.Dent
b436c4a94c Add support for overriding the default template location and individual templates via .htconfig.php 2018-08-12 19:47:10 -04:00
zotlabs
db1a546aba add table support to markdown 2018-08-12 16:25:14 -07:00
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
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
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
cedf21e55c keep the follow url 2018-08-05 23:15:15 -07:00
zotlabs
a935c8d055 more permissions sorting 2018-08-05 21:57:53 -07:00
zotlabs
ca12803bec permissions issue 2018-08-05 21:31:08 -07:00
zotlabs
e9ccc4bc9a make Activity::encode_person() pluggable 2018-08-05 18:41:33 -07:00
zotlabs
cce9594f2b changes to channel module to support osada 2018-08-05 17:25:43 -07:00
zotlabs
d94a12cd13 issue with http sigs and implicit keys 2018-08-04 20:35:27 -07:00
zotlabs
db54ed9eb3 update readme 2018-08-04 15:13:05 -07:00
zotlabs
8e9d076216 ability for addons to create .pdl files and load them automatically 2018-08-04 13:50:49 -07:00
zotlabs
18ffded92a handle tombstones 2018-08-03 19:26:16 -07:00
zotlabs
60014547a2 more cleanup of owa upgrade 2018-08-03 17:03:55 -07:00
zotlabs
62ea8564fa owa issues 2018-08-03 16:03:16 -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 4e6539efec70027facb70233254e9b47f8e86c6d)

ee1fde42 Add GET for filtered forums
2018-08-02 20:17:16 +02:00
zotlabs
c6f34c7f80 more spring cleaning 2018-08-02 01:56:34 -07:00
zotlabs
c806279fa9 update certs 2018-08-01 21:32:05 -07:00
zotlabs
818f69474b reduce the number of permission roles 2018-08-01 20:30:09 -07:00
zotlabs
082cd3953c sync and directory issues 2018-08-01 17:58:54 -07:00
zotlabs
4d0611b7d4 hubzilla core issue #1258 2018-08-01 16:12:44 -07:00
zotlabs
07961d363e update readme 2018-07-31 20:23:56 -07:00
zotlabs
54bf5d32bb import announce activities from pure ActivityStreams sources 2018-07-31 20:15:00 -07:00
zotlabs
2062c154d1 more announce 2018-07-31 19:55:27 -07:00