aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removing test exportsMichael Vogel2012-03-112-4/+4
* Missing field in database.sqlMichael Vogel2012-03-111-0/+1
* Removed changesMichael Vogel2012-03-112-19/+11
* Merge commit 'upstream/master'Michael Vogel2012-03-1162-555/+7192
|\
| * Merge pull request #123 from simonlnu/masterSimon2012-03-111-1/+1
| |\
| | * screwed up on the font-size for screen last pushSimon L'nu2012-03-111-1/+1
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-110-0/+0
| |/
| * Merge pull request #122 from simonlnu/masterSimon2012-03-112-1/+14
| |\
| | * add some '@media handheld' types for dispysSimon L'nu2012-03-112-1/+14
| * | Merge pull request #121 from simonlnu/masterSimon2012-03-111-5/+9
| |\|
| | * fix more stuffSimon L'nu2012-03-111-5/+9
| * | Merge pull request #120 from simonlnu/masterSimon2012-03-111-2/+7
| |\|
| | * fix some stuff right awaySimon L'nu2012-03-111-2/+7
| * | Merge pull request #119 from simonlnu/masterSimon2012-03-1033-13/+6144
| |\|
| | * preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!Simon L'nu2012-03-1133-13/+6144
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1115-494/+883
| | |\ | | |/ | |/|
| * | bug #328friendica2012-03-101-3/+3
| * | default the text template var on conversationsfriendica2012-03-101-0/+1
| * | bug #327 - composed private message is lost if no recip specified.friendica2012-03-102-6/+16
| * | Merge branch 'pull'friendica2012-03-1011-484/+862
| |\ \
| | * \ Merge pull request #118 from tomtom84/mastertomtom842012-03-109-11/+52
| | |\ \
| | | * | fixed login-fields, fixed. notofication.png, changed locationstommy tomson2012-03-109-11/+52
| | * | | German translationTobias Diekershoff2012-03-102-473/+810
| * | | | revupfriendica2012-03-101-1/+1
| |/ / /
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-108-2/+13
| | | |\ | | |_|/ | |/| |
| * | | Merge branch 'pull'friendica2012-03-093-1/+12
| |\ \ \
| | * \ \ Merge pull request #117 from unary/issue299friendica2012-03-093-1/+12
| | |\ \ \
| | | * | | allow user to set number of items to show on network pageMichael Johnston2012-03-093-1/+12
| | |/ / /
| * | | | spec directoryfriendica2012-03-094-0/+0
| * | | | Merge branch 'pull'friendica2012-03-0910-86/+157
| |\| | |
| * | | | revupfriendica2012-03-091-1/+1
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-090-0/+0
| | | |/ | | |/|
| | * | Merge pull request #116 from tomtom84/mastertomtom842012-03-095-0/+134
| | |\|
| | | * add js to hide nav-menus, when clicked outsidetommy tomson2012-03-095-0/+134
| | * | Merge pull request #115 from tomtom84/mastertomtom842012-03-096-86/+23
| |/| | | | |/
| | * fixes in csstommy tomson2012-03-096-86/+23
| * | recover contacts total count which got lostfriendica2012-03-091-3/+4
* | | Added config options for the item cache and the ostatus priorityMichael Vogel2012-03-111-0/+6
* | | Item cache now is one day.Michael Vogel2012-03-111-1/+1
* | | Corrected some git problemsMichael Vogel2012-03-112-89/+0
* | | Cache: item cache now has an autodelete of old files. The pages plugin now se...Michael Vogel2012-03-113-3/+17
* | | Pages: Show every community page - even from foreign servers (with caching)Michael Vogel2012-03-112-12/+61
* | | New plugin that shows community pages in the sidebarMichael Vogel2012-03-112-0/+42
* | | Caching improved.Michael Vogel2012-03-101-13/+11
* | | Enabled Caching for items. Changed color of tags in diabook.Michael Vogel2012-03-102-3/+18
* | | New config options if ostatus polling should use the priority in the contactsMichael Vogel2012-03-101-1/+4
* | | Mail: Removing signatures, gpg, unnecessary line breaksMichael Vogel2012-03-103-2/+240
* | | diabook: Moving the location between the iconsMichael Vogel2012-03-103-5/+7
* | | Merge commit 'upstream/master'Michael Vogel2012-03-09255-3476/+20733
|\| |
| * | Merge branch 'pull'friendica2012-03-097-5/+25
| |\ \