Sebastian Egbers
|
0f0fb2e2f3
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2012-06-26 08:33:41 +02:00 |
|
friendica
|
a4b407eb54
|
stray s
|
2012-06-25 22:01:32 -07:00 |
|
friendica
|
d32d0e2154
|
typos
|
2012-06-25 21:39:07 -07:00 |
|
friendica
|
78ede4744f
|
add event titles to discovered birthday events
|
2012-06-25 21:37:38 -07:00 |
|
friendica
|
0f0ffce1b6
|
change required doco
|
2012-06-25 21:27:34 -07:00 |
|
friendica
|
359a98cd22
|
change event behaviour so that title is required but description is not
|
2012-06-25 21:20:08 -07:00 |
|
friendica
|
fbaca4b742
|
event summary/title
|
2012-06-25 20:55:27 -07:00 |
|
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 |
|
Sebastian Egbers
|
8c251aebc7
|
fixed direct message reply in api call.
|
2012-06-25 16:25:34 +02:00 |
|
Sebastian Egbers
|
af1d4bb632
|
modified api message reply to set title to conversion title, when replying.
|
2012-06-25 15:53:56 +02:00 |
|
Sebastian Egbers
|
020deedd7c
|
Merge branch 'master' of https://github.com/friendica/friendica
|
2012-06-25 13:59:39 +02: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 |
|
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 |
|
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 |
|
Max Weller
|
2c992c5969
|
bugfix
|
2012-06-23 19:35:01 +02: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 |
|