aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ | |/ |/|
* | path to default.php in theme dir was incorrectfriendica2012-04-101-2/+2
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-106-1067/+1227
| |\ | |/ |/|
* | 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
* | | | | | rev updatefriendica2012-04-092-30/+30
| |_|/ / / |/| | | |
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0970-415/+947
| | | | |\ | | |_|_|/ | |/| | |
| * | | | 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
| | |/ / | |/| |
| * | | Merge pull request #217 from tomtom84/mastertomtom842012-04-098-0/+0
|/| | |
| * | | diabook-nav-icons with gradienttommy tomson2012-04-098-0/+0
|/ / /
* | | Merge branch 'pull'friendica2012-04-092-64/+64
|\ \ \
| * \ \ Merge pull request #216 from zzottel/mastertomtom842012-04-092-64/+64
| |\ \ \
| | * | | Some new German translationszottel2012-04-092-64/+64
| | * | | Merge remote branch 'upstream/master'zottel2012-04-0926-333/+498
| | |\ \ \
| | * \ \ \ Merge remote branch 'upstream/master'zottel2012-04-0822-25/+302
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge remote branch 'upstream/master'zottel2012-04-081418-2297/+4820
| | |\ \ \ \
| | * \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-0470-3913/+376
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-0341-276/+471
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-04-02115-313/+12740
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-31197-1141/+19714
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-3039-139/+391
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-2987-435/+2071
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-27166-1297/+7813
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-245-223/+86
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-235-34/+4953
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-2312-34/+375
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-2222-20/+349
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-2236-65/+552
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-21346-10409/+21300
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-205-102/+81
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-192-1/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-1924-66/+113
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-188-22/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-173-7/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-1728-306/+488
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-1644-170/+547
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-1531-274/+1206
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-1510-21/+74
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \