Commit graph

4020 commits

Author SHA1 Message Date
Michael Vogel
230a645307 Diaspora: Another Bugfix for the new protocol 2016-06-29 20:37:04 +02:00
Michael Vogel
152efdaec5 Diaspora: Incompatibilities with signature check solved 2016-06-29 10:33:43 +02:00
Tobias Diekershoff
773517a734 Merge pull request #2638 from annando/1606-avatar-handling
Imrpoved avatar handling when storing them/partly use of "micro"
2016-06-25 19:51:00 +02:00
rabuzarus
fd72f36ffe move html from function micropro() to own templates 2016-06-25 18:46:47 +02:00
Michael Vogel
ad6b3f8815 Merge pull request #2636 from rabuzarus/2506_frio_strings
add missing strings for frio
2016-06-25 14:03:34 +02:00
Michael Vogel
0b1188b7fe Imrpoved avatar handling when storing them/partly use of "micro" 2016-06-25 13:56:55 +02:00
rabuzarus
073f520cee add missing strings for frio 2016-06-25 12:21:13 +02:00
Michael Vogel
e2023b6667 Store the guid value as well. 2016-06-25 11:52:52 +02:00
Michael Vogel
ec5b3109e4 Support for the case when the guid and public key will vanish from webfinger 2016-06-25 00:38:47 +02:00
Tobias Diekershoff
f8a20a15d3 Merge pull request #2633 from annando/1606-author-id-update
author-id/owner-id: Post update function/added database documentation
2016-06-24 07:03:46 +02:00
Michael Vogel
eabf8734a8 Merge pull request #2631 from rabuzarus/1906-event-test
cal export && public calendar - fix permissions
2016-06-23 23:24:27 +02:00
Michael Vogel
c7373dcec4 author-id/owner-id: Post update function/added database documentation 2016-06-23 21:15:54 +02:00
rabuzarus
e352458ef0 pub calendar - permission clean up and docu 2016-06-23 10:07:13 +02:00
rabuzarus
cd92a0dc34 Merge pull request #2624 from annando/1606-contact-id
Item: New fields for author id and owner id - avatar improvement with relocation
2016-06-22 14:26:39 +02:00
rabuzarus
2cac69ca86 cal export && public calendar - even better permissions testing 2016-06-22 13:50:47 +02:00
rabuzarus
8cc5dd35e8 cal export && public calendar - fix permissions 2016-06-22 00:39:52 +02:00
Michael Vogel
49c19a3c00 Merge pull request #2628 from rabuzarus/1906-event-test
move the cal addon (exporting calendars) to core
2016-06-21 22:48:31 +02:00
Michael Vogel
266fea3874 Merge remote-tracking branch 'upstream/develop' into 1606-contact-id 2016-06-21 00:10:24 +02:00
rabuzarus
71c9f562ae move the cal addon (exporting calendars) to core 2016-06-20 23:31:49 +02:00
Michael Vogel
a657377616 Diaspora: Try to fetch the uri if we already received the message 2016-06-20 22:48:55 +02:00
Michael Vogel
40a44f1571 Some manual revert ... 2016-06-20 22:48:09 +02:00
Michael Vogel
467176fa65 Diaspora: Ensure that we always store the correct URI 2016-06-20 22:43:14 +02:00
Michael Vogel
65b541413f Merge remote-tracking branch 'upstream/develop' into 1606-contact-id 2016-06-20 07:28:47 +02:00
rabuzarus
7495a34b32 implement a public calendar for vistors of someones profile page 2016-06-19 22:04:34 +02:00
Michael Vogel
0adff6f6b8 Fix for author-thumb/owner-thumb - DFRN: Relocate stuff 2016-06-19 20:01:25 +02:00
Michael Vogel
91db7a549c Optimised the amount of function for the item query 2016-06-19 08:32:38 +02:00
Michael Vogel
c3ed6f7d01 Improved default value handling 2016-06-19 01:22:32 +02:00
Michael Vogel
e512a83ecc Massively updated avatar handling 2016-06-19 01:07:20 +02:00
Michael Vogel
bf2e23c205 Merge pull request #2616 from rabuzarus/1206-events-template
use standard templates in events + frio templates for events
2016-06-18 15:01:00 +02:00
rabuzarus
b977efc95c code highlight - some spacing for readability 2016-06-17 15:29:01 +02:00
rabuzarus
7dc5fc8b9f Merge develop into 1206-events-template
Conflicts:
	view/theme/frio/css/style.css
2016-06-17 14:33:08 +02:00
rabuzarus
4313982e02 frio - event - code clean up + docu 2016-06-17 14:27:33 +02:00
rabuzarus
8b4c416713 frio: events - split event form in different sections 2016-06-16 20:16:16 +02:00
rabuzarus
0167a2bd61 port of Hubzillas code highlight feature 2016-06-16 11:38:12 +02:00
Michael Vogel
8762fb671f Merge remote-tracking branch 'upstream/develop' into 1606-contact-id 2016-06-16 10:48:52 +02:00
Michael Vogel
3c9a80a31c dfrn relocate: addr field added, gcontact update added 2016-06-15 21:23:22 +02:00
Michael Vogel
0e35427dfc New fields "author-id" and "owner-id" in the item table 2016-06-15 21:20:55 +02:00
Michael Vogel
7f5a2d5c23 Categories were missing 2016-06-14 09:50:17 +02:00
Michael Vogel
a05f0c39a6 Merge remote-tracking branch 'upstream/develop' into 1606-time-travel 2016-06-13 22:32:40 +02:00
Michael Vogel
81395fe385 Avoid time travel in posts (received before created) 2016-06-13 22:21:33 +02:00
Michael Vogel
2815173a52 Bugfix: Items weren't sorted correctly 2016-06-13 22:20:09 +02:00
Fabrixxm
6e28cdf2ee Fix Config and PConfig ::get() on new keys 2016-06-13 10:28:40 +02:00
rabuzarus
5e98f27fcd frio: events - work on event_form.tpl + datetime.php 2016-06-13 10:19:38 +02:00
rabuzarus
869a439466 Merge pull request #2595 from annando/1606-contact-priority
Priority for native networks when searching by contact url
2016-06-13 09:28:54 +02:00
Michael Vogel
125d80292b Some cleanup 2016-06-12 23:06:48 +02:00
Michael Vogel
c68f28bc77 Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup 2016-06-12 21:07:45 +02:00
Michael Vogel
c05898c57d The queries for items are unified (a little bit) 2016-06-12 21:04:55 +02:00
rabuzarus
64753f474c fix config & pconfig 2016-06-12 18:55:20 +02:00
Michael Vogel
6d50d18242 Merge pull request #2584 from rabuzarus/0906-profiles
some restructure in profiles.php + frio template for profiles settings
2016-06-12 14:20:42 +02:00
Michael Vogel
09fbcbc685 Just some added todo 2016-06-12 12:06:15 +02:00