aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #166 from simonlnu/masterSimon2012-03-2519-18/+455
|\
| * dispy-dark not experimental. start implementing fpostitSimon L'nu2012-03-2519-16/+452
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2512-36/+152
| |\ | |/ |/|
* | Merge pull request #165 from tomtom84/mastertomtom842012-03-2410-29/+135
|\ \
| * | move community_pages to right_aside, fixes in csstommy tomson2012-03-2510-29/+135
|/ /
* | Merge branch 'pull'friendica2012-03-248-38/+105
|\ \
| * \ Merge pull request #164 from simonlnu/masterSimon2012-03-248-38/+105
| |\ \
* | | | improved the inivitations and added a bit of sales pitch.friendica2012-03-242-7/+17
|/ / /
| | * increase version to 1.0 for dispys \o/Simon L'nu2012-03-252-2/+3
| |/
| * implement filer/file-asSimon L'nu2012-03-258-38/+105
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-252-9/+15
| |\ | |/ |/|
* | bug #329 - compress the plugin list on the friendica info pagefriendica2012-03-241-7/+12
* | bug #346 - add oembed maxwidth to oembed requestfriendica2012-03-241-2/+3
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2442-122/+5673
| |\ | |/ |/|
* | prevent duplicate friend suggestionsfriendica2012-03-242-1/+10
* | block filed items from deletionfriendica2012-03-242-4/+4
* | add the bangfriendica2012-03-241-2/+2
* | Merge branch 'pull'friendica2012-03-244-4/+4
|\ \
| * | small fix in csstommy tomson2012-03-244-4/+4
* | | network filter is now a permission groupfriendica2012-03-242-2/+16
|/ /
* | Merge pull request #163 from tomtom84/mastertomtom842012-03-2420-94/+5443
|\ \
| * | add right_aside to diabook-bluetommy tomson2012-03-2420-94/+5443
|/ /
* | Merge pull request #162 from tomtom84/mastertomtom842012-03-2310-3/+19
|\ \
| * | add connectable services to right_asidetommy tomson2012-03-2410-3/+19
|/ /
* | Merge pull request #161 from tomtom84/mastertomtom842012-03-2310-17/+180
|\ \
| * | add PostIt to right_aside, fixes in csstommy tomson2012-03-2410-17/+180
|/ /
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2343-127/+5589
| |\ | |/ |/|
* | Merge pull request #160 from fabrixxm/mastertomtom842012-03-235-223/+86
|\ \
| * | diabook: theme.phpFabio Comuni2012-03-233-221/+79
| * | user settings: don't show emoticonsFabio Comuni2012-03-232-2/+7
| * | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-2314-20/+5280
| |\ \ | |/ / |/| |
* | | fix in css right_asidetommy tomson2012-03-235-34/+4953
* | | small fixtommy tomson2012-03-231-1/+1
* | | Merge pull request #159 from tomtom84/mastertomtom842012-03-222-14/+15
|\ \ \
| * | | fix 1024resolutiontommy tomson2012-03-232-14/+15
|/ / /
* | | Merge pull request #158 from tomtom84/masterfriendica2012-03-226-11/+329
|\ \ \
| * | | add right_aside to theme diabooktommy tomson2012-03-236-11/+329
|/ / /
* | | ability to change tags in edited postsfriendica2012-03-225-14/+36
| * | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-22394-10588/+22262
| |\ \ | |/ / |/| |
* | | Merge branch 'pull'friendica2012-03-224-7/+52
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-223-4/+246
| |\ \ \
| * | | | quattro(-green) styling the 'filed under: remove' textTobias Diekershoff2012-03-224-7/+52
* | | | | normalise comparison link on delegation pagefriendica2012-03-221-1/+1
| |/ / / |/| | |
* | | | Merge pull request #157 from campino/masterfriendica2012-03-223-4/+246
|\ \ \ \ | |/ / / |/| | |
| * | | new lines removedAlexander Kampmann2012-03-222-1/+2
| * | | removed some new lines to cut down number of changed filesAlexander Kampmann2012-03-223-2/+1
| * | | removed unneccessary stuffAlexander Kampmann2012-03-222-23/+0
| * | | Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-22498-11542/+24259
| |\ \ \
| * | | | removed problem from previous commitAlexander Kampmann2012-03-221-3/+0
| * | | | tests for the template engineAlexander Kampmann2012-03-222-1/+225