aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/friendicaSebastian Egbers2012-06-2627-435/+709
|\
| * stray sfriendica2012-06-251-1/+1
| * typosfriendica2012-06-252-2/+2
| * add event titles to discovered birthday eventsfriendica2012-06-252-6/+11
| * change required docofriendica2012-06-251-2/+5
| * change event behaviour so that title is required but description is notfriendica2012-06-253-8/+32
| * event summary/titlefriendica2012-06-259-9/+58
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-255-130/+210
| |\
| | * Merge pull request #364 from fermionic/diaspora-refactor-and-better-disablingfermionic2012-06-255-130/+210
| | |\
| | | * remove possibly unnecessary checks for likes or comments created by Diaspora ...Zach Prezkuta2012-06-252-51/+51
| | | * store signature info for remote users tooZach Prezkuta2012-06-252-17/+24
| | | * was passing the wrong arguments to the signature storage functionZach Prezkuta2012-06-251-1/+1
| | | * add some debug loggingZach Prezkuta2012-06-253-2/+8
| | | * revert extra Diaspora disabling changes to try to eliminate Mustard double-po...Zach Prezkuta2012-06-253-43/+23
| | | * Clean up the Diaspora connectivity:Zach Prezkuta2012-06-255-128/+215
| | |/
| * | propagate remote deletesfriendica2012-06-251-5/+8
| * | improve remote delete forwardingfriendica2012-06-252-2/+64
| |/
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-255-4/+5
| |\
| | * Merge pull request #363 from simonlnu/masterSimon2012-06-251-1/+1
| | |\
| | | * fix typo and syntax errorSimon L'nu2012-06-251-1/+1
| | * | Merge pull request #362 from simonlnu/masterSimon2012-06-254-4/+4
| | |\|
| | | * fix margin of wall-item-bodySimon L'nu2012-06-254-4/+4
| | |/
| * | typos in bbcode, add service class restrictions to jot uploadsfriendica2012-06-255-11/+40
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-06-2510-60/+40
| |\|
| | * Merge pull request #361 from simonlnu/masterSimon2012-06-254-38/+14
| | |\
| | | * fix delete thingy, and minor clean upSimon L'nu2012-06-254-38/+14
| | * | 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
| | | |\ | | | |/ | | |/|
| | | * Merge git://github.com/friendica/friendicaZvi ben Yaakov (a.k.a rdc)2012-06-2332-217/+3247
| | | |\
| | | * \ Merge git://github.com/friendica/friendicaZvi ben Yaakov (a.k.a rdc)2012-06-2121-4036/+4147
| | | |\ \
| | | * \ \ Merge git://github.com/friendica/friendicaZvi ben Yaakov (a.k.a rdc)2012-06-1913-661/+1254
| | | |\ \ \
| | | * | | | Added App::get_cached_avater_image usage in profile_sidebar function forZvi ben Yaakov (a.k.a rdc)2012-06-191-3/+3
| | | * | | | Added App::get_cached_avatar_image usage on conversation wall of Normal ViewZvi ben Yaakov (a.k.a rdc)2012-06-191-1/+1
| | | * | | | Now using App::get_cached_avatar_image for /photos pageZvi ben Yaakov (a.k.a rdc)2012-06-181-2/+2
| | | * | | | Now using App::get_cached_avatar_image for /profile/{nickname} pageZvi ben Yaakov (a.k.a rdc)2012-06-181-2/+2
| | | * | | | Now using App::get_cached_avatar_image for navigation barZvi ben Yaakov (a.k.a rdc)2012-06-181-2/+2
| | | * | | | Now using App::get_cached_avatar_image for /directory pageZvi ben Yaakov (a.k.a rdc)2012-06-181-2/+2
| | | * | | | Beginning to use App::get_cached_avatar_image for loading profile imagesZvi ben Yaakov (a.k.a rdc)2012-06-181-1/+1
| | | * | | | Added get_cached_avatar_image to App class for shared profile imageZvi ben Yaakov (a.k.a rdc)2012-06-181-0/+25
| * | | | | | rev updatefriendica2012-06-252-208/+246
| |/ / / / /
* | | | | | fixed direct message reply in api call.Sebastian Egbers2012-06-251-2/+2
* | | | | | modified api message reply to set title to conversion title, when replying.Sebastian Egbers2012-06-251-8/+12
* | | | | | Merge branch 'master' of https://github.com/friendica/friendicaSebastian Egbers2012-06-2530-227/+544
|\| | | | |
| * | | | | more service class functionalityfriendica2012-06-251-0/+5
| * | | | | service limits for photo uploadsfriendica2012-06-254-1/+63
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-21 09:15:51 +0000