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 |
|
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 |
|
|
Zvi ben Yaakov (a.k.a rdc)
|
00668aaa71
|
Merge git://github.com/friendica/friendica
|
2012-06-23 23:51:08 +03:00 |
|
|
Simon
|
381d091267
|
Merge pull request #352 from fermionic/diaspora-display-scaled-down-image
allow linking to Diaspora's scaled-down images
|
2012-06-23 10:37:59 -07:00 |
|
|
Simon
|
f6b7b99d16
|
Merge pull request #353 from simonlnu/master
jquery update; templates
|
2012-06-23 10:36:52 -07:00 |
|
|
Simon L'nu
|
3b1d9d9695
|
update jquery to 1.7.2; fix some dispy templates to be more in sync with view/
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-06-23 13:33:58 -04: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
|
b97c406c82
|
Merge pull request #351 from annando/master
Massive change in bbcode2markdown
|
2012-06-23 05:11:31 -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 |
|
|
friendica
|
bf47bf5ba0
|
cleanup mod/share
|
2012-06-23 03:25:11 -07:00 |
|
|
fermionic
|
9a43c3689f
|
Merge pull request #350 from fermionic/improve-bb2diaspora-conversions
Improve bb2diaspora conversions
|
2012-06-22 19:50:44 -07: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 |
|
|
friendica
|
4e7eb36dd1
|
Merge https://github.com/friendica/friendica into pull
|
2012-06-22 15:27:54 -07:00 |
|
|
friendica
|
181a17bd05
|
share RSS items
|
2012-06-22 15:27:06 -07:00 |
|