aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Diaspora: Messages are now looking betterMichael Vogel2012-06-231-2/+18
|
* Merge branch 'master' of github.com:annando/friendicaMichael2012-06-1811-35/+2963
|\ | | | | | | | | Conflicts: include/oembed.php
| * 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
| |
* | make subdued elements jump out at you on hoverfriendica2012-06-171-0/+15
| |
* | too many profilesfriendica2012-06-171-1/+1
| |
* | rev updatefriendica2012-06-172-7/+7
| |
* | Enabled Profile photo revisions to be displayed on /photos pageZvi ben Yaakov (a.k.a rdc)2012-06-171-2/+2
| |
* | Added missing backticks to navigation bar queryZvi ben Yaakov (a.k.a rdc)2012-06-171-1/+1
| |
* | Enabled Profile photo revisions to be displayed on /profiles pageZvi ben Yaakov (a.k.a rdc)2012-06-171-2/+2
| |
* | Enabled Profile photo revisions to be displayed in navigation barZvi ben Yaakov (a.k.a rdc)2012-06-171-2/+2
| |
* | Enabled Profile photo revisions to be displayed on /directory pageZvi ben Yaakov (a.k.a rdc)2012-06-171-2/+2
|/
* rev updatefriendica2012-06-163-7/+7
|
* Merge pull request #336 from hauke68/masterfriendica2012-06-161-4/+2
|\ | | | | Pull request
| * Merge remote branch 'upstream/master'Hauke Zuehl2012-06-162-72/+109
| |\ | |/ |/|
* | Merge pull request #338 from ↵fermionic2012-06-161-71/+108
|\ \ | | | | | | | | | | | | fermionic/diaspora-dont-check-more-signatures-than-diaspora-does Diaspora dont check more signatures than diaspora does
| * | more cleanupZach Prezkuta2012-06-161-15/+0
| | |
| * | some cleanup of obsolete codeZach Prezkuta2012-06-161-31/+6
| | |
| * | still need the original author information for comments and likesZach Prezkuta2012-06-161-0/+24
| | |
| * | update signature checking for relayablesZach Prezkuta2012-06-161-69/+122
| | |
* | | Merge pull request #337 from fermionic/fix-api_php-logging-typofermionic2012-06-161-1/+1
|\ \ \ | |/ / |/| | fix small typo for logging command in api.php
| * | fix small typo for logging command in api.phpZach Prezkuta2012-06-161-1/+1
|/ /
| * Merge remote branch 'upstream/master'Hauke Zuehl2012-06-1634-524/+979
| |\ | |/ |/|
* | rev updatefriendica2012-06-163-90/+84
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-151-6/+21
|\ \
| * \ Merge pull request #335 from fabrixxm/masterfabrixxm2012-06-151-6/+21
| |\ \ | | | | | | | | The missing mod/network.php
| | * | the missing mod/network.phpfabrixxm2012-06-151-6/+21
| |/ /
* / / redundant log entryfriendica2012-06-141-1/+0
|/ /
* | mod/network.php was lostfriendica2012-06-141-0/+679
| |
* | highlight the lost contact messagefriendica2012-06-141-1/+1
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-144-680/+33
|\ \
| * \ Merge pull request #334 from fabrixxm/masterfriendica2012-06-143-680/+31
| |\ \ | | | | | | | | Fix bug 453 and small update to quattro theme
| | * | network: fix bug #453fabrixxm2012-06-142-679/+27
| | | |
| | * | quattro theme: show uncollapsed comments on display pagefabrixxm2012-06-141-1/+4
| |/ /
| * | Required for github/Windowsfriendica2012-06-141-0/+2
| | |
* | | also mark for death if there isn't any xml to be foundfriendica2012-06-141-0/+3
| | |
* | | poll even if contact hasn't responded recently, so we can update the ↵friendica2012-06-142-5/+3
| | | | | | | | | | | | termination status
* | | better handling of dead contactsfriendica2012-06-146-65/+91
|/ /
* | syntax on sqlfriendica2012-06-131-1/+1
| |
* | ajax append placeholder, fix some html warningsfriendica2012-06-138-3/+13
| |
* | remove php version restriction on archive widgetfriendica2012-06-131-8/+4
| |
* | couple of little fixes to enotify positional paramsfriendica2012-06-131-2/+2
| |
* | fix to imported youtube videos, updating of contact profile photos, do not ↵friendica2012-06-134-34/+105
| | | | | | | | remove "dead" contacts but archive them.
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-131-1/+1
|\ \
| * \ Merge pull request #333 from Erkan-Yilmaz/masterfriendica2012-06-131-1/+1
| |\ \ | | | | | | | | missing bracket
| | * | add missing bracketErkan Yilmaz2012-06-131-1/+1
| | | |
* | | | Merge https://github.com/fabrixxm/friendica into pullfriendica2012-06-132-87/+87
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: util/messages.po
| * | | enotify: fix stupid typofabrixxm2012-06-131-1/+1
| | | |
| * | | enotify: rework strings to more easy to translatefabrixxm2012-06-132-3777/+3730
| |/ /