clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,807 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

6807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fabrixxm 34f01ece9f blog theme: more on header/nav 2012-06-21 15:37:03 +02: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
friendica 53c9ea7606 show last.fm source in username 2012-06-20 23:04:55 -07:00
friendica 91a3a2d551 follow last.fm scrobbles 2012-06-20 22:59:01 -07:00
friendica 788a6626ef Merge https://github.com/friendica/friendica into pull 2012-06-20 21:11:00 -07:00
friendica 0a302e100d try and eliminate the openssl warnings for forums trying to talk back to fans 2012-06-20 21:09:52 -07:00
friendica a64d0ac905 Merge pull request #346 from fermionic/add-rotate-ccw-option 
allow rotation to be either CW or CCW
 2012-06-20 20:34:41 -07:00
fermionic ec83a62f70 Merge pull request #347 from fermionic/diaspora-more-signature-refinements 
create new signed text for relayables right when relaying them
 2012-06-20 20:02:07 -07:00
Zach Prezkuta 73c6f40ebc create new signed text for relayables right when relaying them 2012-06-20 20:52:09 -06:00
Zach Prezkuta 54c76ca822 allow rotation either CW or CCW 2012-06-20 20:51:03 -06:00
Thomas Willingham 75e82dc077 Darkzero-NS fix weeks old BBIcon error 2012-06-21 03:14:41 +01:00
Thomas Willingham c4df339b92 Darkzero/NS - make the archives font the same colour as the other widgets. 2012-06-21 02:42:38 +01:00
friendica bf0ab10caf undefined unmark_for_death 2012-06-20 16:35:49 -07:00
friendica f4e434cd46 sort out contact search oddities 2012-06-20 16:20:55 -07:00
friendica 03c05d8a28 missing paren 2012-06-20 16:07:41 -07:00
friendica 0f0e5be549 contact search oddities 2012-06-20 16:05:46 -07:00
friendica 0d0f129d04 Merge https://github.com/friendica/friendica into pull 2012-06-20 05:06:20 -07:00
friendica f0db196288 iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources 2012-06-20 05:04:51 -07:00
Simon 3a8c1a4371 Merge pull request #345 from simonlnu/master 
theme tweaks
 2012-06-20 02:07:16 -07:00
Simon L'nu 0be715d271 icon change; tweak button in toolbar; move site-location 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-20 05:04:04 -04:00
friendica 961c633773 Merge pull request #344 from ridcully/master 
exclude_replies for twitter api
 2012-06-20 01:01:55 -07:00
friendica b3bf48782f allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed. 2012-06-19 20:59:22 -07:00
friendica 1dd33770ed plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook 2012-06-19 18:26:40 -07:00
friendica 01aa953951 rework fallback themes, glob pattern was wrong 2012-06-19 16:22:38 -07:00
friendica 6e06d415bb Merge https://github.com/friendica/friendica into pull 2012-06-19 16:08:38 -07:00
Zvi ben Yaakov (a.k.a rdc) 4977ef4142 Added App::get_cached_avater_image usage in profile_sidebar function for creating the $diaspora array that is used to populate diaspora_vcard.tpl. This allows the correct profile image revision to be used when dfrn_request friend requests are made. 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc) ff2f7dfeef Added App::get_cached_avatar_image usage on conversation wall of Normal View 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc) a801888b15 Now using App::get_cached_avatar_image for /photos page 2012-06-19 16:05:39 -07:00