|
|
b580a338f6
|
Merge pull request #2654 from annando/1607-thumb-micro
use thumb avatar size instead of micro size in the contact list
|
2016-07-02 13:53:35 +02:00 |
|
|
|
90f98414cf
|
Merge pull request #2655 from annando/develop
Fixed pull request 2390
|
2016-07-02 13:53:20 +02:00 |
|
Michael Vogel
|
91e20f2f9b
|
Remove unused function
|
2016-07-02 13:42:42 +02:00 |
|
Michael Vogel
|
ddfd425cd7
|
Merge branch 'Quix0r-rewrites/is_filled_array_introduced' into develop
|
2016-07-02 13:38:39 +02:00 |
|
Michael Vogel
|
7d531afd00
|
Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced
Conflicts:
boot.php
|
2016-07-02 13:38:23 +02:00 |
|
Michael Vogel
|
e67554924a
|
use thumb avatar size instead of micro size in the contact list
|
2016-07-02 09:32:42 +02:00 |
|
|
|
0344d26896
|
Merge pull request #2653 from rabuzarus/0107_frio_jot_textcomplete
frio: fix textcomplete for jot
|
2016-07-01 17:18:25 +02:00 |
|
rabuzarus
|
9170955f80
|
frio: fix textcomplete for jot
|
2016-07-01 17:03:40 +02:00 |
|
rabuzarus
|
9262afef93
|
Merge pull request #2652 from annando/1606-diaspora-fetch3
Diaspora: Support for reading the /fetch/post/ functionality
|
2016-07-01 12:39:36 +02:00 |
|
Michael Vogel
|
c1ce7059b6
|
If it doesn't work with the new method, try the old one
|
2016-06-30 22:58:56 +02:00 |
|
Michael Vogel
|
e5dd67121f
|
Some logging added.
|
2016-06-30 22:42:46 +02:00 |
|
Michael Vogel
|
97abbe83f4
|
Diaspora: Support for reading the /fetch/post/ functionality
|
2016-06-30 22:18:48 +02:00 |
|
rabuzarus
|
b2e21ca7b8
|
Merge pull request #2651 from annando/1606-fetch-loop
Avoid redirection loops at /fetch/ and /p/
|
2016-06-30 15:21:28 +02:00 |
|
Michael Vogel
|
a7ee8a8bc9
|
Avoid redirection loops at /fetch/ and /p/
|
2016-06-30 12:02:35 +02:00 |
|
|
|
cb3704ab43
|
Merge pull request #2650 from annando/1606-diaspora-fetch
Diaspora: Support for new fetch functionality (replacement for /p/)
|
2016-06-30 09:47:40 +02:00 |
|
Michael Vogel
|
6f203b0a75
|
urlencode is better
|
2016-06-30 08:58:36 +02:00 |
|
Michael Vogel
|
5341223617
|
Do a redirect when the post doesn't come from our system but we know where it comes from.
|
2016-06-30 08:55:26 +02:00 |
|
Michael Vogel
|
24e0fffa2e
|
Small bugfix
|
2016-06-30 07:56:06 +02:00 |
|
Michael Vogel
|
d125939888
|
Just some more centralised functionality
|
2016-06-30 07:46:00 +02:00 |
|
Michael Vogel
|
99f0746660
|
Cleaned up the code
|
2016-06-30 07:32:07 +02:00 |
|
Michael Vogel
|
2c7fd1cb3c
|
It should be now valid
|
2016-06-30 01:18:44 +02:00 |
|
Michael Vogel
|
c0669d365b
|
The key_id was added
|
2016-06-30 00:22:42 +02:00 |
|
Michael Vogel
|
2d72e2d932
|
Diaspora: Support for new fetch functionality (replacement for /p/)
|
2016-06-29 22:50:30 +02:00 |
|
|
|
3a5d98507d
|
Merge pull request #2649 from annando/1606-diaspora-sign2
Diaspora: Another Bugfix for the new protocol
|
2016-06-29 21:51:48 +02:00 |
|
Michael Vogel
|
230a645307
|
Diaspora: Another Bugfix for the new protocol
|
2016-06-29 20:37:04 +02:00 |
|
|
|
ee7ca9cf71
|
Merge pull request #2648 from annando/1606-diaspora-signature
Diaspora: Incompatibilities with signature check solved
|
2016-06-29 11:54:13 +02:00 |
|
Michael Vogel
|
152efdaec5
|
Diaspora: Incompatibilities with signature check solved
|
2016-06-29 10:33:43 +02:00 |
|
|
|
e94b133f6d
|
Merge pull request #2647 from rabuzarus/2806_viewcontacts
viewcontacts - fix: tabmenu was not returned
|
2016-06-28 12:41:43 +02:00 |
|
rabuzarus
|
1f50db2b2a
|
viewcontacts - fix: tabmenu was not returned
|
2016-06-28 12:32:09 +02:00 |
|
|
|
895f6d03ce
|
Merge pull request #2644 from rabuzarus/2706_hovercard_tags
hovercard.php - fix tags for hovercard
|
2016-06-27 15:12:45 +02:00 |
|
rabuzarus
|
60b767168a
|
hovercard.php - fix tags for hovercard
|
2016-06-27 11:57:47 +02:00 |
|
Michael Vogel
|
a5030f0b60
|
Merge pull request #2643 from rabuzarus/2606_jot_mobile
frio: restructure jot modal and make jot modal work on mobile
|
2016-06-27 11:34:02 +02:00 |
|
rabuzarus
|
571a4fed99
|
frio: restructure jot modal and make jot modal work on mobile
|
2016-06-27 10:33:20 +02:00 |
|
|
|
f17f0d1b02
|
Merge pull request #2642 from rabuzarus/2606_frio_network_heading
frio: move some more headings to the navbar
|
2016-06-26 16:25:30 +02:00 |
|
rabuzarus
|
75f838c53b
|
frio: move some more headings to the navbar
|
2016-06-26 11:02:12 +02:00 |
|
|
|
be5491e12d
|
Merge pull request #2641 from rabuzarus/2606_frio_jot
frio: fix - jot default was not removed in every case while inserting…
|
2016-06-26 06:45:10 +02:00 |
|
rabuzarus
|
aec885b963
|
frio: fix - jot default was not removed in every case while inserting content
|
2016-06-26 03:49:21 +02:00 |
|
|
|
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 |
|
|
|
6c22cb917a
|
Merge pull request #2639 from rabuzarus/2506_viewcontact_tabs
viewcontacts - make the tabbar available even if hide-friends is active
|
2016-06-25 19:48:35 +02:00 |
|
|
|
ce06b3ae4a
|
Merge pull request #2640 from rabuzarus/2506_micropro
move html from function micropro() to own templates
|
2016-06-25 19:47:23 +02:00 |
|
rabuzarus
|
fd72f36ffe
|
move html from function micropro() to own templates
|
2016-06-25 18:46:47 +02:00 |
|
rabuzarus
|
06959d745e
|
viewcontacts - make the tabbar available even if hide-friends is active
|
2016-06-25 16:20:44 +02:00 |
|
Michael Vogel
|
9f99f37975
|
Merge pull request #2637 from rabuzarus/2506_wallmessage_js
frio: Wallmessage - distinguish between own and foreign host
|
2016-06-25 14:09:44 +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 |
|
rabuzarus
|
9c2446c53c
|
Merge pull request #2635 from annando/1606-probe-diaspora
Support for the case when the guid and public key will vanish from webfinger
|
2016-06-25 13:58:45 +02:00 |
|
Michael Vogel
|
0b1188b7fe
|
Imrpoved avatar handling when storing them/partly use of "micro"
|
2016-06-25 13:56:55 +02:00 |
|
rabuzarus
|
84263ee8de
|
frio: Wallmessage - distinguish between own and foreign host
|
2016-06-25 13:02:53 +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 |
|
