aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-0759-661/+1213
|\
| * Merge pull request #103 from tomtom84/mastertomtom842012-03-062-3/+8
| |\ | | | | | | fixes in theme diabook
| | * fix in navbartommy tomson2012-03-072-3/+8
| | |
| * | fix photos after permissions_sql changefriendica2012-03-063-6/+78
| | |
| * | Merge branch 'pull'friendica2012-03-0623-2/+6
| |\ \
| | * \ Merge pull request #102 from beardy-unixer/masterSimon2012-03-0618-0/+0
| | |\ \ | | | | | | | | | | Improved transparency smileys
| | | * \ Merge remote-tracking branch 'upstream/master'Thomas2012-03-0618-222/+359
| | | |\ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: images/smiley-beard.png
| | * | | Merge pull request #101 from tomtom84/mastertomtom842012-03-061-0/+4
| | |\ \ \ | | | | | | | | | | | | fixes in theme diabook
| | | * | | fix in navbartommy tomson2012-03-071-0/+4
| | | | |/ | | | |/|
| | * | | Merge pull request #100 from simonlnu/masterSimon2012-03-065-2/+2
| | |\ \ \ | | | | | | | | | | | | fix up the beards so text.php has the right smiley- prefix for them. make one of them transparent and .png
| | | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-066-7/+15
| | | |\ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix html reshares when editplain in use * master:
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0613-38/+70
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: search should be ok, but a little extra security won't hurt messages-menu translation, add scroll-to-top and theme-bug-report in theme Fixed...merged with mainline THEN added beards. added beard smileys doc/Account-Basics.md doc/Account-Basics.md a doc/Remove-Account.md doc/Making-Friends.md doc/Bugs-and-Issues.md doc/Account-Basics.md * master:
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: string update [PRIVACY] privacy issue bug #314 * master:
| | | | | | * improved smiley transparencyThomas2012-03-0620-2/+2
| | | | | | |
| * | | | | | [privacy] rework latest fixfriendica2012-03-062-4/+3
| | | | | | |
| * | | | | | 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
| | |\ \ \ \ | | | | |_|/ | | | |/| | Documentation changes
| | | * | | 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
| | |\ \ \ \ | | | | |_|/ | | | |/| | fixes in theme diabook
| | | * | | 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
| | |\ \ \ | | | | | | | | | | | | missed some fixes on last request
| | | * | | dispy, dispy, oh what a little lispySimon L'nu2012-03-061-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bugs #312, #313 revup * master:
| * | | | | 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; typos fixed in settings.tpl
| | | * styling fixes in dispy. fix typos in settings.tplSimon L'nu2012-03-062-38/+37
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0614-16/+155
| | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: remove "smilie" expansion for Diaspora logo prevent duplicate likes quattro: theme settings (a bit hackish) add img fixes in diabook finalise spam storage model, begin driver changes. fixes template proc: add variable filters * master:
| | * | Merge pull request #93 from fabrixxm/masterfabrixxm2012-03-062-0/+57
| | |\ \ | | | | | | | | | | quattro: theme settings
| | | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: some admin page fixes and cleanup changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero) string update some testbubble stuff can_write_wall documentation * master:
| * | | | | revupfriendica2012-03-061-1/+1
| |/ / / /
| * | | | remove "smilie" expansion for Diaspora logofriendica2012-03-061-2/+2
| | | | |
| * | | | prevent duplicate likesfriendica2012-03-061-0/+25
| | | | |