Commit graph

22267 commits

Author SHA1 Message Date
zotlabs
ddb50b8de4 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-09 23:17:23 -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
zotlabs
39d295462e merge from downstream 2018-09-07 04:46:57 -07:00
zotlabs
235c0a2865 signature changes 2018-09-06 21:55:30 -07:00
zotlabs
017f1a3c79 optimise 2018-09-06 21:27:09 -07:00
zotlabs
75ecacd88c use uuid4 2018-09-06 20:21:52 -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
3ff96239f6 typo 2018-09-06 17:00:42 -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
f89f4a5641 update README 2018-09-05 17:05:03 -07:00
zotlabs
e007f6ff11 license update 2018-09-05 16:53:32 -07:00
zotlabs
696d5fc350 version 2018-09-05 16:48:59 -07:00
zotlabs
b90495f95d RC candidate 2018-09-05 16:37:06 -07:00
Mario Vavti
ea381d9180 move str_replace inside if clause 2018-09-05 14:44:06 +02:00
Mario Vavti
4f82428a20 hide cover photo by default and show it only if conditions are met 2018-09-05 14:31:34 +02:00
Mario Vavti
e494a76b33 revert "Add bottom margin on aside elements and main to allow for viewport footer."
This reverts commit 1d7d604016.
2018-09-05 12:34:30 +02:00
Mario Vavti
1753e40466 Revert "Fix jumpy sidebars"
This reverts commit 79eb6d3942.
2018-09-05 12:32:53 +02:00
Mario Vavti
6667ba4172 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-09-05 12:20:06 +02:00
Mario Vavti
75e8aa8aee bump version 2018-09-05 12:19:52 +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
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
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
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
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
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
e2e4dd6f2c more small fixes 2018-09-03 18:23: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
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
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