zotlabs
|
8d565a8305
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-16 21:43:06 -07:00 |
|
zotlabs
|
943edb4c14
|
simplify AP discovery
|
2018-09-16 21:42:41 -07:00 |
|
zotlabs
|
c3a74b3ece
|
setup and channel sync fixes from upstream
|
2018-09-16 20:01:53 -07:00 |
|
zotlabs
|
27617efbfb
|
Merge branch 'dev'
|
2018-09-16 19:05:12 -07:00 |
|
zotlabs
|
6ab12597f5
|
do not sync the channel_moved field
|
2018-09-16 18:59:12 -07:00 |
|
zotlabs
|
a3e3c93902
|
consistency
|
2018-09-16 01:17:25 -07:00 |
|
M.Dent (DM42.Net)
|
abe35817cd
|
Add attach_delete hook
|
2018-09-15 23:09:16 -04:00 |
|
zotlabs
|
c57e8519dc
|
Merge branch 'zap' into dev
|
2018-09-15 16:44:27 -07:00 |
|
zotlabs
|
ac0020979c
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-15 16:44:06 -07:00 |
|
zotlabs
|
cebfeabc41
|
logic issue
|
2018-09-15 16:43:44 -07:00 |
|
zotlabs
|
df7605435f
|
Merge branch 'zap' into dev
|
2018-09-15 16:21:00 -07:00 |
|
zotlabs
|
34e8a36019
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-15 16:14:52 -07:00 |
|
zotlabs
|
f58c244ba0
|
refactor include/follow
|
2018-09-15 16:13:44 -07:00 |
|
Max Kostikov
|
585bdf562a
|
Update msglib.php
|
2018-09-16 00:43:45 +02:00 |
|
Max Kostikov
|
034441bd13
|
use common msg_drop function
|
2018-09-15 22:32:56 +02:00 |
|
Max Kostikov
|
1819704620
|
Use common msg_drop function
|
2018-09-15 22:32:07 +02:00 |
|
Max Kostikov
|
18801a6c60
|
formatting
|
2018-09-15 22:31:08 +02:00 |
|
Max Kostikov
|
f83c2d5cd1
|
Create msglib.php
|
2018-09-15 22:27:39 +02:00 |
|
Max Kostikov
|
724dc48fe8
|
Add new file
|
2018-09-15 21:41:13 +02:00 |
|
zotlabs
|
d67d26564d
|
bookmark links are deprecated in zap
|
2018-09-14 16:49:08 -07:00 |
|
Max Kostikov
|
284e5dd2e8
|
unification with zot.php code for future reuse
|
2018-09-15 01:45:54 +02:00 |
|
Max Kostikov
|
3d3f4f50fb
|
formatting
|
2018-09-15 01:40:17 +02:00 |
|
Max Kostikov
|
8d89c4bbce
|
Save combined view on calling first message in thread
|
2018-09-15 01:20:49 +02:00 |
|
Max Kostikov
|
85d8225cc0
|
less data in select
|
2018-09-15 01:01:48 +02:00 |
|
M.Dent
|
8ad24ca3e8
|
Catch errors in template rendering. Output a generic error and log problem.
|
2018-09-14 17:53:28 -04:00 |
|
Max Kostikov
|
6360dee125
|
formatting
|
2018-09-14 17:45:42 +02:00 |
|
Max Kostikov
|
e931616011
|
Save combined view while deleting first message in thread
|
2018-09-14 17:38:14 +02:00 |
|
zotlabs
|
c16fa755a8
|
Merge branch 'zap' into dev
|
2018-09-13 22:40:23 -07:00 |
|
zotlabs
|
4b7770f28c
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-13 22:40:11 -07:00 |
|
zotlabs
|
048c5f65e2
|
old protocol string still showing
|
2018-09-13 22:39:05 -07:00 |
|
zotlabs
|
55d4973439
|
Merge commit 'decf21c' into dev
|
2018-09-13 20:36:13 -07:00 |
|
zotlabs
|
b253aa9f9c
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-13 20:35:54 -07:00 |
|
zotlabs
|
decf21c78b
|
add privacy groups link
|
2018-09-13 20:32:44 -07:00 |
|
Mario Vavti
|
869534fafa
|
remove network_tabs() which has been deprecated and replaced by activity_{order, filters} widgets
|
2018-09-13 11:53:59 +02:00 |
|
Mario Vavti
|
56f88f2e30
|
move chat from feature to apps
|
2018-09-13 11:32:43 +02:00 |
|
Mario Vavti
|
a1d5ce3716
|
remove profile_tabs() which has been deprecated and replaced by channel_apps()
|
2018-09-13 10:59:37 +02:00 |
|
Mario
|
78dc679a72
|
Merge branch 'patch-1' into 'dev'
z_fetch_url with case insensitive headers
See merge request hubzilla/core!1271
|
2018-09-12 21:11:47 +02:00 |
|
Mario Vavti
|
57e3ee47ee
|
more feature to app transition
|
2018-09-12 20:52:55 +02:00 |
|
Mario Vavti
|
184928204a
|
Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in Entity
|
2018-09-12 11:14:49 +02:00 |
|
Mario Vavti
|
2651eae663
|
mpre feature to app transition
|
2018-09-12 11:08:53 +02:00 |
|
zotlabs
|
363aba90fb
|
Merge branch 'zap' into dev
|
2018-09-11 18:03:38 -07:00 |
|
zotlabs
|
8500c2fb21
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-11 18:03:16 -07:00 |
|
zotlabs
|
acec460c1c
|
remove linkid for the time being
|
2018-09-11 18:02:25 -07:00 |
|
zotlabs
|
fda9a36505
|
Merge branch 'zap' into dev
|
2018-09-11 17:41:22 -07:00 |
|
zotlabs
|
eb3a5349db
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-11 17:37:54 -07:00 |
|
zotlabs
|
f9b344ac4d
|
runtime errors
|
2018-09-11 17:35:31 -07:00 |
|
zotlabs
|
67ae00ae2f
|
it's alive
|
2018-09-11 03:36:31 -07:00 |
|
zotlabs
|
adc164b825
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-09-10 22:11:26 -07:00 |
|
Max Kostikov
|
66bf55710e
|
Update network.php
|
2018-09-10 15:13:28 +02:00 |
|
Mario Vavti
|
c6abe87ec2
|
move cards from features to apps
|
2018-09-10 13:34:05 +02:00 |
|
zotlabs
|
44df4d785e
|
Merge branch 'zap' into dev
|
2018-09-09 23:23:42 -07:00 |
|
zotlabs
|
ddb50b8de4
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-09 23:17:23 -07:00 |
|
zotlabs
|
44af74af3b
|
tweaks
|
2018-09-09 23:16:58 -07:00 |
|
zotlabs
|
c4dc8b9cca
|
hyperdrive stuff
|
2018-09-09 23:15:59 -07:00 |
|
zotlabs
|
b837f0b8fc
|
Merge branch 'red' into dev
|
2018-09-09 20:59:13 -07:00 |
|
zotlabs
|
be3b630474
|
important hyperdrive component
|
2018-09-09 20:53:20 -07:00 |
|
zotlabs
|
e1b0570690
|
assorted fixes
|
2018-09-09 18:28:13 -07:00 |
|
zotlabs
|
017f1a3c79
|
optimise
|
2018-09-06 21:27:09 -07:00 |
|
zotlabs
|
667f8ed920
|
delivery optimisations
|
2018-09-06 21:24:56 -07:00 |
|
zotlabs
|
75ecacd88c
|
use uuid4
|
2018-09-06 20:21:52 -07:00 |
|
zotlabs
|
176fd2339d
|
use uuid4, not uuid5
|
2018-09-06 20:19:44 -07:00 |
|
zotlabs
|
4005c484c1
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-06 17:42:01 -07:00 |
|
zotlabs
|
3ff96239f6
|
typo
|
2018-09-06 17:00:42 -07:00 |
|
zotlabs
|
2640c49c0e
|
add federated forum role
|
2018-09-05 23:13:55 -07:00 |
|
zotlabs
|
b38625aef6
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into dev
|
2018-09-05 21:23:49 -07:00 |
|
zotlabs
|
44ca674937
|
Merge branch 'red' into dev
|
2018-09-05 21:18:14 -07:00 |
|
zotlabs
|
c5bc4fe245
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-09-05 21:02:06 -07:00 |
|
zotlabs
|
bc4a92b702
|
detect and automatically repair duplicate plugin hook scenarios.
|
2018-09-05 19:43:07 -07:00 |
|
zotlabs
|
efab473ee2
|
add comment_policy
|
2018-09-05 16:30:46 -07:00 |
|
zotlabs
|
46c3a2f196
|
Merge branch 'zap'
|
2018-09-04 23:44:56 -07:00 |
|
zotlabs
|
cd429d343e
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-04 23:44:43 -07:00 |
|
zotlabs
|
ccf0df2602
|
set the default profile photo before fetching one, in case the process gets killed.
|
2018-09-04 23:42:06 -07:00 |
|
zotlabs
|
8c75aa8dc4
|
Merge branch 'zap'
|
2018-09-04 21:00:13 -07:00 |
|
zotlabs
|
9f54a2ab16
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-04 20:59:58 -07:00 |
|
zotlabs
|
7354b30068
|
convert message-id to uuid
|
2018-09-04 20:59:11 -07:00 |
|
zotlabs
|
d155ded7c3
|
Merge branch 'zap'
|
2018-09-04 19:16:42 -07:00 |
|
zotlabs
|
c201a13269
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-04 19:16:31 -07:00 |
|
zotlabs
|
2b472cf7eb
|
reshare theme changes
|
2018-09-04 19:15:13 -07:00 |
|
M.Dent
|
9446e0348e
|
Corrected resubmit of fixes to Authors unable to comment on posts they authored when owned by others.
|
2018-09-04 08:14:52 -04:00 |
|
Mario Vavti
|
41ccb61c2e
|
Revert "Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances."
This reverts commit e2824f9259 .
Reverting because it breaks forum mentions.
|
2018-09-03 18:14:17 +02:00 |
|
Mario
|
1b7781a159
|
Merge branch 'add-delivery-status-info' into 'dev'
Fix: Authors unable to comment on posts they authored when under owned by others…
See merge request hubzilla/core!1268
|
2018-09-02 09:17:29 +02:00 |
|
zotlabs
|
9b2ae5396e
|
Merge branch 'zap'
|
2018-09-01 15:56:15 -07:00 |
|
zotlabs
|
b3ef8d355a
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-01 15:53:09 -07:00 |
|
zotlabs
|
0954afb321
|
compatibility fixes
|
2018-09-01 15:51:44 -07:00 |
|
M.Dent
|
e2824f9259
|
Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances.
|
2018-09-01 13:45:05 -04:00 |
|
zotlabs
|
c13c713e19
|
follow issue
|
2018-08-30 22:30:58 -07:00 |
|
zotlabs
|
9282a6a40b
|
Merge branch 'zap'
|
2018-08-30 21:30:46 -07:00 |
|
zotlabs
|
fc6f5fc320
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-30 21:29:21 -07:00 |
|
zotlabs
|
d00648f3e1
|
Merge branch 'red'
|
2018-08-30 21:27:20 -07:00 |
|
Mario
|
c5ce9b0699
|
Merge branch 'call-hooks-optimization' into 'dev'
Micro-optimization to call_hooks()
See merge request hubzilla/core!1267
|
2018-08-30 10:09:00 +02:00 |
|
Mario
|
c74a7ce4fc
|
Merge branch 'add-delivery-status-info' into 'dev'
Add dreport_process hook
See merge request hubzilla/core!1266
|
2018-08-30 10:07:18 +02:00 |
|
zotlabs
|
c48aae55af
|
more debugging
|
2018-08-29 22:22:06 -07:00 |
|
zotlabs
|
89d1be0343
|
better format of like/dislike text, grab object['id'] if inreplyto missing for these activities
|
2018-08-29 20:02:27 -07:00 |
|
Mario Vavti
|
d98ed68749
|
html-to-markdown adds a backslash infront of a hash after each new line - manualy remove those
|
2018-08-29 16:16:17 +02:00 |
|
M.Dent
|
70d6d2f2db
|
Micro-optimization to call_hooks()
|
2018-08-29 10:02:04 -04:00 |
|
M.Dent
|
da441c59f6
|
Add dreport_process hook
|
2018-08-29 08:58:49 -04:00 |
|
zotlabs
|
ed4aa90338
|
connect perms
|
2018-08-29 02:19:32 -07:00 |
|
zotlabs
|
896d25d7ae
|
ap discovery issues
|
2018-08-28 18:37:21 -07:00 |
|
zotlabs
|
32c1942388
|
Merge branch 'zap'
|
2018-08-27 20:09:02 -07:00 |
|
zotlabs
|
2e7ed7b09c
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-27 20:08:51 -07:00 |
|
zotlabs
|
4ed37e3b33
|
items need to be encoded
|
2018-08-27 20:08:17 -07:00 |
|
zotlabs
|
d7455e42c9
|
Merge branch 'zap'
|
2018-08-27 19:41:12 -07:00 |
|
zotlabs
|
68cc3d3048
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-27 19:40:59 -07:00 |
|
zotlabs
|
aef7fc5702
|
use a full array
|
2018-08-27 19:40:19 -07:00 |
|
zotlabs
|
23d89071b9
|
Merge branch 'zap'
|
2018-08-27 19:10:34 -07:00 |
|
zotlabs
|
8b297e7630
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-27 19:10:20 -07:00 |
|
zotlabs
|
08e8f026f0
|
typo
|
2018-08-27 19:09:48 -07:00 |
|
zotlabs
|
bc167e80ee
|
Merge branch 'zap'
|
2018-08-27 18:59:52 -07:00 |
|
zotlabs
|
90b02001fa
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-27 18:59:32 -07:00 |
|
zotlabs
|
b8ee94c00a
|
id linkage
|
2018-08-27 18:58:47 -07:00 |
|
zotlabs
|
1ec12c6a04
|
Merge branch 'zap'
|
2018-08-26 23:44:01 -07:00 |
|
zotlabs
|
8e24ee9471
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-26 23:42:29 -07:00 |
|
zotlabs
|
3d6e434068
|
removed file
|
2018-08-26 23:37:07 -07:00 |
|
zotlabs
|
9beda708de
|
Change main router request variable from 'q' to 'req'. This is necessary to implement search in the twitter api addon, because twitter requires use of the variable 'q'.
|
2018-08-26 23:35:29 -07:00 |
|
zotlabs
|
554b094eb4
|
Merge branch 'dev'
|
2018-08-26 23:24:27 -07:00 |
|
zotlabs
|
e4b6a143c7
|
Revert "Change main router request variable from 'q' to 'req'. This is necessary to implement search in the twitter api addon, because twitter requires use of the variable 'q'." Reverting because this will only work with Apache and break nginx/other installations.
This reverts commit 9367e9fe5a .
|
2018-08-26 23:05:56 -07:00 |
|
zotlabs
|
9367e9fe5a
|
Change main router request variable from 'q' to 'req'. This is necessary to implement search in the twitter api addon, because twitter requires use of the variable 'q'.
|
2018-08-26 23:00:31 -07:00 |
|
zotlabs
|
7018da3f12
|
code cleanup
|
2018-08-23 22:44:22 -07:00 |
|
zotlabs
|
a66c43166a
|
first_post_date() (used by archive widget) - trigger the query options off of the active module rather than rely on passed parameters
|
2018-08-23 21:01:28 -07:00 |
|
zotlabs
|
301d79b4e2
|
For Osada, move activitypub into core.
|
2018-08-22 23:04:37 -07:00 |
|
zotlabs
|
37339829b4
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-22 20:23:58 -07:00 |
|
zotlabs
|
9fef13d6e6
|
use the linked item id for the photo object id instead of the photo uri. Otherwise we won't find it in the item table if we get that object as a replyTo.
|
2018-08-22 20:21:42 -07:00 |
|
zotlabs
|
4fc688cfea
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-08-22 17:54:24 -07:00 |
|
zotlabs
|
d55e5bbe75
|
typos and photo fixes
|
2018-08-22 17:52:22 -07:00 |
|
zotlabs
|
70f23fe9b2
|
Merge branch 'zap'
|
2018-08-22 16:43:42 -07:00 |
|
zotlabs
|
6ecd31a715
|
tweak archive widget for articles
|
2018-08-22 13:30:16 -07:00 |
|
zotlabs
|
decd86fc08
|
fix profile like images and remove export button
|
2018-08-21 23:42:51 -07:00 |
|
zotlabs
|
0eeaf8713f
|
add api_not_found hook
|
2018-08-21 23:13:54 -07:00 |
|
zotlabs
|
42c4a0da51
|
Zot/Finger: ignore deleted hublocs
|
2018-08-21 21:38:10 -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 |
|
Mario Vavti
|
45d262d6c0
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-07-29 06:59:10 +02:00 |
|
zotlabs
|
2367d94a42
|
SECURITY: sanitise vcard fields
|
2018-07-28 15:33:20 -07:00 |
|
zotlabs
|
dd899418c1
|
app fixes
Merge branch 'red'
|
2018-07-27 15:31:19 -07:00 |
|
Max Kostikov
|
05b3237bae
|
Update nav.php
|
2018-07-27 11:50:04 +02:00 |
|
zotlabs
|
07d0921aef
|
fixes to clone import
|
2018-07-26 19:37:04 -07:00 |
|
Mario Vavti
|
ec3a066e4e
|
fix sql error
|
2018-07-26 09:32:52 +02:00 |
|
zotlabs
|
cbeeeae243
|
logging
|
2018-07-22 23:23:02 -07:00 |
|
zotlabs
|
b484441438
|
sync fixes
|
2018-07-22 23:06:45 -07:00 |
|
zotlabs
|
626a0ab788
|
only clone between similar platforms
|
2018-07-22 22:28:46 -07:00 |
|
zotlabs
|
cf03855f65
|
more import work
|
2018-07-22 22:18:58 -07:00 |
|
zotlabs
|
c6fc88b300
|
item lookups
|
2018-07-22 22:17:07 -07:00 |
|
zotlabs
|
b7ff2f5585
|
more libzot
|
2018-07-22 22:10:51 -07:00 |
|
zotlabs
|
647e92d6f7
|
use libzot
|
2018-07-22 22:04:20 -07:00 |
|
zotlabs
|
bd8a6d6195
|
updates
|
2018-07-19 22:15:50 -07:00 |
|
zotlabs
|
ad020db7d8
|
minor tweaks
|
2018-07-19 20:44:34 -07:00 |
|
zotlabs
|
07e526693e
|
update the zot api (xchan store), plus a couple of typos
|
2018-07-19 17:14:37 -07:00 |
|
zotlabs
|
5d94cfba4a
|
Merge branch 'red'
|
2018-07-19 13:48:32 -07:00 |
|
zotlabs
|
13d19d42cb
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-07-18 19:14:21 -07:00 |
|
zotlabs
|
f8ed09b3fa
|
Merge branch 'red'
|
2018-07-18 18:55:28 -07:00 |
|
zotlabs
|
a05c8ff66b
|
query filter was a bit greedy
|
2018-07-18 17:48:23 -07:00 |
|
zotlabs
|
5ce50d0a2e
|
mangled urls on redirects
|
2018-07-18 17:05:38 -07:00 |
|
Mario Vavti
|
eb322e8312
|
set the correct album name when moving photos
|
2018-07-18 13:18:37 +02:00 |
|
zotlabs
|
91ac38f18e
|
more content formatting and feature trimming
|
2018-07-17 21:56:51 -07:00 |
|
zotlabs
|
762acc9565
|
typo
|
2018-07-17 17:30:00 -07:00 |
|
zotlabs
|
6baf4441e0
|
get rid of the deprecated location message type
|
2018-07-17 17:26:26 -07:00 |
|
zotlabs
|
5f5fedb6b5
|
responses to events
|
2018-07-16 23:40:09 -07:00 |
|
zotlabs
|
3407c73bdf
|
update event item[obj]
|
2018-07-16 21:50:07 -07:00 |
|
zotlabs
|
731e9b9dad
|
update site import
|
2018-07-16 20:04:47 -07:00 |
|
zotlabs
|
564aa2f134
|
pass render options to code highlight
|
2018-07-16 18:12:03 -07:00 |
|
zotlabs
|
46c468e376
|
update more object data structures
|
2018-07-16 17:23:24 -07:00 |
|
zotlabs
|
2cc6ca0f88
|
update the photo item_obj format to AS2+
|
2018-07-16 16:46:20 -07:00 |
|
zotlabs
|
cf88cbb46f
|
add summary field to item table
|
2018-07-15 18:31:39 -07:00 |
|
zotlabs
|
b3b6b813f2
|
upstream/downstream comment work
|
2018-07-11 18:02:25 -07:00 |
|
zotlabs
|
38bccecc04
|
fix to cart behaviour
|
2018-07-11 18:00:47 -07:00 |
|
zotlabs
|
4cc607ca36
|
provide widget registration for addons
|
2018-07-10 16:42:16 -07:00 |
|
zotlabs
|
cc90f71230
|
trim features (e2ee and bookmarks)
|
2018-07-08 22:28:15 -07:00 |
|
zotlabs
|
5b084c759e
|
more app work
|
2018-07-05 22:27:44 -07:00 |
|
zotlabs
|
fe44ebee93
|
change to import system apps at most once a day per person
|
2018-07-05 21:55:03 -07:00 |
|
zotlabs
|
f7db9dcec5
|
more app work
|
2018-07-05 17:52:32 -07:00 |
|
zotlabs
|
51a2e64a89
|
issue syncing pageflags
|
2018-07-04 19:51:16 -07:00 |
|
zotlabs
|
cf4a12b173
|
Merge branch 'dev'
|
2018-07-04 19:18:05 -07:00 |
|
zotlabs
|
e2e7acd20f
|
more optimisations
|
2018-07-03 22:18:07 -07:00 |
|
zotlabs
|
29d973f848
|
move group to lib
|
2018-07-03 16:40:54 -07:00 |
|
zotlabs
|
29fe662b3c
|
don't allow angle chars in group hashes
|
2018-07-02 23:18:27 -07:00 |
|
zotlabs
|
6bf88f10d2
|
move queue functions to Zotlabs/Lib
|
2018-07-02 22:43:41 -07:00 |
|
zotlabs
|
d753492382
|
bad merge
|
2018-07-01 22:48:05 -07:00 |
|
zotlabs
|
40ab482ada
|
various fixes
|
2018-07-01 21:07:35 -07:00 |
|
zotlabs
|
bf405df4ed
|
cleanup of jsalmon, return hubloc with verification success to save a lookup
|
2018-06-28 20:25:43 -07:00 |
|
zotlabs
|
e55c703fe0
|
Time to celebrate: Z6 basic messaging -> posts, replies, and likes working
|
2018-06-27 18:43:39 -07:00 |
|
zotlabs
|
156010050c
|
imagick converter: -thumbnail doesn't preserve exif, -resize does
|
2018-06-26 17:19:32 -07:00 |
|
zotlabs
|
90c5fb4794
|
remove public policy, fix more zot => zot6 network changes
|
2018-06-25 23:37:12 -07:00 |
|
zotlabs
|
1b1d9e502c
|
Merge branch 'red'
|
2018-06-25 21:02:44 -07:00 |
|
zotlabs
|
66fc12c928
|
crc32 is potentially reversible
|
2018-06-25 13:33:23 -07:00 |
|
zotlabs
|
f66fb8e2a8
|
SECURITY: logging: hash the session_id in case somebody posts log snippets from active sessions; also provide a hashed process_id if using a daemon process (with no session) for easier tracking of related log events
|
2018-06-25 13:20:12 -07:00 |
|
zotlabs
|
4866ed5283
|
remove the white-space pre-wrap property on code blocks. This should probably be done with the word-break property instead
|
2018-06-24 21:56:58 -07:00 |
|
zotlabs
|
8222b02495
|
more zot6 heavy lifting
|
2018-06-24 18:54:29 -07:00 |
|
zotlabs
|
86e93664d0
|
remote_self wasn't working correctly
|
2018-06-24 16:56:23 -07:00 |
|
zotlabs
|
e00bae8bb6
|
httpsig refactor
|
2018-06-19 19:33:50 -07:00 |
|
zotlabs
|
517f0b4f0d
|
Merge branch 'red'
|
2018-06-19 17:41:22 -07:00 |
|
zotlabs
|
6cf040d3ee
|
whitespace
|
2018-06-18 21:11:39 -07:00 |
|
zotlabs
|
f801f52274
|
provide flag to collect_recipients to exclude privacy groups (for federation plugin use)
|
2018-06-18 17:07:20 -07:00 |
|
zotlabs
|
7850ecbd95
|
remove several unused/unreferenced templates
|
2018-06-17 20:53:05 -07:00 |
|
zotlabs
|
3aa9bcac85
|
Merge branch 'red' into merge
|
2018-06-17 19:30:38 -07:00 |
|
zotlabs
|
e640171719
|
as fixes
|
2018-06-17 19:25:45 -07:00 |
|
zotlabs
|
1cb60c7f5e
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-06-17 17:47:04 -07:00 |
|
Mario
|
28043726e6
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-06-17 17:00:17 +02:00 |
|
Mario
|
9c5df51141
|
some work on mod group
|
2018-06-17 16:58:12 +02:00 |
|
zotlabs
|
eedfb7de32
|
slightly more memory efficient way to drop posts of removed connections
|
2018-06-15 16:28:36 -07:00 |
|
zotlabs
|
7a144b90fb
|
re-implement/refactor getQuotaInfo() on DAV storage
|
2018-06-14 20:40:25 -07:00 |
|
zotlabs
|
13d6b254ff
|
Merge branch 'red'
|
2018-06-13 21:41:11 -07:00 |
|
zotlabs
|
a8f179145b
|
Merge branch 'master' of ../hz into dev
|
2018-06-10 22:16:39 -07:00 |
|
zotlabs
|
912ccb31a1
|
hubzilla core issue #1218
|
2018-06-10 19:26:35 -07:00 |
|
zotlabs
|
6959c9e423
|
fixes for immediate expire, channel_active not initialised in DB
|
2018-06-10 15:27:55 -07:00 |
|
Mario Vavti
|
468af29e3e
|
new feature filter network by name
|
2018-06-08 23:03:05 +02:00 |
|
zotlabs
|
e4649648d1
|
upgrade the rest of my_perms
|
2018-06-07 20:17:30 -07:00 |
|
zotlabs
|
3b0469a277
|
finish migrating their_perms (except for federation addons)
|
2018-06-07 19:44:09 -07:00 |
|
zotlabs
|
38a2493ed0
|
Merge branch 'red'
|
2018-06-07 18:44:05 -07:00 |
|
Mario Vavti
|
dfa48ba17c
|
fixes for search_item.tpl
|
2018-06-07 23:24:36 +02:00 |
|
zotlabs
|
2c7597066c
|
update a number of links in the code
|
2018-06-06 17:12:20 -07:00 |
|
zotlabs
|
c2acdd299b
|
should probably add the files
|
2018-06-04 23:20:09 -07:00 |
|
zotlabs
|
915c50064c
|
consolidate directory functions into libzotdir
|
2018-06-04 23:19:16 -07:00 |
|
zotlabs
|
4846ae5326
|
split off libsync from libzot
|
2018-06-04 18:40:11 -07:00 |
|
zotlabs
|
9232351cb2
|
Merge branch 'master' into zapp
|
2018-06-04 17:47:34 -07:00 |
|
zotlabs
|
e1b85a361c
|
photos not syncing properly if destination is a postgres site
|
2018-06-04 16:36:13 -07:00 |
|
zotlabs
|
eee6131d41
|
permissions work
|
2018-06-03 22:57:02 -07:00 |
|
zotlabs
|
b7356eda49
|
start fresh after a lot of heavy lifting and fix a lot of stuff
|
2018-06-03 21:23:34 -07:00 |
|
zotlabs
|
89f16c81dd
|
fix conflict
|
2018-06-03 17:59:41 -07:00 |
|
zotlabs
|
4524d241a2
|
Merge branch 'master' into zapp
|
2018-06-03 17:58:24 -07:00 |
|
zotlabs
|
02e173e733
|
finish porting zot6handler primitives
|
2018-06-03 17:49:48 -07:00 |
|
Mario Vavti
|
a42ff1e6d4
|
missing $perm_sql
|
2018-06-03 13:27:06 +02:00 |
|
Mario Vavti
|
a32626e489
|
add the archived flag
|
2018-06-02 22:42:20 +02:00 |
|
Mario Vavti
|
3a9f149c80
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-06-02 22:39:36 +02:00 |
|
Mario Vavti
|
a0e4f7ddb1
|
respect the privacy group feature setting in nav
|
2018-06-02 22:26:08 +02:00 |
|
Mario Vavti
|
8189408190
|
finalize filters and forum notifications
|
2018-06-02 22:11:11 +02:00 |
|
zotlabs
|
5f612521da
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-06-02 00:01:19 -07:00 |
|
Mario Vavti
|
22a9e4c9a9
|
add manage privacy groups entry to the panel channel menu dropdown for now
|
2018-06-01 21:52:54 +02:00 |
|
Mario Vavti
|
56f0244360
|
fixes for css fix
|
2018-06-01 20:59:28 +02:00 |
|
zotlabs
|
191edfdaa1
|
more heavy lifting
|
2018-05-31 21:05:09 -07:00 |
|
zotlabs
|
fd4ea47503
|
move libzot to class
|
2018-05-31 19:42:13 -07:00 |
|
zotlabs
|
5d83469621
|
when removing a connection, use the same rules as expire: don't remove items that are starred, filed, or that you replied to.
|
2018-05-31 16:11:51 -07:00 |
|
Mario Vavti
|
b438ffead4
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-05-31 13:06:33 +02:00 |
|
zotlabs
|
f0690aadcc
|
typo in unused function
|
2018-05-30 23:40:01 -07:00 |
|
zotlabs
|
6dcad87ae8
|
make refresh packet work
|
2018-05-30 20:32:59 -07:00 |
|
Mario Vavti
|
6349a7417f
|
make navbar search use the module search function in /network and /channel
|
2018-05-30 22:40:22 +02:00 |
|
Mario Vavti
|
9fcb3bf2e8
|
first cut on restructuring the previously called network tabs
|
2018-05-30 14:02:58 +02:00 |
|
zotlabs
|
1ef937834b
|
more work
|
2018-05-29 23:52:08 -07:00 |
|
zotlabs
|
e0a35392f7
|
more commits
|
2018-05-29 23:30:18 -07:00 |
|
zotlabs
|
111bb93462
|
basic communication
|
2018-05-29 21:08:52 -07:00 |
|
zotlabs
|
b88a683127
|
zot communications
|
2018-05-28 19:42:40 -07:00 |
|
zotlabs
|
aa57887dd5
|
Merge branch 'master' into zapp
|
2018-05-26 15:13:57 -07:00 |
|
zotlabs
|
3e184ef403
|
z6 permissions work
|
2018-05-26 15:12:02 -07:00 |
|
zotlabs
|
cd4454100b
|
alternate fix for z_check_dns
|
2018-05-24 16:32:21 -07:00 |
|
zotlabs
|
c9fb4fd070
|
start sorting the permission debacle
|
2018-05-23 22:50:33 -07:00 |
|
zotlabs
|
d101ea88ca
|
more zot6 work
|
2018-05-23 21:48:19 -07:00 |
|
zotlabs
|
afb29176a4
|
deal with db failure gracefully
|
2018-05-23 02:33:46 -07:00 |
|
zotlabs
|
27ce7c11bd
|
lots more zot6 work
|
2018-05-22 23:20:29 -07:00 |
|
zotlabs
|
9e44835cc9
|
Merge branch 'master' into zapp
|
2018-05-22 19:04:24 -07:00 |
|
zotlabs
|
1061027071
|
new_channel - make text strings translatable and use the name as a base for the nick if you try to create without entering a nick
|
2018-05-21 20:17:17 -07:00 |
|
zotlabs
|
d9066ef26b
|
not null violation oauth1
|
2018-05-21 13:37:55 -07:00 |
|
zotlabs
|
21230fb39a
|
Merge branch 'master' into zapp
|
2018-05-20 20:44:20 -07:00 |
|
zotlabs
|
a9e81abcf9
|
more z6 work
|
2018-05-20 20:42:31 -07:00 |
|
zotlabs
|
0044906fab
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-05-20 20:19:11 -07:00 |
|
zotlabs
|
ac8706e919
|
pleroma does not return a valid JRD when given an accept header of application/jrd+json - it only returns a JRD when passed an accept header of application/json (ahead of anything else because XRD is served at the same endpoint)
|
2018-05-20 20:15:19 -07:00 |
|
zotlabs
|
8611e7f8a6
|
remove unused mindate parameter in the network/stream API method
|
2018-05-20 13:29:48 -07:00 |
|
git-marijus
|
acb114d0d1
|
Merge pull request #1174 from anaqreon/dev
Rename Permission Groups to Permission Categories and clarify feature…
|
2018-05-20 11:42:13 +02:00 |
|
Mario Vavti
|
7e99931733
|
implement jot reset button
|
2018-05-20 09:23:44 +02:00 |
|
Mario Vavti
|
0bc2a4f603
|
fix issues with attachment labels
|
2018-05-19 11:04:34 +02:00 |
|
zotlabs
|
dae89ce91c
|
wrong default param for pubstream_incl (this checkin also picked up a few minor and hopefully non-significant changes)
|
2018-05-18 16:57:45 -07:00 |
|
zotlabs
|
8881530caf
|
include/zot update
|
2018-05-18 04:05:47 -07:00 |
|
zotlabs
|
b1629db876
|
checkin lots of recent zap/zot6 work
|
2018-05-18 03:09:38 -07:00 |
|
zotlabs
|
e55eb26544
|
Merge branch 'master' into zapp
|
2018-05-17 19:33:58 -07:00 |
|
Andrew Manning
|
179eeb10a6
|
Rename Permission Groups to Permission Categories and clarify feature settings text.
|
2018-05-15 19:57:40 -04:00 |
|
zotlabs
|
aac5fd96cc
|
provide function to fetch photo contents from url
|
2018-05-15 16:51:04 -07:00 |
|
zotlabs
|
16930c1c54
|
anybody authenticated not correctly handled in can_comment_on_post()
|
2018-05-15 16:08:51 -07:00 |
|
Mario Vavti
|
de63e40a70
|
we must now provide the full path to the profile image for the cavatar plugin to work
|
2018-05-15 10:20:20 +02:00 |
|
zotlabs
|
803e85caeb
|
make get_default_profile_photo() pluggable
|
2018-05-14 23:10:20 -07:00 |
|
zotlabs
|
46152cc56b
|
ensure all password checking goes through the authenticate plugin hook (for instance in mod_removeme)
|
2018-05-14 20:17:00 -07:00 |
|
zotlabs
|
301e405769
|
fine tuning the refactored tag/mention code
|
2018-05-14 18:27:12 -07:00 |
|
zotlabs
|
229d82c4c7
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-05-14 17:23:19 -07:00 |
|
zotlabs
|
d9759ba63c
|
more refactor tags/mentions
|
2018-05-14 17:20:25 -07:00 |
|
Mario Vavti
|
2d1dbc8f40
|
Revert "We're no longer setting a backup ACL for private mention typos."
This reverts commit 356c7003f2 .
|
2018-05-14 09:10:36 +02:00 |
|
Mario Vavti
|
1b160c0a2d
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-05-14 09:04:40 +02:00 |
|
zotlabs
|
356c7003f2
|
We're no longer setting a backup ACL for private mention typos.
|
2018-05-13 15:50:42 -07:00 |
|
Mario Vavti
|
2c819c8619
|
fix postgres issue if register mode is set to yes - with approval
|
2018-05-12 12:46:09 +02:00 |
|
zotlabs
|
62bc5e8051
|
use Zlib/MessageFilter for sourced messages also
|
2018-05-10 19:31:51 -07:00 |
|
zotlabs
|
721496f922
|
hubzilla issue #1169
|
2018-05-10 17:11:03 -07:00 |
|
zotlabs
|
be225164eb
|
allow either
|
2018-05-10 13:48:18 -07:00 |
|
zotlabs
|
1650ac2edd
|
tag search not finding articles
|
2018-05-09 23:44:24 -07:00 |
|
zotlabs
|
bb1aa04689
|
change the embed from albums hovertip as well to emphasise 'existing'
|
2018-05-09 21:28:48 -07:00 |
|
zotlabs
|
67bb167cf8
|
Change hovertip on paperclip button to read 'Attach/Upload file' because a lot of people gravitate to 'insert photo from album' instead, looking for a way to upload into the post.
|
2018-05-09 21:22:25 -07:00 |
|
zotlabs
|
b4be1da91e
|
thread_author_menu - add some more checks as to whether to show certain links. This should complete work on hubzilla issue #1052
|
2018-05-09 21:08:12 -07:00 |
|
zotlabs
|
50796079fa
|
loose ends discovered while fixing hubzilla #1166
|
2018-05-09 17:09:38 -07:00 |
|
zotlabs
|
9acf007687
|
hubzilla issue #1166
|
2018-05-09 17:03:10 -07:00 |
|
zotlabs
|
3c8de7b59d
|
use imagemagick first stage thumbnail for cover photos, if configured
|
2018-05-07 23:57:17 -07:00 |
|
zotlabs
|
e646684493
|
pdf embeds
|
2018-05-06 19:57:37 -07:00 |
|
zotlabs
|
257dcaaf8b
|
minor tweak to last pull: ensure that feeds have a name besides whitespace characters
|
2018-05-06 18:25:17 -07:00 |
|
zotlabs
|
a30934c563
|
ensure that feed xchans have a name
|
2018-05-06 18:23:39 -07:00 |
|
zotlabs
|
620082c16b
|
If one has system.network_page_default set to a different sort order use that order on the 'All Channels' selection of the Collections (privacy group) widget.
|
2018-05-06 16:55:07 -07:00 |
|
zotlabs
|
b2218574ee
|
allow uninstall of plugins which no longer exists via cmdline tool
|
2018-05-05 16:19:23 -07:00 |
|
zotlabs
|
894f5bc79a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-05-05 02:24:37 -07:00 |
|
zotlabs
|
b47b917eb0
|
check_item_source: always log uid
|
2018-05-05 01:52:35 -07:00 |
|
zotlabs
|
c41c04cf11
|
log all possible return conditions from check_item_source(), use consistent xchan
|
2018-05-05 01:43:14 -07:00 |
|
Mario Vavti
|
b0ca73c1ba
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-05-05 07:22:31 +02:00 |
|
Mario Vavti
|
f995ef0124
|
set XML_OPTION_SKIP_WHITE to 1 again
|
2018-05-04 22:46:43 +02:00 |
|
zotlabs
|
4a26f0d2d4
|
turn skip white back on - (xml actually doesn't parse if you disable this)
|
2018-05-04 13:44:34 -07:00 |
|
Mario Vavti
|
34f6d9f714
|
missing basetag
|
2018-05-04 13:54:12 +02:00 |
|
zotlabs
|
b52e9731e3
|
tagging changes: + (old style forum mentions), and underscore space replacement are no longer supported.
|
2018-05-03 20:14:58 -07:00 |
|
zotlabs
|
75c8f656c9
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-05-02 23:18:09 -07:00 |
|
zotlabs
|
e9f49d9d9c
|
admin delete of files
|
2018-05-02 20:08:59 -07:00 |
|
zotlabs
|
9713436f49
|
backend work to allow admin to delete photos. Still requires frontend work to give admin access to either the photos and/or the delete link.
|
2018-05-02 18:23:42 -07:00 |
|
zotlabs
|
406ea67bbc
|
Provide admin delete ability if the viewer is admin but has no existing delete authority. For 3.5+ as a new string is involved.
|
2018-05-02 17:39:12 -07:00 |
|
zotlabs
|
285781b887
|
hubzilla issue #1151 - activitypub mention gets bookmarked
|
2018-05-02 13:49:22 -07:00 |
|
Mario Vavti
|
9615d02b35
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-05-02 09:22:23 +02:00 |
|