aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-2622-439/+741
|\
| * service class restrict the email connectorfriendica2012-06-263-75/+83
| * 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
| | |\
| * | | 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
| |\ \ \
| * | | | rev updatefriendica2012-06-252-208/+246
* | | | | Merge remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-250-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Merge pull request #362 from simonlnu/masterSimon2012-06-254-4/+4
| |\ \ \ | | |_|/ | |/| |
* | | | fix typo and syntax errorSimon L'nu2012-06-251-1/+1
| |/ / |/| |
* | | fix margin of wall-item-bodySimon L'nu2012-06-254-4/+4
|/ /
* | 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
| |\ | |/ |/|
* | 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
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 10:00:34 +0000