aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove stray debuggingfriendica2012-03-061-2/+2
* Merge branch 'pull'friendica2012-03-0612-37/+69
|\
| * 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
* | | | fix html reshares when editplain in usefriendica2012-03-061-5/+13
|/ / /
* | | search should be ok, but a little extra security won't hurtfriendica2012-03-061-1/+1
* | | 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
| | |\ | | |/ | |/|
| * | Merge pull request #93 from fabrixxm/masterfabrixxm2012-03-062-0/+57
| |\ \
| | * | quattro: theme settings (a bit hackish)Fabio Comuni2012-03-062-0/+57
| | * | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-0698-2520/+7789
| | |\ \
| | * | | template proc: add variable filtersFabio Comuni2012-03-021-5/+15
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
* | | | | revupfriendica2012-03-061-1/+1
|/ / / /
* | | | remove "smilie" expansion for Diaspora logofriendica2012-03-061-2/+2
* | | | prevent duplicate likesfriendica2012-03-061-0/+25
* | | | Merge branch 'pull'friendica2012-03-069-9/+42
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #92 from tomtom84/mastertomtom842012-03-059-9/+42
| |\ \ \ | | |_|/ | |/| |
| | * | add imgtommy tomson2012-03-061-0/+0
| | * | Merge remote-tracking branch 'origin/master'tommy tomson2012-03-0612-477/+648
| | |\ \ | | |/ / | |/| |
| | * | fixes in diabooktommy tomson2012-03-066-4/+16
| | * | fixestommy tomson2012-03-054-5/+26
* | | | finalise spam storage model, begin driver changes.friendica2012-03-051-5/+29
|/ / /
* | | Merge branch 'pull'friendica2012-03-051-1/+2
|\ \ \
| * \ \ Merge pull request #91 from unary/darkzeroSimon2012-03-051-1/+2
| |\ \ \
| | * | | changed bg color around comment box from white to match page background, impr...Michael Johnston2012-03-051-1/+2
| |/ / /
* | | | some admin page fixes and cleanupfriendica2012-03-054-6/+17
* | | | string updatefriendica2012-03-051-414/+568
|/ / /
* | | Merge branch 'pull'friendica2012-03-051-2/+2
|\ \ \
| * \ \ Merge pull request #90 from simonlnu/masterSimon2012-03-051-2/+2
| |\ \ \
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| | |\ \ \ | | |/ / / | |/| | |