strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9776 commits 2 branches 55 tags 148 MiB
Commit graph

2987 commits

Author SHA1 Message Date
fabrixxm
620455c4de Merge pull request #1641 from tobiasd/20150601-navinfo_hook 
nav_info hook and documentation in en and de
 2015-06-01 14:01:47 +02:00
Tobias Diekershoff
ec7f70e9aa nav_info hook and documentation in en and de 2015-06-01 12:00:00 +02:00
Michael Vogel
2856042824 Send a hubsub notification for every comment 2015-05-31 10:38:00 +02:00
fabrixxm
18e44001e5 Merge pull request #1630 from annando/1505-ostatus 
OStatus communication improvements
 2015-05-31 10:08:24 +02:00
Michael Vogel
d732d9d1a8 OStatus replies should now work even if the thread starter isn't in the mentions. 2015-05-31 00:26:11 +02:00
Michael Vogel
a3118e0a6e Cleaning the code from several tests. 2015-05-30 21:08:24 +02:00
Michael Vogel
4750775752 Cleaning the code. 2015-05-30 21:00:38 +02:00
Michael Vogel
e66489d67f PuSH: Publishing moved to a new process. OStatus comments are now published to all subscribers. 2015-05-30 20:47:53 +02:00
rabuzarus
74267310d6 html to section_title.tpl 2015-05-30 02:21:30 +02:00
Michael Vogel
594f3e2815 Merge remote-tracking branch 'upstream/develop' into 1505-ostatus 2015-05-29 10:55:07 +02:00
Michael Vogel
b763c810fb OStatus: Trying to deliver a comment to all contacts - not only the thread owner. (Not working by now) 2015-05-29 10:35:13 +02:00
fabrixxm
f12430a285 Merge pull request #1617 from annando/1505-diaspora-objecttype 
OStatus and Diaspora improvements
 2015-05-29 08:40:58 +02:00
Michael Vogel
487d57df45 Fetch the author url and not the id. 2015-05-28 08:02:34 +02:00
Michael Vogel
24962f3002 OStatus completion: The id and the plink for fetched items should now have reliable values. 2015-05-28 07:51:12 +02:00
fabrixxm
b3992e1c65 Merge pull request #1599 from fabrixxm/issue-1574 
Issue #1574
 2015-05-27 11:07:30 +02:00
Michael Vogel
bdd5c05668 OStatus: Don't be confused by posts from the statusnet connector. 2015-05-27 08:16:05 +02:00
Michael Vogel
03214254ff OStatus: Improved duplicate check. 2015-05-26 23:33:38 +02:00
Michael Vogel
7e401ca199 Improved check for duplicates. Improvements with reshared Diaspora items. 2015-05-25 19:07:59 +02:00
Michael Vogel
0c752a2190 Diaspora: Store the original XML and the object type. 2015-05-25 13:27:45 +02:00
rabuzarus
b3054ee9d0 template for searchbox 2015-05-24 20:01:08 +02:00
fabrixxm
b29b01fad4 Merge branch 'develop' into issue-1574 2015-05-24 10:26:21 +02:00
fabrixxm
4554526515 Merge pull request #1570 from rabuzarus/archive-widget 
port of red matrix archive widget
 2015-05-24 10:18:10 +02:00
fabrixxm
3a71978b0d Merge pull request #1598 from rabuzarus/datepicker 
new datetimepicker for event creation
 2015-05-24 10:16:29 +02:00
fabrixxm
83697cf3e5 Delete attachments on item deletion 
Delete video from videos page
 2015-05-23 22:35:02 +02:00
Michael Vogel
ab67788b4e SQL speed increase for query and search. 2015-05-23 01:23:31 +02:00
rabuzarus
2ad8fdc40b port of red matrix datepicker implementation 2015-05-22 18:53:18 +02:00
fabrixxm
51f8427333 Merge pull request #1585 from annando/issue-1572 
Contact requests to a "FREELOVE" account resulted in "read only" contacts
 2015-05-21 08:40:37 +02:00
Michael Vogel
1c8b9b73f7 Issue 1572: Contact requests to a "FREELOVE" account resulted in "read only" contacts 2015-05-20 21:35:57 +02:00
rabuzarus
30348a1bc0 port of red matrix archive-widget 2015-05-19 01:03:08 +02:00
fabrixxm
996224a8a4 Merge pull request #1567 from fabrixxm/feature/map 
Fix stupid typo in include/event.php
 2015-05-18 10:08:30 +02:00
fabrixxm
fc54ee2928 Fix stupid typo in include/event.php 
That leads to blank events page
 2015-05-18 09:54:43 +02:00
Michael Vogel
2038e65a57 Bugfix: The function "z_fetch_url" created warnings under certain circumstances. 2015-05-16 22:38:41 +02:00
Tobias Diekershoff
72e3ffbb4d Merge pull request #1563 from annando/1505-no-intelligent-shortening 
Disable intelligent shortening - issue 1540
 2015-05-16 12:04:28 +02:00
fabrixxm
19ee5797fa add map to events 2015-05-15 21:10:43 +02:00
Michael Vogel
d995fc3994 The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled. 2015-05-15 20:56:05 +02:00
fabrixxm
6258a21434 map bbcode tag from Red 2015-05-15 20:41:10 +02:00
Tobias Diekershoff
2dd8db7de8 Merge pull request #1554 from FlxAlbroscheit/develop-1 
Issue #1504: Creating groups directly from the sidebar in contacts-page
 2015-05-13 19:59:58 +02:00
FlxAlbroscheit
57c47a8e36 Add a group with one click 2015-05-12 14:04:42 +02:00
Tobias Diekershoff
a138d5d8c0 Merge pull request #1549 from annando/1505-diaspora-fetch-missing 
Fetch missing Diaspora posts
 2015-05-12 07:14:16 +02:00
Michael Vogel
33e572409d There was no check for duplicated GUIDs, so doubled posts could occur. 2015-05-10 20:43:41 +02:00
Michael Vogel
5d1bd96076 Set the login date for every identity of the user. 2015-05-09 23:47:45 +02:00
Michael Vogel
9d257df700 Fetch missing Diaspora posts 2015-05-09 19:39:47 +02:00
Michael Vogel
b2ecf805ea Missing $ 2015-05-03 22:40:20 +02:00
Michael Vogel
faeae280c7 Bugfix: There should be no problems anymore with empty Diaspora reshares. 2015-05-03 22:15:26 +02:00
Michael Vogel
d4a172c142 Bugfix: Shadow copy. Improvement: Fetching of missing items for pictures 2015-05-03 21:25:03 +02:00
Tobias Diekershoff
a37f31b82f Merge pull request #1545 from annando/1503-load-issues 
Value for maximum load until the frontend quits service
 2015-05-03 09:15:54 +02:00
Michael Vogel
0812b7a7ac Merge remote-tracking branch 'upstream/develop' into 1503-load-issues 2015-05-02 21:47:34 +02:00
Michael Vogel
439aee0a82 Automatically resize iframe if no height was provided. 2015-05-01 14:29:53 +02:00
Michael Vogel
747607fe97 Merge remote-tracking branch 'upstream/develop' into 1505-oembed-bbcode 2015-05-01 11:06:39 +02:00
Michael Vogel
be96b1eaa4 rich content in oembed now replaces the content in attachments 2015-05-01 10:42:43 +02:00