zotlabs
|
767d1f9889
|
missing call to actor_store
|
2018-09-13 18:42:29 -07:00 |
|
zotlabs
|
5cee677014
|
Merge branch 'zap' into dev
|
2018-09-13 18:23:00 -07:00 |
|
zotlabs
|
71cc526f7d
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-13 18:22:43 -07:00 |
|
zotlabs
|
9febf8643e
|
chanview not redirecting properly for z6
|
2018-09-13 18:20:59 -07:00 |
|
zotlabs
|
abeb19416e
|
chanview not redirecting properly for z6
|
2018-09-13 18:19:54 -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 |
|
zotlabs
|
4a8de535e2
|
Merge branch 'master' of https://framagit.org/macgirvin/zap
|
2018-09-12 22:29:29 -07:00 |
|
Mario Vavti
|
2651eae663
|
mpre feature to app transition
|
2018-09-12 11:08:53 +02:00 |
|
zotlabs
|
1d9c5eb821
|
Merge branch 'zap' into dev
|
2018-09-11 22:23:48 -07:00 |
|
zotlabs
|
3fdb9f3cfd
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-11 22:23:32 -07:00 |
|
zotlabs
|
73ae895e5c
|
abook sync issue
|
2018-09-11 22:21:31 -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
|
66cd2dc7e4
|
cleanup
|
2018-09-11 16:58:26 -07:00 |
|
zotlabs
|
67ae00ae2f
|
it's alive
|
2018-09-11 03:36:31 -07:00 |
|
Mario Vavti
|
28e4977c33
|
include item.title in /network and /channel search
|
2018-09-11 11:16:58 +02:00 |
|
zotlabs
|
adc164b825
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
|
2018-09-10 22:11:26 -07:00 |
|
zotlabs
|
04a5ebf8c0
|
Merge branch 'zap' into dev
|
2018-09-10 18:39:15 -07:00 |
|
zotlabs
|
e45583c794
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-10 18:37:51 -07:00 |
|
zotlabs
|
f2e8d9f032
|
more hyperdrive
|
2018-09-10 18:36:52 -07:00 |
|
Mario Vavti
|
c6abe87ec2
|
move cards from features to apps
|
2018-09-10 13:34:05 +02:00 |
|
zotlabs
|
c960c91a8d
|
wrong mimetype
|
2018-09-09 23:29:14 -07: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
|
abfb17ef33
|
hyperdrive work
|
2018-09-09 20:55:51 -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 |
|
Mario Vavti
|
9607bb29fd
|
missing text
|
2018-09-07 14:58:16 +02:00 |
|
Mario Vavti
|
d29415a6e2
|
provide a noscript_content switch for mod channel and display
|
2018-09-07 14:23:16 +02:00 |
|
zotlabs
|
20520b2ecc
|
merge from downstream
|
2018-09-07 04:47:53 -07:00 |
|
zotlabs
|
39d295462e
|
merge from downstream
|
2018-09-07 04:46:57 -07:00 |
|
zotlabs
|
0a36bc3eab
|
like parents
|
2018-09-07 04:44:49 -07:00 |
|
Mario Vavti
|
54fa28441c
|
install bootstrap via composer
|
2018-09-07 11:26:02 +02:00 |
|
Mario Vavti
|
bb42ec2bfc
|
apps: change page title to available/installed, display install action label in button and use different icons for installable and updateable apps
|
2018-09-07 10:39:15 +02:00 |
|
zotlabs
|
5079b44d08
|
undeclared var
|
2018-09-06 22:52:48 -07:00 |
|
zotlabs
|
235c0a2865
|
signature changes
|
2018-09-06 21:55:30 -07:00 |
|
zotlabs
|
6f2284ba18
|
missing observer
|
2018-09-06 21:51:52 -07:00 |
|
zotlabs
|
667f8ed920
|
delivery optimisations
|
2018-09-06 21:24:56 -07:00 |
|
zotlabs
|
00eeb680d9
|
set a process timeout for fetching remote xchan photos
|
2018-09-06 18:33:27 -07:00 |
|
zotlabs
|
61165cbb37
|
merge
|
2018-09-06 17:50:45 -07:00 |
|
zotlabs
|
a1cf08ac36
|
Merge branch 'zap' into dev
|
2018-09-06 17:44:12 -07:00 |
|
zotlabs
|
4005c484c1
|
Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-06 17:42:01 -07:00 |
|
zotlabs
|
551e7b332a
|
move xchan_photo import to background
|
2018-09-06 17:37:09 -07:00 |
|
zotlabs
|
b77eac2ae8
|
move xchan_photo processing to background
|
2018-09-06 17:36:35 -07:00 |
|
zotlabs
|
acad5df5dc
|
typo
|
2018-09-06 17:01:16 -07:00 |
|
zotlabs
|
3ff96239f6
|
typo
|
2018-09-06 17:00:42 -07:00 |
|
zotlabs
|
91d629fb8e
|
typo
|
2018-09-06 16:59:19 -07:00 |
|
zotlabs
|
7b492d2bd3
|
federated emoji support
|
2018-09-06 16:40:13 -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
|
efab473ee2
|
add comment_policy
|
2018-09-05 16:30:46 -07:00 |
|
Mario Vavti
|
ea381d9180
|
move str_replace inside if clause
|
2018-09-05 14:44:06 +02:00 |
|
Mario
|
a81a1bd5f1
|
Merge branch 'fix-authorcomment-fix' into 'dev'
Corrected resubmit of fixes to Authors unable to comment on posts they authored…
See merge request hubzilla/core!1269
|
2018-09-05 12:18:56 +02:00 |
|
Mario Vavti
|
5d1539df75
|
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
|
2018-09-05 12:17:50 +02:00 |
|
Mario Vavti
|
a821682c8c
|
instead of not displaying the cover-photo at all after first page load, load the page with the cover slided up. change pointer to n-resize if cover is not slid.
|
2018-09-05 12:17:32 +02: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
|
68634ec02e
|
Merge branch 'zap'
|
2018-09-04 19:07:06 -07:00 |
|
zotlabs
|
c42dd61301
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-04 19:06:49 -07:00 |
|
zotlabs
|
a4cfb0558a
|
set default profile photo is nothing was found
|
2018-09-04 19:06:19 -07:00 |
|
zotlabs
|
27a982249b
|
Merge branch 'zap'
|
2018-09-04 18:48:48 -07:00 |
|
zotlabs
|
286bd494f2
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-04 18:46:49 -07:00 |
|
zotlabs
|
bd1fa5c360
|
stream order widget
|
2018-09-04 18:44:02 -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 |
|
zotlabs
|
0aa9c35d0c
|
announce improvements
|
2018-09-04 04:06:50 -07:00 |
|
zotlabs
|
fb068ac9f7
|
more tweaks
|
2018-09-03 21:30:39 -07:00 |
|
zotlabs
|
e2e4dd6f2c
|
more small fixes
|
2018-09-03 18:23:31 -07:00 |
|
zotlabs
|
6ef4abacb1
|
more fine tuning
|
2018-09-03 18:22:31 -07: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 |
|
zotlabs
|
675914c6a5
|
Merge branch 'zap'
|
2018-09-02 23:13:30 -07:00 |
|
zotlabs
|
b0b08ea9bd
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-02 23:13:15 -07:00 |
|
zotlabs
|
5e47e9d258
|
use activity url
|
2018-09-02 23:12:53 -07:00 |
|
zotlabs
|
10ac556bb4
|
Merge branch 'zap'
|
2018-09-02 22:59:59 -07:00 |
|
zotlabs
|
edb22f9244
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-02 22:59:36 -07:00 |
|
zotlabs
|
95c38bcf62
|
incorrect object reference
|
2018-09-02 22:59:08 -07:00 |
|
zotlabs
|
3a6df2b12f
|
sync likes and shares
|
2018-09-02 22:58:30 -07:00 |
|
zotlabs
|
19e06edec8
|
Merge branch 'zap'
|
2018-09-02 20:52:00 -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
|
cf2604d104
|
Merge branch 'zap'
|
2018-09-02 20:46:40 -07:00 |
|
zotlabs
|
6ff75a1bfe
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-02 20:46:24 -07:00 |
|
zotlabs
|
97cc4a2479
|
attach content missing
|
2018-09-02 20:45:53 -07:00 |
|
zotlabs
|
ed00b9957b
|
indicate repeated posts
|
2018-09-02 20:44:15 -07:00 |
|
zotlabs
|
143241a45e
|
Merge branch 'zap'
|
2018-09-02 20:17:52 -07:00 |
|
zotlabs
|
fb9e4adba1
|
Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap
|
2018-09-02 20:17:02 -07:00 |
|
zotlabs
|
11a836cf83
|
sharing changes
|
2018-09-02 20:16:33 -07:00 |
|
zotlabs
|
931e0b5445
|
changes to sharing
|
2018-09-02 20:16:04 -07: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
|
8e7fb44896
|
local compatibility fixes
|
2018-09-01 15:52:28 -07:00 |
|
zotlabs
|
0954afb321
|
compatibility fixes
|
2018-09-01 15:51:44 -07:00 |
|
Mario Vavti
|
d66f58a550
|
fix undefined constant warning
|
2018-09-01 21:09:04 +02: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 |
|
Mario Vavti
|
4376f8f030
|
do not count sys channel in totals
|
2018-09-01 13:43:32 +02:00 |
|
Mario Vavti
|
d377660b5a
|
update 1218: missing default value for pg
|
2018-08-31 20:26:31 +02: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 |
|
zotlabs
|
adb1f58b59
|
some edge cases
|
2018-08-30 19:19:32 -07:00 |
|
zotlabs
|
2b0c512087
|
re-parent by default unless there's a "go out on the web and find a parent for this post" plugin.
|
2018-08-30 18:50:21 -07:00 |
|
zotlabs
|
62e2df4c96
|
add conversation element and more logging
|
2018-08-29 23:54:13 -07: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
|
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
|
969a68ac36
|
connect perms
|
2018-08-29 02:20:43 -07:00 |
|
zotlabs
|
ed4aa90338
|
connect perms
|
2018-08-29 02:19:32 -07:00 |
|
zotlabs
|
37f97fc986
|
mod_nullbox - which we will require for federation outside ActivityPub
|
2018-08-28 23:36:27 -07:00 |
|
zotlabs
|
7ecb337405
|
redirect stdout/stderr on cron command
|
2018-08-28 22:43:37 -07:00 |
|
zotlabs
|
cf8e787427
|
issues uncovered in federation tests
|
2018-08-28 19:49:30 -07:00 |
|
zotlabs
|
896d25d7ae
|
ap discovery issues
|
2018-08-28 18:37:21 -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
|
6cd48cbe83
|
handling linkid differently, remove this
|
2018-08-27 19:21:48 -07:00 |
|
zotlabs
|
25466def83
|
Merge branch 'zap'
|
2018-08-27 19:14:53 -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
|
17ed268f9e
|
Merge branch 'zap'
|
2018-08-27 19:12:46 -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
|
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 |
|
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 |
|
zotlabs
|
1ec12c6a04
|
Merge branch 'zap'
|
2018-08-26 23:44:01 -07: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
|
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 |
|
Max Kostikov
|
42c5e98670
|
Update Wiki_page_history.php
|
2018-08-25 21:27:20 +02:00 |
|
Max Kostikov
|
c9b80a3612
|
Update Wiki.php
|
2018-08-25 21:26:50 +02:00 |
|
Max Kostikov
|
e78a4d61d8
|
Update NativeWikiPage.php
|
2018-08-25 21:25:26 +02:00 |
|