aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add support for PNG images with alphaFabio Comuni2012-06-0711-71/+216
* fix a random profile error messagefabrixxm2012-06-072-2/+4
* events: fix select events queryfabrixxm2012-06-071-2/+2
* more logging on subscribe_to_hubfriendica2012-06-061-1/+6
* Merge https://github.com/friendica/friendica into pullfriendica2012-06-062-54/+48
|\
| * Merge pull request #326 from zzottel/masterzzottel2012-06-062-54/+48
| |\
| | * A few corrections in German translations.zottel2012-06-072-54/+48
| | * Merge remote branch 'upstream/master'zottel2012-06-073-123/+339
| | |\ | | |/ | |/|
| | * Merge remote branch 'upstream/master'zottel2012-06-0613-453/+508
| | |\
| | * \ Merge remote branch 'upstream/master'zottel2012-06-0530-1287/+2256
| | |\ \
| | * \ \ Merge remote branch 'upstream/master'zottel2012-06-0322-459/+607
| | |\ \ \
| | * \ \ \ Merge remote branch 'upstream/master'zottel2012-06-026-176/+186
| | |\ \ \ \
| | * \ \ \ \ Merge remote branch 'upstream/master'zottel2012-06-015-436/+502
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-3111-186/+214
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-3047-839/+995
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-2523-819/+1098
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-2329-761/+980
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-2229-444/+623
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-2033-682/+1171
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-1737-5312/+6391
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-154-49/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-1453-7106/+10559
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-1114-177/+628
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-1023-118/+123
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-0914-468/+621
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-0815-377/+626
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-0740-611/+6304
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-056-787/+795
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-0410-686/+970
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-0437-2709/+4343
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-0343-493/+697
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-0220-249/+383
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-05-0185-2812/+3625
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-2814-363/+485
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-277-62/+161
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-27110-8362/+11873
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-2549-499/+1194
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-24263-14482/+1144
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-23412-21572/+3945
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-20636-4024/+115549
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-1631-180/+524
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-15349-6710/+7509
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-092-1/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | admin page untranslated strings, remove empty list element for updatefriendica2012-06-062-3/+8
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / rev updatefriendica2012-06-063-123/+339
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set minchars to 2 for PM lookups toofriendica2012-06-051-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set minchars to 2 for contacts searchfriendica2012-06-051-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contacts search autocompletefriendica2012-06-052-2/+43
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add email probe logging, limit typo check to main addon files and skip additi...friendica2012-06-052-3/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-0512-454/+852
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \