Commit graph

22217 commits

Author SHA1 Message Date
zotlabs
edb22f9244 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-02 22:59:36 -07:00
zotlabs
3a6df2b12f sync likes and shares 2018-09-02 22:58:30 -07:00
zotlabs
705f1e98ce Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-02 20:51:46 -07:00
zotlabs
45135e7953 fix the retweet icon 2018-09-02 20:51:17 -07:00
zotlabs
6ff75a1bfe Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-02 20:46:24 -07:00
zotlabs
ed00b9957b indicate repeated posts 2018-09-02 20:44:15 -07:00
zotlabs
fb9e4adba1 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-02 20:17:02 -07:00
zotlabs
931e0b5445 changes to sharing 2018-09-02 20:16:04 -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
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
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
Mario Vavti
42093aedcf db update to get rid of bogus activitypub xchans which got created due to a bug in the pubcrawl addon 2018-08-29 13:57:36 +02:00
Mario Vavti
74d80473df Merge remote-tracking branch 'mike/master' into dev 2018-08-29 11:50:40 +02:00
zotlabs
ed5146f584 typo 2018-08-29 02:28:13 -07:00
zotlabs
ed4aa90338 connect perms 2018-08-29 02:19:32 -07:00
zotlabs
7ecb337405 redirect stdout/stderr on cron command 2018-08-28 22:43:37 -07:00
Mario Vavti
07792adc56 add paragonie and symfonie since ramsey/uuid appears to require them 2018-08-28 12:06:36 +02:00
Mario Vavti
c0c827d3ad update composer libs and add ramsey/uuid 2018-08-28 12:00:23 +02: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
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
6cd48cbe83 handling linkid differently, remove this 2018-08-27 19:21:48 -07:00
zotlabs
fca5df656c Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-27 19:14:34 -07:00
zotlabs
aeffec1a99 typo 2018-08-27 19:13:55 -07:00
zotlabs
1da14932e7 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-27 19:12:28 -07:00
zotlabs
199026bf6d typo 2018-08-27 19:12:00 -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
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
Mario Vavti
6a2bbed73d remove distinct from network query again until performance issue is resolved or another fix for the underlying problem is found 2018-08-27 10:19:10 +02:00
Mario
4c1944a08d Merge branch 'extend-convitems-dropdown' into 'dev'
Extend cog dropdown & temp fix for feed display of corrupt mids

See merge request hubzilla/core!1265
2018-08-27 10:02:58 +02:00
Mario
95f870f1b4 Merge branch 'dev' into 'dev'
Add translation to missed strings in Wiki

See merge request hubzilla/core!1264
2018-08-27 10:00:50 +02:00
Mario Vavti
c250de7dae Merge remote-tracking branch 'mike/master' into dev 2018-08-27 09:48:22 +02:00
zotlabs
6b4ef6b9c0 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-26 23:43:40 -07:00
zotlabs
3490eb4815 removed 2018-08-26 23:43:22 -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
M.Dent
a0c2bbac9d Add hook to extend conv_item cog dropdown menu 2018-08-26 23:26:10 -04:00