zotlabs
|
70f23fe9b2
|
Merge branch 'zap'
|
2018-08-22 16:43:42 -07:00 |
|
zotlabs
|
decd86fc08
|
fix profile like images and remove export button
|
2018-08-21 23:42:51 -07:00 |
|
zotlabs
|
9f979cab89
|
Merge branch 'zap'
|
2018-08-20 22:26:00 -07:00 |
|
zotlabs
|
bc06233d10
|
Merge branch 'red'
|
2018-08-20 22:24:44 -07:00 |
|
zotlabs
|
066febdf40
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-08-20 20:20:57 -07:00 |
|
zotlabs
|
791bc9d805
|
Merge branch 'zap'
|
2018-08-19 20:42:26 -07:00 |
|
zotlabs
|
c4328b9090
|
osada updates
|
2018-08-19 20:39:23 -07:00 |
|
zotlabs
|
df26fec1b3
|
hubzilla core issue #1262
|
2018-08-17 21:21:02 -07:00 |
|
zotlabs
|
2c1f8d894e
|
Merge branch 'zap'
|
2018-08-17 14:43:19 -07:00 |
|
zotlabs
|
57e75d9332
|
add affinity app and start some serious refactoring of mod_photos
|
2018-08-16 23:01:31 -07:00 |
|
Mario Vavti
|
e25db4d1b5
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-16 08:50:52 +02:00 |
|
zotlabs
|
64196dd2a7
|
article summaries and some other stuff
|
2018-08-15 18:56:18 -07:00 |
|
zotlabs
|
f230c07ba5
|
possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar
|
2018-08-15 17:00:37 -07:00 |
|
Mario Vavti
|
2becc3273a
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-15 13:21:12 +02:00 |
|
zotlabs
|
f4f610f1a3
|
more backporting for zot6
|
2018-08-14 18:19:34 -07:00 |
|
Mario Vavti
|
10c5b46e3b
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-08-14 13:04:37 +02:00 |
|
M. Dent
|
94393d27c8
|
Override helpfiles
|
2018-08-14 13:03:26 +02:00 |
|
zotlabs
|
12f4787b67
|
issue with mdpost addon and archive.org links which contain a full url as a path/query component
|
2018-08-13 23:11:10 -07:00 |
|
zotlabs
|
f15c1c4e54
|
hubloc DB changes needed for z6
|
2018-08-13 21:18:20 -07:00 |
|
zotlabs
|
248d20c347
|
Merge branch 'red'
|
2018-08-13 20:36:40 -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 |
|
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 |
|
zotlabs
|
5afe779ffc
|
prevent json-ld bombing, turn off browser autocomplete on channel sources creation
|
2018-08-11 16:16:54 -07: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 |
|
zotlabs
|
3c74e0a649
|
change import compatibility
|
2018-08-05 22:47:41 -07:00 |
|
zotlabs
|
c9e5ff4eb4
|
set osada specific permissionroles and features
|
2018-08-05 18:40:36 -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 |
|
zotlabs
|
c6f34c7f80
|
more spring cleaning
|
2018-08-02 01:56:34 -07:00 |
|
zotlabs
|
082cd3953c
|
sync and directory issues
|
2018-08-01 17:58:54 -07:00 |
|
zotlabs
|
4b6fa91bb3
|
directory packets need to be signed
|
2018-07-31 19:09:42 -07:00 |
|
zotlabs
|
88f3ce6736
|
cleanup unnecessary functions
|
2018-07-31 17:27:50 -07:00 |
|
Mario Vavti
|
569cd6c57c
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-07-31 14:39:51 +02:00 |
|
zotlabs
|
a9c3af298b
|
prep work for converting mail
|
2018-07-30 23:55:09 -07:00 |
|
zotlabs
|
a87d5aa730
|
Merge branch 'red' into red_merge
|
2018-07-30 18:22:25 -07: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 |
|
gia vec
|
149071bf0c
|
Update network.php
(cherry picked from commit 8db006d9a1b3401f79ad0458e3a2ebae64c3575c)
|
2018-07-30 09:48:24 +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 |
|
zotlabs
|
f7e9cd5a8f
|
SECURITY: sanitise vcard fields
|
2018-07-29 17:36:05 -07:00 |
|
zotlabs
|
5ec73e6862
|
Revert "Merge branch 'red'"
This reverts commit 159f24afe3 , reversing
changes made to dd899418c1 .
|
2018-07-29 17:17:33 -07:00 |
|
zotlabs
|
159f24afe3
|
Merge branch 'red'
|
2018-07-29 16:48:14 -07:00 |
|