aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge pull request #240 from CatoTH/masterfriendica2012-04-179-43/+44
| | |\ \
| | | * | Some Bugfixes, and variable checksTobias Hößl2012-04-179-43/+44
| | * | | naked br appearing when attaching and textplainfriendica2012-04-171-1/+6
| | |/ /
| | * | Merge https://github.com/friendica/friendica into pullfriendica2012-04-1649-1561/+2162
| | |\ \
| | | * | Merge pull request #239 from simonlnu/masterSimon2012-04-163-1463/+1572
| | | |\|
| | | | * finally fix the ui in the settings. it was fugly.... other bug fixes tooSimon L'nu2012-04-173-1463/+1572
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-160-0/+0
| | | |/
| | * | rev updatefriendica2012-04-163-97/+122
| * | | update to the German string filesTobias Diekershoff2012-04-172-942/+1280
| | |/ | |/|
| * | diabook-themes: bugfix (sry, necessary)tommy tomson2012-04-1612-12/+52
| * | diabook-themes: small bug/css-fixes ---> ver. 1.019tommy tomson2012-04-1626-21/+419
| * | diabook-themes: bug-fixestommy tomson2012-04-1612-48/+68
| * | diabook-themes: minor bugfixestommy tomson2012-04-1612-25/+59
| |/
* | Merge remote branch 'upstream/master'zottel2012-04-1631-180/+524
|\|
| * turn on comment editfriendica2012-04-161-4/+4
| * propagate edited commentsfriendica2012-04-161-2/+6
| * edited comments weren't being relayedfriendica2012-04-161-0/+24
| * rev updatefriendica2012-04-152-73/+78
| * Merge pull request #238 from annando/masterfriendica2012-04-157-67/+259
| |\
| | * DBA: Reverting back to original sourceMichael Vogel2012-04-141-3/+1
| | * DBA: Nothing really done ..Michael Vogel2012-04-141-71/+0
| | * Merge commit 'upstream/master'Michael Vogel2012-04-1498-911/+2464
| | |\
| | * \ Merge commit 'upstream/master'Michael Vogel2012-04-1388-12005/+2087
| | |\ \
| | * | | DBA: Deactivation of the mysqli-class for testing purposes.Michael Vogel2012-04-131-30/+31
| | * | | Merge commit 'upstream/master'Michael Vogel2012-04-11133-1946/+2921
| | |\ \ \
| | * | | | API: Improved the timeline. Several (disabled) tests with caching of photos.Michael Vogel2012-04-114-8/+42
| | * | | | html2plain: changed behaviour for the "hr" element.Michael Vogel2012-04-091-1/+1
| | * | | | API: Tweetdeck is now workingMichael Vogel2012-04-092-54/+51
| | * | | | API: Added Public TimelineMichael Vogel2012-04-081-5/+85
| | * | | | API: Now mentions could work as well - only my client doesn't really workMichael Vogel2012-04-081-61/+72
| | * | | | API: Basic support of the identica client added.Michael Vogel2012-04-081-0/+72
| * | | | | diabook-themes: css-fixestommy tomson2012-04-1517-24/+88
| * | | | | open contact edit in same windowfriendica2012-04-151-1/+1
| * | | | | where did this "lang" string come from and why?friendica2012-04-151-0/+10
| * | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-04-15153-112/+8559
| |\ \ \ \ \
| * | | | | | function name typofriendica2012-04-151-1/+1
| * | | | | | track requested profile error msgfriendica2012-04-143-17/+62
* | | | | | | Merge remote branch 'upstream/master'zottel2012-04-15349-6710/+7509
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #237 from simonlnu/masterSimon2012-04-1515-82/+159
| |\ \ \ \ \ \
| | * | | | | | REALLY fix fpostit this timeSimon L'nu2012-04-1515-82/+159
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-150-0/+0
| |/ / / / / /
| * | | | | | Merge pull request #236 from simonlnu/masterSimon2012-04-146-8/+8
| |\ \ \ \ \ \
| | * | | | | | fix fpostJS, add and fix some other stuffSimon L'nu2012-04-156-8/+8
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-150-0/+0
| |/ / / / / /
| * | | | | | diabook-themes: added js for auto-growing comment-textareastommy tomson2012-04-1512-4/+238
| * | | | | | diabook: theme-settings: add a wide-optiontommy tomson2012-04-1543-11/+8147
| * | | | | | Merge pull request #234 from copyninja/masterfriendica2012-04-14153-0/+0
| |\ \ \ \ \ \
| | * | | | | | Another bunch of executable permission removalVasudev Kamath2012-04-14121-0/+0
| | * | | | | | Removed execution permission: lintian warning in Debian packagingVasudev Kamath2012-04-1432-0/+0
| * | | | | | | Merge pull request #235 from simonlnu/masterSimon2012-04-146-7/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |