aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge pull request #242 from simonlnu/masterSimon2012-04-172-10/+0
| |\
| | * [SECURITY] finish ripping out fpostitSimon L'nu2012-04-172-10/+0
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-170-0/+0
| |/
| * Merge pull request #241 from simonlnu/masterSimon2012-04-1712-328/+0
| |\
| | * rip out fpostitSimon L'nu2012-04-1712-328/+0
| * | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-04-1749-2358/+1783
| |\ \
| | * | diabook-themes: removed fpostit due to security issues and small fix in germa...tommy tomson2012-04-1733-754/+39
| | * | 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
| |/
| * 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
| |\
| * | diabook-themes: css-fixestommy tomson2012-04-1517-24/+88
* | | Merge commit 'upstream/master'Michael Vogel2012-04-15162-136/+8652
|\| | | |/ |/|
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 17:30:19 +0000