aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* improve remote delete forwardingfriendica2012-06-252-2/+64
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-06-255-4/+5
|\ | | | | | | | | Conflicts: include/bbcode.php
| * Merge pull request #363 from simonlnu/masterSimon2012-06-251-1/+1
| |\ | | | | | | fix typo and syntax error in include/bbcode.php
| | * fix typo and syntax errorSimon L'nu2012-06-251-1/+1
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge pull request #362 from simonlnu/masterSimon2012-06-254-4/+4
| |\| | | | | | | fix margin of .wall-item-body
| | * fix margin of wall-item-bodySimon L'nu2012-06-254-4/+4
| |/ | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | 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
| |\ | | | | | | cleaned up the css a bit
| | * fix delete thingy, and minor clean upSimon L'nu2012-06-254-38/+14
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge pull request #360 from fermionic/more-nested-listsfriendica2012-06-252-10/+13
| |\ \ | | | | | | | | allow nested [ol] and [ul] lists too
| | * | 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 post
| | * | 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" avatar thumbs in right sidebar
| | * Added App::get_cached_avatar_image usage for displaying "Last users"Zvi ben Yaakov (a.k.a rdc)2012-06-251-1/+1
| | | | | | | | | | | | avatar thumbs in right sidebar
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creating the $diaspora array that is used to populate diaspora_vcard.tpl. This allows the correct profile image revision to be used when dfrn_request friend requests are made.
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | in conversations
| | * | | | Added get_cached_avatar_image to App class for shared profile imageZvi ben Yaakov (a.k.a rdc)2012-06-181-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | access and reduced sql queries/load
* | | | | | rev updatefriendica2012-06-252-208/+246
|/ / / / /
* | | | | 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 locki...
| * | | | | 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 handle
| | * | | | | use author handle instead of sender handleZach Prezkuta2012-06-231-24/+84
| | | | | | |
| * | | | | | Merge pull request #355 from ↵fermionic2012-06-231-0/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | fermionic/missing-urls-after-strip_tags-in-bb2diaspora allow bare URLS to make it through to Diaspora
| | * | | | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix Diaspora list formatting
| * | | | small optimizationZach Prezkuta2012-06-231-5/+3
| | | | |
| * | | | fix BB-to-Diaspora list formattingZach Prezkuta2012-06-231-3/+43
|/ / / /
* | | | Merge pull request #352 from fermionic/diaspora-display-scaled-down-imageSimon2012-06-232-4/+17
|\ \ \ \ | | | | | | | | | | allow linking to Diaspora's scaled-down images
| * | | | allow linking to Diaspora's scaled-down imagesZach Prezkuta2012-06-232-4/+17
| | | | |
* | | | | Merge pull request #353 from simonlnu/masterSimon2012-06-239-43/+53
|\ \ \ \ \ | |/ / / / |/| | | | jquery update; templates
| * | | | update jquery to 1.7.2; fix some dispy templates to be more in sync with view/Simon L'nu2012-06-239-43/+53
|/ / / / | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 05:29:15 +0000