aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* A few corrections in German translations.zottel2012-06-072-54/+48
* Merge remote branch 'upstream/master'zottel2012-06-073-123/+339
|\
| * rev updatefriendica2012-06-063-123/+339
* | Merge remote branch 'upstream/master'zottel2012-06-0613-453/+508
|\|
| * 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
| |\
| | * Merge pull request #325 from annando/masterfriendica2012-06-051-8/+10
| | |\
| | | * Merge remote branch 'upstream/master'Michael Vogel2012-06-0462-2383/+3290
| | | |\
| | | * | API: Only repeat items if there is a contentMichael Vogel2012-06-041-8/+10
| | * | | DE: update for the stringsTobias Diekershoff2012-06-052-398/+408
| * | | | rev updatefriendica2012-06-052-42/+37
| * | | | named anchors on display pagefriendica2012-06-043-0/+3
* | | | | Merge remote branch 'upstream/master'zottel2012-06-0530-1287/+2256
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | quattro: added editor buttons to commentsTobias Diekershoff2012-06-045-6/+380
| | |_|/ | |/| |
| * | | quattro: cleanup the less fileTobias Diekershoff2012-06-043-38/+50
| * | | Merge pull request #324 from simonlnu/masterSimon2012-06-034-6/+6
| |\ \ \ | | |/ / | |/| |
| | * | fix mini photo-menu bugSimon L'nu2012-06-034-6/+6
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-0324-1275/+1858
| | |\ \ | | |/ / | |/| |
| * | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-0323-990/+1565
| |\ \ \
| | * \ \ Merge pull request #323 from fermionic/add-relayable-retraction-support-for-d...friendica2012-06-0312-77/+371
| | |\ \ \
| | | * | | database updatesZach Prezkuta2012-06-033-8/+7
| | | * | | Debugged implementation of Diaspora relayable_retractionsZach Prezkuta2012-06-033-28/+38
| | | * | | cleanup and loggingZach Prezkuta2012-06-031-22/+20
| | | * | | first shot at getting like/unlike functions to work consistentlyZach Prezkuta2012-06-035-22/+142
| | | * | | Fix bugs in the retraction codeZach Prezkuta2012-06-037-65/+41
| | | * | | prepare to implement database updateZach Prezkuta2012-06-031-1/+11
| | | * | | Implement relaying of relayable_retractionsZach Prezkuta2012-06-038-43/+194
| | | * | | Support relayable_retractions that are relayed to us by the top-level post ownerZach Prezkuta2012-06-033-9/+39
| | |/ / /
| | * | | quattro: admin panel styling and 1st buttons for addon/theme overviewTobias Diekershoff2012-06-036-65/+281
| | * | | privacy settings: make submit button translateableTobias Diekershoff2012-06-031-1/+1
| | * | | DE: update to the stringsTobias Diekershoff2012-06-032-845/+909
| | * | | prv messages: make submit translateableTobias Diekershoff2012-06-032-2/+3
| * | | | rev updatefriendica2012-06-032-285/+293
| |/ / /
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-0322-459/+607
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-016-176/+186
| | |\ \
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-3124-717/+856
| | |\ \ \
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-290-0/+0
* | | | | | Merge remote branch 'upstream/master'zottel2012-06-0322-459/+607
|\| | | | |
| * | | | | zrl's when visiting public photos at the source sitefriendica2012-06-031-0/+6
| * | | | | docofriendica2012-06-021-0/+12
| * | | | | cleanupfriendica2012-06-021-1/+3
| * | | | | turn "follow" into a functionfriendica2012-06-022-217/+236
| * | | | | add hometown to profilesfriendica2012-06-028-4/+34
| * | | | | bug #439 - remove web port number from notification email "from" addressfriendica2012-06-021-0/+3
| * | | | | webfinger profile linkerfriendica2012-06-025-213/+246
| * | | | | "howlong" added to marital status.friendica2012-06-028-5/+33
| * | | | | fewer "bob smith to bob smith via wall-to-wall".friendica2012-06-026-21/+36