clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 0fb08e3642 nav: pass $baseurl to template Fabrixxm 2012-06-29 05:29:29 -04:00
  • be658788de maintain page position when hovering on pop-outs friendica 2012-06-28 22:19:12 -07:00
  • 7b63e5792a more pager limits friendica 2012-06-28 21:39:02 -07:00
  • 43036bee98 wrong column name (- vs _) friendica 2012-06-28 21:32:49 -07:00
  • 0ecba60503 undefined fn friendica 2012-06-28 21:15:43 -07:00
  • 1830ecc9ba remote_self feeds are not private friendica 2012-06-28 18:52:49 -07:00
  • a3edbf7e5d create third privacy state - public post but not searchable or publicly visible friendica 2012-06-28 17:43:29 -07:00
  • 43d3721fa9 css smiley class friendica 2012-06-28 16:42:40 -07:00
  • d7f35c81db Merge https://github.com/friendica/friendica into pull friendica 2012-06-28 16:05:28 -07:00
  • de93c61e0d remove titles in ostatus even when edited date differs from created date friendica 2012-06-28 16:04:00 -07:00
  • 3bd0975c07 Merge pull request #367 from simonlnu/master Simon 2012-06-28 09:16:53 -07:00
  • ecf9ad9a08 fix item-delete-selected* css Simon L'nu 2012-06-28 12:15:32 -04:00
  • 4ae5589df7 Merge remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-06-28 12:12:43 -04:00
  • 26156e1dc4 Merge pull request #366 from fermionic/fix-big-monster-list-logic fermionic 2012-06-27 20:24:18 -07:00
  • cd9ce0ecb3 fix logic for nested lists--should be OR, not AND Zach Prezkuta 2012-06-27 21:21:26 -06:00
  • 4f488c7e3c Merge remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-06-27 13:11:22 -04:00
  • 3968e71d4c Friendicaland - couple of new 'countries' Thomas Willingham 2012-06-27 16:06:02 +01:00
  • 04397865f9 Merge pull request #365 from ridcully/master friendica 2012-06-27 01:36:03 -07:00
  • eb3bbd9081 insidious little parsing bug friendica 2012-06-26 22:32:07 -07:00
  • f995a11641 have no idea why the if/endif macro block was getting printed and not processed. friendica 2012-06-26 21:35:03 -07:00
  • fa2a8fa9bd highlight js events-reminder on birthday events friendica 2012-06-27 13:49:35 +10:00
  • 5b35a02d26 Merge remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-06-26 22:31:15 -04:00
  • b02c733967 service class restrict the email connector friendica 2012-06-26 18:30:20 -07:00
  • 587b081a38 moved api direct message formating to own function. added same formating to direct reply message, when posting a new message. Sebastian Egbers 2012-06-26 08:54:01 +02:00
  • 0f0fb2e2f3 Merge branch 'master' of https://github.com/friendica/friendica Sebastian Egbers 2012-06-26 08:33:41 +02:00
  • a4b407eb54 stray s friendica 2012-06-25 22:01:32 -07:00
  • d32d0e2154 typos friendica 2012-06-25 21:39:07 -07:00
  • 78ede4744f add event titles to discovered birthday events friendica 2012-06-25 21:37:38 -07:00
  • 0f0ffce1b6 change required doco friendica 2012-06-25 21:27:34 -07:00
  • 359a98cd22 change event behaviour so that title is required but description is not friendica 2012-06-25 21:20:08 -07:00
  • fbaca4b742 event summary/title friendica 2012-06-25 20:55:27 -07:00
  • 53f0aee82d Merge https://github.com/friendica/friendica into pull friendica 2012-06-25 18:16:55 -07:00
  • f1991a5952 propagate remote deletes friendica 2012-06-25 18:15:56 -07:00
  • 32f5d4e04a Merge pull request #364 from fermionic/diaspora-refactor-and-better-disabling fermionic 2012-06-25 18:09:39 -07:00
  • 28526dbf21 remove possibly unnecessary checks for likes or comments created by Diaspora users Zach Prezkuta 2012-06-23 12:40:53 -06:00
  • 9e8573507e store signature info for remote users too Zach Prezkuta 2012-06-23 12:09:01 -06:00
  • f495ba2bcb was passing the wrong arguments to the signature storage function Zach Prezkuta 2012-06-16 11:29:56 -06:00
  • 5773241537 add some debug logging Zach Prezkuta 2012-06-12 19:05:01 -06:00
  • c0c50ece0f revert extra Diaspora disabling changes to try to eliminate Mustard double-posting Zach Prezkuta 2012-06-12 18:38:24 -06:00
  • 8bb7ab88fb Clean up the Diaspora connectivity: Zach Prezkuta 2012-06-09 18:39:21 -06:00
  • f0b41709eb improve remote delete forwarding friendica 2012-06-25 17:45:33 -07:00
  • fad2679c7e Merge https://github.com/friendica/friendica into pull friendica 2012-06-25 16:05:42 -07:00
  • b044cd922d typos in bbcode, add service class restrictions to jot uploads friendica 2012-06-25 16:03:46 -07:00
  • c291581e13 Merge pull request #363 from simonlnu/master Simon 2012-06-25 15:50:35 -07:00
  • f04647ca4b Merge remote-tracking branch 'remotes/upstream/master' Simon L'nu 2012-06-25 18:49:46 -04:00
  • 939ebe16f8 fix typo and syntax error Simon L'nu 2012-06-25 18:49:36 -04:00
  • 33b7cd32a6 Merge pull request #362 from simonlnu/master Simon 2012-06-25 15:43:02 -07:00
  • eb6bf7e7fa fix margin of wall-item-body Simon L'nu 2012-06-25 18:42:18 -04:00
  • 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