fermionic
|
32f5d4e04a
|
Merge pull request #364 from fermionic/diaspora-refactor-and-better-disabling
Diaspora refactor and better disabling
|
2012-06-25 18:09:39 -07:00 |
|
Zach Prezkuta
|
28526dbf21
|
remove possibly unnecessary checks for likes or comments created by Diaspora users
|
2012-06-25 19:03:03 -06:00 |
|
Zach Prezkuta
|
9e8573507e
|
store signature info for remote users too
|
2012-06-25 19:03:03 -06:00 |
|
Zach Prezkuta
|
f495ba2bcb
|
was passing the wrong arguments to the signature storage function
|
2012-06-25 19:03:03 -06: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
|
c291581e13
|
Merge pull request #363 from simonlnu/master
fix typo and syntax error in include/bbcode.php
|
2012-06-25 15:50:35 -07:00 |
|
Simon L'nu
|
f04647ca4b
|
Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
|
2012-06-25 18:49:46 -04: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 |
|
Simon
|
33b7cd32a6
|
Merge pull request #362 from simonlnu/master
fix margin of .wall-item-body
|
2012-06-25 15:43:02 -07:00 |
|
Simon L'nu
|
eb6bf7e7fa
|
fix margin of wall-item-body
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-06-25 18:42:18 -04:00 |
|
friendica
|
89ad19ce01
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-25 15:34:57 -07:00 |
|
friendica
|
eebb2d2120
|
rev update
|
2012-06-25 15:34:23 -07:00 |
|
Simon
|
d944ff7833
|
Merge pull request #361 from simonlnu/master
cleaned up the css a bit
|
2012-06-25 14:25:33 -07: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 |
|
friendica
|
cb1d35fb09
|
Merge pull request #359 from fermionic/mustard-prevent-comment-doubles
fix check for parent of StatusNet API post
|
2012-06-25 14:19:48 -07:00 |
|
friendica
|
d0e14809fd
|
Merge pull request #358 from rdc/master
Added App::get_cached_avatar_image usage for displaying "Last users" avatar thumbs in right sidebar
|
2012-06-25 14:17:23 -07:00 |
|
Simon L'nu
|
2ed3af55a8
|
fix delete thingy, and minor clean up
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-06-25 17:17:06 -04: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 |
|
Zvi ben Yaakov (a.k.a rdc)
|
51ef8fb7ff
|
Added App::get_cached_avatar_image usage for displaying "Last users"
avatar thumbs in right sidebar
|
2012-06-25 14:01:16 +03:00 |
|
Zvi ben Yaakov (a.k.a rdc)
|
94f895e98d
|
Merge git://github.com/friendica/friendica
|
2012-06-25 13:59:53 +03: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
|
9528beac34
|
sidebar photo album list not visible to anybody if user['hidewall'] set
|
2012-06-24 16:51:39 -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 |
|
fermionic
|
38b8317726
|
Merge pull request #355 from fermionic/missing-urls-after-strip_tags-in-bb2diaspora
allow bare URLS to make it through to Diaspora
|
2012-06-23 21:08:19 -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 |
|
fermionic
|
098c74a12a
|
Merge pull request #354 from fermionic/always-terminate-bbcode-list-elements
Fix Diaspora list formatting
|
2012-06-23 19:08:32 -07: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 |
|
Zvi ben Yaakov (a.k.a rdc)
|
00668aaa71
|
Merge git://github.com/friendica/friendica
|
2012-06-23 23:51:08 +03:00 |
|
Max Weller
|
11b6beae06
|
make it selectable
|
2012-06-23 22:39:11 +02:00 |
|