aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-04-11133-1946/+2921
|\
| * diabook-themes: small fixtommy tomson2012-04-114-11/+11
| * Merge pull request #226 from simonlnu/masterSimon2012-04-104-71/+108
| |\
| | * major refactor. step 1Simon L'nu2012-04-114-71/+108
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-110-0/+0
| |/
| * Merge https://github.com/friendica/friendica into pullfriendica2012-04-1010-34/+38
| |\
| | * Merge pull request #225 from simonlnu/masterSimon2012-04-1010-34/+38
| | |\
| | | * more ' = ' spacing fixesSimon L'nu2012-04-106-17/+17
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-101-2/+4
| | | |\ | | | |/ | | |/|
| | | * [fix] absolute links in docs and newmember.php; breaks sub-dir installsSimon L'nu2012-04-108-25/+29
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-100-0/+0
| * | | visit "random profile" featurefriendica2012-04-105-1/+22
| |/ /
| * / profile redir - goto correct profile page even if contact blocked, you just c...friendica2012-04-101-2/+4
| |/
| * cleanup photo menusfriendica2012-04-102-11/+11
| * more backend work on mail2 followersfriendica2012-04-102-9/+57
| * make editplain work everywherefriendica2012-04-105-9/+25
| * move all fix_mce to one function so it can easily be undonefriendica2012-04-102-4/+2
| * duplicate community postsfriendica2012-04-101-4/+4
| * fix_mce_lf contact edit pagefriendica2012-04-101-1/+1
| * fix_mce_lf on profilesfriendica2012-04-102-10/+16
| * Merge https://github.com/friendica/friendica into pullfriendica2012-04-1034-278/+352
| |\
| | * Merge pull request #222 from CatoTH/masterfriendica2012-04-102-2/+2
| | |\
| | | * Incorrect tranlation (one negation too much)Tobias Hößl2012-04-102-2/+2
| | * | Merge pull request #223 from campino/masterfriendica2012-04-101-3/+2
| | |\ \ | | | |/ | | |/|
| | | * fixed install bugAlexander Kampmann2012-04-101-3/+2
| | * | diabook-themes: smal fix in bbcode-jstommy tomson2012-04-104-1/+25
| | * | diabook-themes: added url and quote to bbcode toolbar under comment boxtommy tomson2012-04-1016-4/+45
| | * | Merge pull request #221 from simonlnu/masterSimon2012-04-1011-268/+278
| | |\ \
| | | * | aaah, nice asides ;). we'll be updating these soonSimon L'nu2012-04-1011-268/+278
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-101-2/+2
| | | |\ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-106-1067/+1227
| | | |\ \
| | | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0970-415/+947
| | | |\ \ \
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-080-0/+0
| * | | | | | set default on get_avatarfriendica2012-04-101-1/+8
| * | | | | | Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pullfriendica2012-04-107-40/+24
| |\ \ \ \ \ \
| | * | | | | | Remove Gravatar from core and add new hook avatar_lookup.Klaus Weidenbach2012-04-096-34/+18
| | * | | | | | Rename gravatar_img() more generic to avatar_img().Klaus Weidenbach2012-04-093-7/+7
| * | | | | | | rev updatefriendica2012-04-102-42/+101
| | |/ / / / / | |/| | | | |
| * | | | | | path to default.php in theme dir was incorrectfriendica2012-04-101-2/+2
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'pull'friendica2012-04-0961-1063/+1580
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #218 from campino/masterfriendica2012-04-095-1037/+1197
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-098-0/+0
| | | |\ \ \
| | | * | | | source beautifarming to make review easierAlexander Kampmann2012-04-091-180/+180
| | | * | | | Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-0930-399/+574
| | | |\ \ \ \
| | | * | | | | fixed some typosAlexander Kampmann2012-04-093-6/+6
| | | * | | | | made exceptions from the db optionalAlexander Kampmann2012-04-093-872/+918
| | | * | | | | added exceptions to dba classAlexander Kampmann2012-04-096-188/+302
| | | | |_|_|/ | | | |/| | |
| | * | | | | Merge pull request #220 from tomtom84/mastertomtom842012-04-0940-26/+383
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | bbcode toolbar attached to the comment text fieldtommy tomson2012-04-1040-26/+383
| | |/ / / /
| | * | | / diabook-themes: small icon fixtommy tomson2012-04-0914-0/+0
| | | |_|/ | | |/| |