Commit Graph

  • 89ad19ce01 Merge https://github.com/friendica/friendica into pull friendica 2012-06-25 15:34:57 -07:00
  • eebb2d2120 rev update friendica 2012-06-25 15:34:23 -07:00
  • d944ff7833 Merge pull request #361 from simonlnu/master Simon 2012-06-25 14:25:33 -07:00
  • cb450d3365 Merge pull request #360 from fermionic/more-nested-lists friendica 2012-06-25 14:20:16 -07:00
  • cb1d35fb09 Merge pull request #359 from fermionic/mustard-prevent-comment-doubles friendica 2012-06-25 14:19:48 -07:00
  • d0e14809fd Merge pull request #358 from rdc/master friendica 2012-06-25 14:17:23 -07:00
  • 2ed3af55a8 fix delete thingy, and minor clean up Simon L'nu 2012-06-25 17:17:06 -04:00
  • fa7e803f73 fix check for parent of StatusNet API post Zach Prezkuta 2012-06-16 21:41:23 -06:00
  • 4293de7554 allow nested [ol] and [ul] lists too Zach Prezkuta 2012-06-24 09:37:31 -06:00
  • 8c251aebc7 fixed direct message reply in api call. Sebastian Egbers 2012-06-25 16:25:34 +02:00
  • af1d4bb632 modified api message reply to set title to conversion title, when replying. Sebastian Egbers 2012-06-25 15:53:56 +02:00
  • 020deedd7c Merge branch 'master' of https://github.com/friendica/friendica Sebastian Egbers 2012-06-25 13:59:39 +02:00
  • 51ef8fb7ff Added App::get_cached_avatar_image usage for displaying "Last users" avatar thumbs in right sidebar Zvi ben Yaakov (a.k.a rdc) 2012-06-25 14:01:16 +03:00
  • 94f895e98d Merge git://github.com/friendica/friendica Zvi ben Yaakov (a.k.a rdc) 2012-06-25 13:59:53 +03:00
  • 7ea5917bf7 more service class functionality friendica 2012-06-25 03:25:06 -07:00
  • 35a098e0dc service limits for photo uploads friendica 2012-06-25 01:37:44 -07:00
  • ad6c82bdea implement "follow" service limits friendica 2012-06-24 22:23:17 -07:00
  • c464bc494c add like/dislike to profiles friendica 2012-06-24 21:16:55 -07:00
  • 9528beac34 sidebar photo album list not visible to anybody if user['hidewall'] set friendica 2012-06-24 16:51:39 -07:00
  • 7f3813e9b0 service class basics friendica 2012-06-24 00:56:27 -07:00
  • 49ecf58163 Merge pull request #357 from fermionic/fix-relayable-signature-handle fermionic 2012-06-23 21:29:52 -07:00
  • 59ebe6f111 ok now I'm just making silly mistakes--take out premature function locking code Zach Prezkuta 2012-06-23 22:28:28 -06:00
  • 92a997365f Merge https://github.com/friendica/friendica into pull friendica 2012-06-23 21:11:41 -07:00
  • 1574396d04 sort out some "like" issues friendica 2012-06-23 21:11:18 -07:00
  • 642880f89a Merge pull request #356 from fermionic/fix-relayable-signature-handle fermionic 2012-06-23 21:08:43 -07:00
  • 38b8317726 Merge pull request #355 from fermionic/missing-urls-after-strip_tags-in-bb2diaspora fermionic 2012-06-23 21:08:19 -07:00
  • 0877c5b687 use author handle instead of sender handle Zach Prezkuta 2012-06-23 22:04:20 -06:00
  • 5d2eed3517 allow bare URLS to make it through to Diaspora Zach Prezkuta 2012-06-23 22:02:08 -06:00
  • 098c74a12a Merge pull request #354 from fermionic/always-terminate-bbcode-list-elements fermionic 2012-06-23 19:08:32 -07:00
  • 1f96839674 small optimization Zach Prezkuta 2012-06-23 20:01:29 -06:00
  • 4ef33ac6eb fix BB-to-Diaspora list formatting Zach Prezkuta 2012-06-23 19:57:59 -06:00
  • cbf1cab0da Merge remote-tracking branch 'sebastian/master' Max Weller 2012-06-23 22:59:03 +02:00
  • e3c36dfd1d add reliable way to get server version Max Weller 2012-06-23 22:52:50 +02:00
  • 00668aaa71 Merge git://github.com/friendica/friendica Zvi ben Yaakov (a.k.a rdc) 2012-06-23 23:51:08 +03:00
  • 11b6beae06 make it selectable Max Weller 2012-06-23 22:39:11 +02:00
  • 111ace5abd I want HTML code! Max Weller 2012-06-23 22:35:43 +02:00
  • 9d462c6b6a new param getUserObjects to avoid retransmitting the whole user info objects Max Weller 2012-06-23 19:38:15 +02:00
  • 381d091267 Merge pull request #352 from fermionic/diaspora-display-scaled-down-image Simon 2012-06-23 10:37:59 -07:00
  • f6b7b99d16 Merge pull request #353 from simonlnu/master Simon 2012-06-23 10:36:52 -07:00
  • 2c992c5969 bugfix Max Weller 2012-06-23 19:35:01 +02:00
  • 3b1d9d9695 update jquery to 1.7.2; fix some dispy templates to be more in sync with view/ Simon L'nu 2012-06-23 13:33:58 -04:00
  • f45c881815 changes on api_direct_messages_box to allow to retrieve conversations and all messages Max Weller 2012-06-23 19:29:58 +02:00
  • d8a376666c modified direct_messages Max Weller 2012-06-23 19:21:48 +02:00
  • 90f8454190 allow linking to Diaspora's scaled-down images Zach Prezkuta 2012-06-19 20:45:24 -06:00
  • 7a346bc756 this is going to take some more debug before it can be roller out friendica 2012-06-23 07:43:56 -07:00
  • 63141c73d8 debugging friendica 2012-06-23 07:26:45 -07:00
  • a132eda2cf cokmment likes not propagating friendica 2012-06-23 06:41:37 -07:00
  • 1ba0d73a9a make feeds work with comment likes/dislikes friendica 2012-06-23 06:13:11 -07:00
  • f55e8e831c typo friendica 2012-06-23 06:04:56 -07:00
  • 49360b0a64 Merge https://github.com/friendica/friendica into pull friendica 2012-06-23 05:47:31 -07:00
  • 22ca358a8c like comments friendica 2012-06-23 05:46:15 -07:00
  • b97c406c82 Merge pull request #351 from annando/master friendica 2012-06-23 05:11:31 -07:00
  • 7614d35cad liking comments backend friendica 2012-06-23 04:44:48 -07:00
  • a81af2e042 Merge remote branch 'upstream/master' Michael Vogel 2012-06-23 12:50:00 +02:00
  • 7a4ad4564d Diaspora: Messages are now looking better Michael Vogel 2012-06-23 12:42:01 +02:00
  • bf47bf5ba0 cleanup mod/share friendica 2012-06-23 03:25:11 -07:00
  • 9a43c3689f Merge pull request #350 from fermionic/improve-bb2diaspora-conversions fermionic 2012-06-22 19:50:44 -07:00
  • 9c9e727042 cleanup lists and more comment signature stuff Zach Prezkuta 2012-06-22 18:38:32 -06:00
  • 7b219649a4 expand support for BB code-to-Diaspora conversion Zach Prezkuta 2012-06-21 21:31:32 -06:00
  • 6e4760dd9c Merge branch 'master' of git://github.com/friendica/friendica Vasudev Kamath 2012-06-23 08:11:35 +05:30
  • 4e7eb36dd1 Merge https://github.com/friendica/friendica into pull friendica 2012-06-22 15:27:54 -07:00
  • 181a17bd05 share RSS items friendica 2012-06-22 15:27:06 -07:00
  • 9953e6dea4 Merge pull request #349 from simonlnu/master Simon 2012-06-22 10:08:25 -07:00
  • 5cfa7dd041 minor tweaks to some tpl files Simon L'nu 2012-06-22 13:07:42 -04:00
  • cd25c3b5dd added replyto and subject to direct messages. Sebastian Egbers 2012-06-22 14:54:31 +02:00
  • c14270ac64 modified conversion to use x function for parameter checking. Sebastian Egbers 2012-06-22 13:35:36 +02:00
  • 99000382cd Merge https://github.com/friendica/friendica into pull friendica 2012-06-22 00:25:46 -07:00
  • eeceecc9ba unterminated sql string friendica 2012-06-22 00:25:01 -07:00
  • 2961e6efaf Merge pull request #348 from max-weller/master friendica 2012-06-21 05:36:55 -07:00
  • 6fe8a13b64 Added ORDER BY clause for conversation view Max Weller 2012-06-21 12:55:03 +02:00
  • 5e3e3915e3 Merge git://github.com/friendica/friendica Zvi ben Yaakov (a.k.a rdc) 2012-06-21 13:38:14 +03:00
  • 0f5a6bfcdb Added statuses/show parameter ?conversation=true Max Weller 2012-06-21 10:53:48 +02:00
  • 53c9ea7606 show last.fm source in username friendica 2012-06-20 23:04:55 -07:00
  • 91a3a2d551 follow last.fm scrobbles friendica 2012-06-20 22:59:01 -07:00
  • 788a6626ef Merge https://github.com/friendica/friendica into pull friendica 2012-06-20 21:11:00 -07:00
  • 0a302e100d try and eliminate the openssl warnings for forums trying to talk back to fans friendica 2012-06-20 21:09:52 -07:00
  • a64d0ac905 Merge pull request #346 from fermionic/add-rotate-ccw-option friendica 2012-06-20 20:34:41 -07:00
  • ec83a62f70 Merge pull request #347 from fermionic/diaspora-more-signature-refinements fermionic 2012-06-20 20:02:07 -07:00
  • 73c6f40ebc create new signed text for relayables right when relaying them Zach Prezkuta 2012-06-16 23:58:22 -06:00
  • 54c76ca822 allow rotation either CW or CCW Zach Prezkuta 2012-06-20 20:36:10 -06:00
  • 75e82dc077 Darkzero-NS fix weeks old BBIcon error Thomas Willingham 2012-06-21 03:14:41 +01:00
  • c4df339b92 Darkzero/NS - make the archives font the same colour as the other widgets. Thomas Willingham 2012-06-21 02:42:38 +01:00
  • bf0ab10caf undefined unmark_for_death friendica 2012-06-20 16:35:49 -07:00
  • f4e434cd46 sort out contact search oddities friendica 2012-06-20 16:20:55 -07:00
  • 03c05d8a28 missing paren friendica 2012-06-20 16:07:41 -07:00
  • 0f0e5be549 contact search oddities friendica 2012-06-20 16:05:46 -07:00
  • 0d0f129d04 Merge https://github.com/friendica/friendica into pull friendica 2012-06-20 05:06:20 -07:00
  • 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 friendica 2012-06-20 05:04:51 -07:00
  • 3a8c1a4371 Merge pull request #345 from simonlnu/master Simon 2012-06-20 02:07:16 -07:00
  • 0be715d271 icon change; tweak button in toolbar; move site-location Simon L'nu 2012-06-20 05:04:04 -04:00
  • 961c633773 Merge pull request #344 from ridcully/master friendica 2012-06-20 01:01:55 -07:00
  • b3bf48782f allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed. friendica 2012-06-19 20:59:22 -07:00
  • 1dd33770ed plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook friendica 2012-06-19 18:26:40 -07:00
  • 01aa953951 rework fallback themes, glob pattern was wrong friendica 2012-06-19 16:22:38 -07:00
  • 6e06d415bb Merge https://github.com/friendica/friendica into pull friendica 2012-06-19 16:08:38 -07:00
  • 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. Zvi ben Yaakov (a.k.a rdc) 2012-06-19 22:24:31 +03:00
  • ff2f7dfeef Added App::get_cached_avatar_image usage on conversation wall of Normal View Zvi ben Yaakov (a.k.a rdc) 2012-06-19 21:40:14 +03:00
  • a801888b15 Now using App::get_cached_avatar_image for /photos page Zvi ben Yaakov (a.k.a rdc) 2012-06-18 22:41:43 +03:00
  • d4f4ed730c Now using App::get_cached_avatar_image for /profile/{nickname} page Zvi ben Yaakov (a.k.a rdc) 2012-06-18 22:18:43 +03:00
  • 6df74b8cd9 Now using App::get_cached_avatar_image for navigation bar Zvi ben Yaakov (a.k.a rdc) 2012-06-18 22:09:00 +03:00