aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/friendica into pullfriendica2012-06-192-655/+964
|\
| * [DE] stringsTobias Diekershoff2012-06-192-655/+964
* | missing $submitfriendica2012-06-192-1/+2
|/
* minor nitsfriendica2012-06-181-1/+2
* a bit more description of message passingfriendica2012-06-181-0/+6
* add plugin hooks to every module_function (allows plugins to be triggered off...friendica2012-06-181-1/+11
* exif_read_data may not be available and isn't a requirement - check and silen...friendica2012-06-181-0/+3
* Merge pull request #341 from fermionic/auto-orient-uploaded-imagesfriendica2012-06-182-1/+62
|\
| * fix some whitespace issuesZach Prezkuta2012-06-181-13/+13
| * rotate uploaded images if an EXIF rotation is presentZach Prezkuta2012-06-182-1/+62
* | some doco to explain what's happeningfriendica2012-06-181-5/+26
* | some psuedo code for the basic building blocks of zot-2012 - these are just i...friendica2012-06-181-0/+154
|/
* public forum author using private posting, correct the comment permissions do...friendica2012-06-183-3/+9
* Typo breaking tag notificationsThomas Willingham2012-06-181-1/+1
* 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
|\
| * Merge remote branch 'upstream/master'Hauke Zuehl2012-06-162-72/+109
| |\ | |/ |/|
* | Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-th...fermionic2012-06-161-71/+108
|\ \
| * | 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.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.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
| |\ \
| | * | 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 terminat...friendica2012-06-142-5/+3
* | | 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