friendica
|
53f0aee82d
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-25 18:16:55 -07:00 |
|
friendica
|
f1991a5952
|
propagate remote deletes
|
2012-06-25 18:15:56 -07:00 |
|
Zach Prezkuta
|
5773241537
|
add some debug logging
|
2012-06-25 19:03:03 -06:00 |
|
Zach Prezkuta
|
c0c50ece0f
|
revert extra Diaspora disabling changes to try to eliminate Mustard double-posting
|
2012-06-25 19:03:03 -06:00 |
|
Zach Prezkuta
|
8bb7ab88fb
|
Clean up the Diaspora connectivity:
- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled
|
2012-06-25 19:03:03 -06:00 |
|
friendica
|
f0b41709eb
|
improve remote delete forwarding
|
2012-06-25 17:45:33 -07:00 |
|
friendica
|
fad2679c7e
|
Merge https://github.com/friendica/friendica into pull
Conflicts:
include/bbcode.php
|
2012-06-25 16:05:42 -07:00 |
|
friendica
|
b044cd922d
|
typos in bbcode, add service class restrictions to jot uploads
|
2012-06-25 16:03:46 -07:00 |
|
Simon L'nu
|
939ebe16f8
|
fix typo and syntax error
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-06-25 18:49:36 -04:00 |
|
friendica
|
cb450d3365
|
Merge pull request #360 from fermionic/more-nested-lists
allow nested [ol] and [ul] lists too
|
2012-06-25 14:20:16 -07:00 |
|
Zach Prezkuta
|
fa7e803f73
|
fix check for parent of StatusNet API post
|
2012-06-25 08:26:12 -06:00 |
|
Zach Prezkuta
|
4293de7554
|
allow nested [ol] and [ul] lists too
|
2012-06-25 08:26:00 -06:00 |
|
friendica
|
7ea5917bf7
|
more service class functionality
|
2012-06-25 03:25:06 -07:00 |
|
friendica
|
35a098e0dc
|
service limits for photo uploads
|
2012-06-25 01:37:44 -07:00 |
|
friendica
|
ad6c82bdea
|
implement "follow" service limits
|
2012-06-24 22:23:17 -07:00 |
|
friendica
|
c464bc494c
|
add like/dislike to profiles
|
2012-06-24 21:16:55 -07:00 |
|
friendica
|
7f3813e9b0
|
service class basics
|
2012-06-24 00:56:27 -07:00 |
|
fermionic
|
49ecf58163
|
Merge pull request #357 from fermionic/fix-relayable-signature-handle
ok now I'm just making silly mistakes--take out premature function locki...
|
2012-06-23 21:29:52 -07:00 |
|
Zach Prezkuta
|
59ebe6f111
|
ok now I'm just making silly mistakes--take out premature function locking code
|
2012-06-23 22:28:28 -06:00 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Max Weller
|
6fe8a13b64
|
Added ORDER BY clause for conversation view
|
2012-06-21 12:55:03 +02: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 |
|
Zach Prezkuta
|
73c6f40ebc
|
create new signed text for relayables right when relaying them
|
2012-06-20 20:52:09 -06:00 |
|
friendica
|
bf0ab10caf
|
undefined unmark_for_death
|
2012-06-20 16:35:49 -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 |
|
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 |
|