aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
|\ \ \ \ \
| * \ \ \ \ 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
| |\ \ \ \ \ \
| | * | | | | | string fix: typo. slow down scroll to top in dispysSimon L'nu2012-04-146-7/+7
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-147-8/+24
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-140-0/+0
| | |/ / / / /
* | | | | | | function name typofriendica2012-04-151-1/+1
* | | | | | | track requested profile error msgfriendica2012-04-143-17/+62
|/ / / / / /
* | | | | | bogus empty list element in dfrn_request page when emailnet not enabledfriendica2012-04-142-2/+2
* | | | | | zrl on random profilefriendica2012-04-141-1/+1
* | | | | | zrl hookfriendica2012-04-141-2/+6
* | | | | | bug #372 - category feedsfriendica2012-04-141-0/+10
| |_|_|_|/ |/| | | |
* | | | | pass zrl's to/through global directoryfriendica2012-04-142-3/+5
|/ / / /
* | | | one morefriendica2012-04-131-1/+1
* | | | additional marital status selectorsfriendica2012-04-131-1/+1
* | | | Merge pull request #233 from simonlnu/masterSimon2012-04-131-1/+1
|\ \ \ \
| * | | | lighten wrapper shadow a bit on dispySimon L'nu2012-04-131-1/+1
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-130-0/+0
|/ / / /
* | | | Merge pull request #232 from simonlnu/masterSimon2012-04-1314-22/+128
|\ \ \ \
| * | | | neat little changes. hopefully the shadow will be well recievedSimon L'nu2012-04-1314-22/+128
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-1374-830/+2077
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | well that was a silly mistake...friendica2012-04-132-3/+3
* | | | | setting wasn't being appliedfriendica2012-04-131-2/+2
* | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-04-1348-115/+1085
|\ \ \ \ \
| * | | | | diabook-themes: theme-settings: users can set font-size and line-height for p...tommy tomson2012-04-1322-31/+628
| * | | | | Merge pull request #231 from tomtom84/mastertomtom842012-04-137-10/+209
| |\ \ \ \ \
| | * | | | | diabook: theme-settings: users can set font-size and line-height for posts an...tommy tomson2012-04-137-10/+209
| |/ / / / /
| * | | | | diabook-themes: small fixestommy tomson2012-04-1328-75/+249
* | | | | | rev updatefriendica2012-04-132-511/+579
|/ / / / /
* | | | | Merge pull request #230 from fabrixxm/masterfriendica2012-04-1322-201/+410
|\ \ \ \ \