aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix jot.tpl buttons. fix up subsequent styling breakageSimon L'nu2012-03-072-56/+75
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-070-0/+0
* Merge pull request #104 from simonlnu/masterSimon2012-03-073-44/+35
|\
| * push fix for funky menu action. the overflow-x might break again for some peopleSimon L'nu2012-03-073-44/+35
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-072-3/+8
| |\ | |/ |/|
* | Merge pull request #103 from tomtom84/mastertomtom842012-03-062-3/+8
|\ \
| * | fix in navbartommy tomson2012-03-072-3/+8
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-063-9/+80
| | |\ | |_|/ |/| |
* | | fix photos after permissions_sql changefriendica2012-03-063-6/+78
* | | Merge branch 'pull'friendica2012-03-0623-2/+6
|\ \ \
* | | | [privacy] rework latest fixfriendica2012-03-062-4/+3
* | | | remove stray debuggingfriendica2012-03-061-2/+2
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0618-0/+0
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #102 from beardy-unixer/masterSimon2012-03-0618-0/+0
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master'Thomas2012-03-0618-222/+359
| | |\ \ \ | | |/ / / | |/| | |
| | * | | improved smiley transparencyThomas2012-03-0620-2/+2
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-061-0/+4
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge pull request #101 from tomtom84/mastertomtom842012-03-061-0/+4
| |\ \ \ \
| | * | | | fix in navbartommy tomson2012-03-071-0/+4
| | | |/ / | | |/| |
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-060-0/+0
| | |_|/ | |/| |
| * | | Merge pull request #100 from simonlnu/masterSimon2012-03-065-2/+2
|/| | |
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-066-7/+15
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'pull'friendica2012-03-0612-37/+69
|\ \ \ \
* | | | | fix html reshares when editplain in usefriendica2012-03-061-5/+13
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0613-38/+70
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #94 from beardy-unixer/masterSimon2012-03-067-16/+45
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fixed...merged with mainline THEN added beards.Thomas2012-03-061-5/+36
| | * | | added beard smileysThomas2012-03-063-35/+8
| | * | | doc/Account-Basics.mdThomas2012-03-061-1/+1
| | * | | doc/Account-Basics.mdThomas2012-03-061-2/+1
| | * | | aThomas2012-03-061-2/+2
| | * | | doc/Remove-Account.mdThomas2012-03-061-2/+13
| | * | | doc/Making-Friends.mdThomas2012-03-061-1/+8
| | * | | doc/Bugs-and-Issues.mdThomas2012-03-061-5/+6
| | * | | doc/Account-Basics.mdThomas2012-03-061-6/+13
| * | | | Merge pull request #99 from tomtom84/masterSimon2012-03-065-21/+24
|/| | | | | | |_|/ | |/| |
| * | | messages-menu translation, add scroll-to-top and theme-bug-report in themetommy tomson2012-03-075-21/+24
* | | | search should be ok, but a little extra security won't hurtfriendica2012-03-061-1/+1
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-060-0/+0
| |_|/ |/| |
* | | Merge branch 'pull'friendica2012-03-061-19/+18
|\ \ \
| * \ \ Merge pull request #98 from simonlnu/masterSimon2012-03-061-19/+18
| |\ \ \
| | * | | dispy, dispy, oh what a little lispySimon L'nu2012-03-061-19/+18
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-060-0/+0
* | | | | string updatefriendica2012-03-061-101/+224
|/ / / /
* / / / [PRIVACY] privacy issue bug #314friendica2012-03-061-2/+5
|/ / /
* | | bugs #312, #313friendica2012-03-064-37/+35
* | | Merge branch 'pull'friendica2012-03-064-38/+94
|\| |
| * | Merge pull request #95 from simonlnu/masterSimon2012-03-062-38/+37
| |\ \ | | |/ | |/|
| | * styling fixes in dispy. fix typos in settings.tplSimon L'nu2012-03-062-38/+37
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0614-16/+155
| | |\ | | |/ | |/|