aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #360 from fermionic/more-nested-listsfriendica2012-06-252-10/+13
|\
| * allow nested [ol] and [ul] lists tooZach Prezkuta2012-06-252-10/+13
* | Merge pull request #359 from fermionic/mustard-prevent-comment-doublesfriendica2012-06-253-11/+12
|\ \
| * | fix check for parent of StatusNet API postZach Prezkuta2012-06-253-11/+12
| |/
* | Merge pull request #358 from rdc/masterfriendica2012-06-251-1/+1
|\ \ | |/ |/|
| * Added App::get_cached_avatar_image usage for displaying "Last users"Zvi ben Yaakov (a.k.a rdc)2012-06-251-1/+1
| * Merge git://github.com/friendica/friendicaZvi ben Yaakov (a.k.a rdc)2012-06-2520-179/+472
| |\ | |/ |/|
* | more service class functionalityfriendica2012-06-251-0/+5
* | service limits for photo uploadsfriendica2012-06-254-1/+63
* | implement "follow" service limitsfriendica2012-06-243-2/+51
* | add like/dislike to profilesfriendica2012-06-247-3/+75
* | sidebar photo album list not visible to anybody if user['hidewall'] setfriendica2012-06-243-96/+115
* | service class basicsfriendica2012-06-244-8/+52
* | Merge pull request #357 from fermionic/fix-relayable-signature-handlefermionic2012-06-231-77/+20
|\ \
| * | ok now I'm just making silly mistakes--take out premature function locking codeZach Prezkuta2012-06-231-77/+20
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-232-24/+90
|\ \ \
| * | | Merge pull request #356 from fermionic/fix-relayable-signature-handlefermionic2012-06-231-24/+84
| |\| |
| | * | use author handle instead of sender handleZach Prezkuta2012-06-231-24/+84
| * | | Merge pull request #355 from fermionic/missing-urls-after-strip_tags-in-bb2di...fermionic2012-06-231-0/+6
| |\ \ \ | | |/ / | |/| |
| | * | allow bare URLS to make it through to DiasporaZach Prezkuta2012-06-231-0/+6
| |/ /
* / / sort out some "like" issuesfriendica2012-06-234-78/+73
|/ /
* | Merge pull request #354 from fermionic/always-terminate-bbcode-list-elementsfermionic2012-06-231-3/+41
|\ \
| * | small optimizationZach Prezkuta2012-06-231-5/+3
| * | fix BB-to-Diaspora list formattingZach Prezkuta2012-06-231-3/+43
|/ /
| * Merge git://github.com/friendica/friendicaZvi ben Yaakov (a.k.a rdc)2012-06-2332-217/+3247
| |\ | |/ |/|
* | Merge pull request #352 from fermionic/diaspora-display-scaled-down-imageSimon2012-06-232-4/+17
|\ \
| * | allow linking to Diaspora's scaled-down imagesZach Prezkuta2012-06-232-4/+17
* | | Merge pull request #353 from simonlnu/masterSimon2012-06-239-43/+53
|\ \ \ | |/ / |/| |
| * | update jquery to 1.7.2; fix some dispy templates to be more in sync with view/Simon L'nu2012-06-239-43/+53
|/ /
* | this is going to take some more debug before it can be roller outfriendica2012-06-231-2/+2
* | debuggingfriendica2012-06-231-1/+2
* | cokmment likes not propagatingfriendica2012-06-231-2/+5
* | make feeds work with comment likes/dislikesfriendica2012-06-231-1/+1
* | typofriendica2012-06-231-2/+4
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-2311-34/+2980
|\ \
| * \ Merge pull request #351 from annando/masterfriendica2012-06-2311-34/+2980
| |\ \
| | * \ Merge remote branch 'upstream/master'Michael Vogel2012-06-2340-4763/+5539
| | |\ \ | | |/ / | |/| |
| | * | Diaspora: Messages are now looking betterMichael Vogel2012-06-231-2/+18
| | * | Merge branch 'master' of github.com:annando/friendicaMichael2012-06-1811-35/+2963
| | |\ \
| | | * | New option in the bbcode parser to disable oembed.Michael Vogel2012-06-182-26/+35
| | | * | New function to convert bbcode to markdown.Michael Vogel2012-06-1710-19/+2939
| | * | | OEmbed: Don't output the width of imagesMichael2012-06-181-1/+2
* | | | | like commentsfriendica2012-06-232-3/+4
* | | | | liking comments backendfriendica2012-06-234-12/+20
|/ / / /
* | | | cleanup mod/sharefriendica2012-06-231-14/+11
* | | | Merge pull request #350 from fermionic/improve-bb2diaspora-conversionsfermionic2012-06-221-20/+53
|\ \ \ \
| * | | | cleanup lists and more comment signature stuffZach Prezkuta2012-06-221-2/+13
| * | | | expand support for BB code-to-Diaspora conversionZach Prezkuta2012-06-221-20/+42
|/ / / /
* | | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-223-3/+4
|\ \ \ \
| * \ \ \ Merge pull request #349 from simonlnu/masterSimon2012-06-223-3/+4
| |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 02:34:15 +0000