aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | diabook-nav-icons with gradienttommy tomson2012-04-098-0/+0
| |/ /
* / / rev updatefriendica2012-04-092-30/+30
|/ /
* | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/master'zottel2012-03-148-8/+190
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | use local_user for tag completion if available. See bug #368friendica2012-04-091-1/+1
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | more sane defaults datetime_convertfriendica2012-04-081-3/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | fix empty string timezonefriendica2012-04-081-0/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | send zrl after dfrn_request homecoming for manual entriesfriendica2012-04-081-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pull'friendica2012-04-0821-45/+179
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #215 from tomtom84/mastertomtom842012-04-0821-45/+179
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | fixed z-index of youtube-vidstommy tomson2012-04-0921-45/+179
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / / fix to wall_upload photos default permissions to use cid rather than uid.friendica2012-04-085-288/+319
|/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | prepare for using a master theme_init()friendica2012-04-081-0/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | provide theme_init() functionsfriendica2012-04-089-0/+20
* | | | | | | | | | | | | | | | | | | | | | | | | | rev updatesfriendica2012-04-082-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #214 from annando/masterfriendica2012-04-0812-22/+272
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'upstream/master'Michael Vogel2012-04-0815-30/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #213 from simonlnu/masterSimon2012-04-077-30/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | minor dispy* fixesSimon L'nu2012-04-077-30/+35
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0744-153/+1476
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | diabook-themes: small fixtommy tomson2012-04-078-0/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-07180-231/+365
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-061505-1390/+2052
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \