Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 11:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
6531 commits 3 branches 64 tags 246 MiB
Commit graph

6531 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica
92a997365f Merge https://github.com/friendica/friendica into pull 2012-06-23 21:11:41 -07:00
friendica
1574396d04 sort out some "like" issues 2012-06-23 21:11:18 -07:00
fermionic
642880f89a Merge pull request #356 from fermionic/fix-relayable-signature-handle 
use author handle instead of sender handle
 2012-06-23 21:08:43 -07:00
fermionic
38b8317726 Merge pull request #355 from fermionic/missing-urls-after-strip_tags-in-bb2diaspora 
allow bare URLS to make it through to Diaspora
 2012-06-23 21:08:19 -07:00
Zach Prezkuta
0877c5b687 use author handle instead of sender handle 2012-06-23 22:04:20 -06:00
Zach Prezkuta
5d2eed3517 allow bare URLS to make it through to Diaspora 2012-06-23 22:02:08 -06:00
fermionic
098c74a12a Merge pull request #354 from fermionic/always-terminate-bbcode-list-elements 
Fix Diaspora list formatting
 2012-06-23 19:08:32 -07:00
Zach Prezkuta
1f96839674 small optimization 2012-06-23 20:01:29 -06:00
Zach Prezkuta
4ef33ac6eb fix BB-to-Diaspora list formatting 2012-06-23 19:57:59 -06:00
Max Weller
cbf1cab0da Merge remote-tracking branch 'sebastian/master' 2012-06-23 22:59:03 +02:00
Max Weller
e3c36dfd1d add reliable way to get server version 2012-06-23 22:52:50 +02:00
Zvi ben Yaakov (a.k.a rdc)
00668aaa71 Merge git://github.com/friendica/friendica 2012-06-23 23:51:08 +03:00
Max Weller
11b6beae06 make it selectable 2012-06-23 22:39:11 +02:00
Max Weller
111ace5abd I want HTML code! 2012-06-23 22:35:43 +02:00
Max Weller
9d462c6b6a new param getUserObjects to avoid retransmitting the whole user info objects 2012-06-23 19:38:15 +02:00
Simon
381d091267 Merge pull request #352 from fermionic/diaspora-display-scaled-down-image 
allow linking to Diaspora's scaled-down images
 2012-06-23 10:37:59 -07:00
Simon
f6b7b99d16 Merge pull request #353 from simonlnu/master 
jquery update; templates
 2012-06-23 10:36:52 -07:00
Max Weller
2c992c5969 bugfix 2012-06-23 19:35:01 +02:00
Simon L'nu
3b1d9d9695 update jquery to 1.7.2; fix some dispy templates to be more in sync with view/ 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-23 13:33:58 -04:00
Max Weller
f45c881815 changes on api_direct_messages_box to allow to retrieve conversations and all messages 2012-06-23 19:29:58 +02:00
Max Weller
d8a376666c modified direct_messages 2012-06-23 19:21:48 +02:00
Zach Prezkuta
90f8454190 allow linking to Diaspora's scaled-down images 2012-06-23 11:02:15 -06:00
friendica
7a346bc756 this is going to take some more debug before it can be roller out 2012-06-23 07:43:56 -07:00
friendica
63141c73d8 debugging 2012-06-23 07:26:45 -07:00
friendica
a132eda2cf cokmment likes not propagating 2012-06-23 06:41:37 -07:00
friendica
1ba0d73a9a make feeds work with comment likes/dislikes 2012-06-23 06:13:11 -07:00
friendica
f55e8e831c typo 2012-06-23 06:04:56 -07:00
friendica
49360b0a64 Merge https://github.com/friendica/friendica into pull 2012-06-23 05:47:31 -07:00
friendica
22ca358a8c like comments 2012-06-23 05:46:15 -07:00
friendica
b97c406c82 Merge pull request #351 from annando/master 
Massive change in bbcode2markdown
 2012-06-23 05:11:31 -07:00
friendica
7614d35cad liking comments backend 2012-06-23 04:44:48 -07:00
Michael Vogel
a81af2e042 Merge remote branch 'upstream/master' 
Conflicts:
	include/bb2diaspora.php
 2012-06-23 12:50:00 +02:00
Michael Vogel
7a4ad4564d Diaspora: Messages are now looking better 2012-06-23 12:42:01 +02:00
friendica
bf47bf5ba0 cleanup mod/share 2012-06-23 03:25:11 -07:00
fermionic
9a43c3689f Merge pull request #350 from fermionic/improve-bb2diaspora-conversions 
Improve bb2diaspora conversions
 2012-06-22 19:50:44 -07:00
Zach Prezkuta
9c9e727042 cleanup lists and more comment signature stuff 2012-06-22 20:45:37 -06:00
Zach Prezkuta
7b219649a4 expand support for BB code-to-Diaspora conversion 2012-06-22 20:45:37 -06:00
Vasudev Kamath
6e4760dd9c Merge branch 'master' of git://github.com/friendica/friendica 2012-06-23 08:11:35 +05:30
friendica
4e7eb36dd1 Merge https://github.com/friendica/friendica into pull 2012-06-22 15:27:54 -07:00
friendica
181a17bd05 share RSS items 2012-06-22 15:27:06 -07:00
Simon
9953e6dea4 Merge pull request #349 from simonlnu/master 
minor template tweaks
 2012-06-22 10:08:25 -07:00
Simon L'nu
5cfa7dd041 minor tweaks to some tpl files 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-22 13:07:42 -04:00
Sebastian Egbers
cd25c3b5dd added replyto and subject to direct messages. 2012-06-22 14:54:31 +02:00
Sebastian Egbers
c14270ac64 modified conversion to use x function for parameter checking. 2012-06-22 13:35:36 +02:00
friendica
99000382cd Merge https://github.com/friendica/friendica into pull 2012-06-22 00:25:46 -07:00
friendica
eeceecc9ba unterminated sql string 2012-06-22 00:25:01 -07:00
friendica
2961e6efaf Merge pull request #348 from max-weller/master 
List statuses by conversation_id
 2012-06-21 05:36:55 -07:00
Max Weller
6fe8a13b64 Added ORDER BY clause for conversation view 2012-06-21 12:55:03 +02:00
Zvi ben Yaakov (a.k.a rdc)
5e3e3915e3 Merge git://github.com/friendica/friendica 2012-06-21 13:38:14 +03:00
Max Weller
0f5a6bfcdb Added statuses/show parameter ?conversation=true 2012-06-21 10:53:48 +02:00