Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 06:35:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
23398 commits 7 branches 30 tags 160 MiB
Commit graph

8032 commits

Author SHA1 Message Date
zotlabs
63a75cc7d5 rename privacy groups to access lists, forums to groups 2019-02-14 15:26:37 -08:00
zotlabs
c72d19dbf2 profile photo edit date weirdness 2019-02-13 21:07:27 -08:00
zotlabs
154b0e96d5 start zot+/zap+ 2019-02-13 15:33:45 -08:00
zotlabs
880579f249 change repo locations 2019-02-11 15:55:07 -08:00
zotlabs
7dcfd5995b consistent file permissions 2019-02-07 21:34:55 -08:00
zotlabs
9e740c327f small change to notification behaviour 2019-02-05 21:00:00 -08:00
zotlabs
da09048a7d linkify_tags fixes from upstream 2019-02-03 16:57:07 -08:00
zotlabs
0f2e991c56 rename the sharing options and update the license for 2019 2019-01-31 15:54:37 -08:00
zotlabs
9eb9e10712 cache embeds on storage 2019-01-29 15:18:35 -08:00
zotlabs
f5125b51f1 add ical link to activitystreams event objects 2019-01-28 14:58:18 -08:00
zotlabs
c43173109e minor fixes from upstream 2019-01-24 19:03:14 -08:00
zotlabs
045debd26f issues with autoperms, rewrite owa, upstream fixes to main.js 2019-01-23 14:27:51 -08:00
zotlabs
a4f638124b content filter app 2019-01-22 19:11:53 -08:00
zotlabs
56d61ae89b disable online presence indication until there is a viable realtime chat 2019-01-21 21:47:16 -08:00
zotlabs
1d3540ac6c refactor include/follow (Connect::connect()) and update strings 2019-01-21 17:31:24 -08:00
zotlabs
76d66184fc more work on cross-protocol follows with multiple xchans/hublocs 2019-01-20 21:41:19 -08:00
zotlabs
1bdd8b6c52 comment perm issue 2019-01-20 14:39:52 -08:00
zotlabs
289150a21a updates 2019-01-18 13:04:05 -08:00
zotlabs
f81d2f08d1 cleanup 2019-01-17 15:12:58 -08:00
zotlabs
bf39206518 store item_level to avoid a lot of recursion during rendering 2019-01-14 14:47:05 -08:00
zotlabs
a611a1cecc send signed fetches over AP, requeue (queue::update) AP messages on fail, set ajaxasync flag on updates, upstream fixes to mail import 2019-01-13 16:08:26 -08:00
zotlabs
66e0c61ebb separate blacklisting availability for public streams and general communications 2019-01-05 14:47:21 -08:00
zotlabs
7d19624c78 osada: fix parent comment_policy on forum reshares 2019-01-04 22:50:19 -08:00
zotlabs
a0fae60363 slider - convert to flex and style a wee bit 2018-12-28 17:54:11 -08:00
zotlabs
a001507577 assorted issues 2018-12-26 15:33:01 -08:00
zotlabs
ad5381545a affinity slider issues after approving connections 2018-12-17 01:59:17 -08:00
zotlabs
7e4fc5c438 completion of crypto cleanup 2018-12-16 20:37:43 -08:00
zotlabs
e47bc21034 crypto: switch to Keyutils - please review 2018-12-14 12:46:03 -08:00
zotlabs
cd937b058d crypto: migrate new_keypair functions - please review 2018-12-13 17:23:38 -08:00
zotlabs
cb42507e1f crypto: migration please review 2018-12-13 17:16:01 -08:00
zotlabs
c3583e22a4 relocate 2018-12-13 14:28:38 -08:00
zotlabs
b9d1ccbbc3 issues with app ordering 2018-12-12 19:04:59 -08:00
zotlabs
42fa248f81 prefer zot6 hublocs and xchans when there's a choice. 2018-12-11 21:42:15 -08:00
zotlabs
c4b3ad8c76 try to gracefully handle multi-protocol xchans/hublocs with the same url 2018-12-11 20:30:47 -08:00
zotlabs
50ad168ad0 issues with language filtering 2018-12-11 15:57:15 -08:00
zotlabs
74d1b11961 use modulus differentiation between thread levels to aid quick comparisons 2018-12-10 21:01:57 -08:00
zotlabs
643214917d misc fixes, plus add cover photo and profile "about" to AP actor document 2018-12-03 21:45:35 -08:00
zotlabs
8afb181e7a threading tweaks 2018-12-02 20:56:23 -08:00
zotlabs
b3d36b0c7c thread issues 2018-12-02 20:24:12 -08:00
zotlabs
cb59d4a144 thread support 2018-12-02 14:39:58 -08:00
zotlabs
4cd565930c allow notification filtering by name or addr 2018-11-30 19:01:10 -08:00
zotlabs
2ee719abc0 actor type = Organization wasn't being recognised. 2018-11-23 12:18:19 -08:00
zotlabs
b722b87041 new activitypub forum implementation (compatible with mastodon) 2018-11-22 17:04:28 -08:00
zotlabs
00fb137164 more tag stuff 2018-11-21 21:05:08 -08:00
zotlabs
e253a25025 forum work 2018-11-21 17:46:08 -08:00
zotlabs
6dc45a9644 fix wildcard blacklist checking 2018-11-20 21:50:41 -08:00
zotlabs
f10ed01fac hardening 2018-11-20 18:55:33 -08:00
zotlabs
7cc762dcea add more schema validation to clone sync activities 2018-11-19 17:30:22 -08:00
zotlabs
8f6b1c1239 comment delivery issue 2018-11-18 21:53:09 -08:00
zotlabs
c9c26fba1c parsing issue with prismo 2018-11-12 19:38:21 -08:00
zotlabs
5ea011b0ce remove the spoiler blocks 2018-11-11 17:44:01 -08:00
zotlabs
a4088ec4bf more repair of malformed xchan storage 2018-11-08 17:02:04 -08:00
zotlabs
59a47e2835 more on the DM leakage bug 2018-11-07 18:50:41 -08:00
DM42.Net (Matt Dent)
bb4cbbba0b Fix: Uploaded photo perms set to 'only me' even if force_public_uploads = 1 2018-11-03 22:28:24 -04:00
zotlabs
b20032a61d compatibility fix for prismo 'Page' types and fix from upstream for scaled images 2018-11-01 16:53:45 -07:00
zotlabs
5ef1b23d0f fixes from upstream 2018-10-30 21:28:51 -07:00
zotlabs
8c860d04ce updates from upstream 2018-10-30 15:42:52 -07:00
zotlabs
d9170c6617 more photo object work 2018-10-28 21:01:58 -07:00
zotlabs
7e3c8e46e7 turn photos into proper AS objects (still need to fix the places where they were turned into Note for short-term compatibility) 2018-10-28 20:39:01 -07:00
zotlabs
516a375fff fix embed photos from albums and phase1 of the forum count bug from hubzilla and the edit post breaking delivery chain bug also from hubzilla 2018-10-27 14:30:07 -07:00
zotlabs
7b46fd47fb add my_perms_contains for balance 2018-10-24 23:00:30 -07:00
zotlabs
60bb243081 handle at least some basic friendica attachment bbcodes 2018-10-24 19:01:43 -07:00
zotlabs
6378cb8f27 miscellaneous fixes, unset project icon, onepoll feed failure 2018-10-20 02:03:31 -07:00
zotlabs
6d3d106c23 more event work 2018-10-18 15:14:33 -07:00
zotlabs
52c3377c0b event issue 2018-10-18 02:54:40 -07:00
zotlabs
cd2c3f7127 share issue on zot6 side 2018-10-17 15:51:23 -07:00
zotlabs
38b54f55d1 event formatting and rsvp parenting 2018-10-16 13:56:46 -07:00
zotlabs
eda156a5bb regression in socgraph 2018-10-15 19:29:32 -07:00
zotlabs
23256b5b1a update banner 2018-10-13 17:53:17 -07:00
zotlabs
e6d8fe98e1 reduce the curl logging info to the important stuff 2018-10-11 21:18:02 -07:00
zotlabs
c9bcde817a the rest of the bits 2018-10-10 17:58:51 -07:00
zotlabs
3a8d916702 better signature handling 2018-10-09 21:08:57 -07:00
zotlabs
b66312e408 status editor hook 2018-10-08 21:27:35 -07:00
zotlabs
1dc002c4fd wrong mime type 2018-10-07 20:37:34 -07:00
zotlabs
87587c40d3 rework the banner code 2018-10-07 19:54:25 -07:00
zotlabs
4d76e4a99f default icon 2018-10-07 19:44:27 -07:00
zotlabs
a5455fa049 add personal filter and fix api zot-auth 2018-10-07 15:51:52 -07:00
zotlabs
2f48679fef fix import/export after project merger 2018-10-04 13:45:20 -07:00
zotlabs
bd5d6158a1 zap/osada repo merger 2018-10-03 19:10:52 -07:00
zotlabs
290b8b58ec rename groups and group_members tables 2018-09-25 17:50:59 -07:00
zotlabs
0bc76e85e4 Merge branch 'zap' into dev 2018-09-19 16:26:36 -07:00
zotlabs
fd0de5fc12 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 16:26:05 -07:00
zotlabs
d3b28b718c Merge branch 'red' into dev 2018-09-18 20:51:38 -07:00
zotlabs
ce70411a6c Merge branch 'zap' into dev 2018-09-18 17:49:14 -07:00
zotlabs
75a39d5e91 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-18 17:48:58 -07:00
zotlabs
f099d0878d double dbesc in item_store_update 2018-09-18 17:46:46 -07:00
zotlabs
0709d0f08e Merge branch 'zap' into dev 2018-09-17 23:41:03 -07:00
zotlabs
ab3d3b029e Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-17 23:40:45 -07:00
zotlabs
9f14cd4b3c missing connect link if no xchan_addr 2018-09-17 23:40:17 -07:00
zotlabs
f2d3fd0f1a Merge branch 'zap' into dev 2018-09-17 22:53:51 -07:00
zotlabs
f6c5e9e610 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-17 22:53:38 -07:00
zotlabs
f2c99480f0 generate better photo and event activities 2018-09-17 22:51:27 -07:00
Mario
c4c1b1f5a2 Merge branch 'patch-3' into 'dev' 
Save combined view while deleting or recalling first message in thread

See merge request hubzilla/core!1273
 2018-09-17 13:29:52 +02:00
Max Kostikov
12b9106fc7 Update zot.php 2018-09-17 13:16:04 +02:00
Max Kostikov
faaffdd618 Update message.php 2018-09-17 13:15:43 +02:00
Max Kostikov
774729b221 Update msglib.php 2018-09-17 13:15:24 +02:00
Mario
eefa47776b Merge branch 'trap-template-errors' into 'dev' 
Trap errors in template rendering.  Output a generic error and log problem.

See merge request hubzilla/core!1274
 2018-09-17 11:03:37 +02:00
Mario
0b12a7e66f Merge branch 'delete-attach-hook' into 'dev' 
delete_attach hook

See merge request hubzilla/core!1275
 2018-09-17 11:00:22 +02:00
zotlabs
6d9b38dad8 discover issue 2018-09-16 22:05:04 -07:00
zotlabs
f0266b4837 Merge branch 'zap' into dev 2018-09-16 21:43:20 -07:00
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