| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-03-11 | 62 | -555/+7192 |
| |\ |
|
| | * | Merge pull request #123 from simonlnu/master | Simon | 2012-03-11 | 1 | -1/+1 |
| | |\ |
|
| | | * | screwed up on the font-size for screen last push | Simon L'nu | 2012-03-11 | 1 | -1/+1 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 0 | -0/+0 |
| | |/ |
|
| | * | Merge pull request #122 from simonlnu/master | Simon | 2012-03-11 | 2 | -1/+14 |
| | |\ |
|
| | | * | add some '@media handheld' types for dispys | Simon L'nu | 2012-03-11 | 2 | -1/+14 |
| | * | | Merge pull request #121 from simonlnu/master | Simon | 2012-03-11 | 1 | -5/+9 |
| | |\| |
|
| | | * | fix more stuff | Simon L'nu | 2012-03-11 | 1 | -5/+9 |
| | * | | Merge pull request #120 from simonlnu/master | Simon | 2012-03-11 | 1 | -2/+7 |
| | |\| |
|
| | | * | fix some stuff right away | Simon L'nu | 2012-03-11 | 1 | -2/+7 |
| | * | | Merge pull request #119 from simonlnu/master | Simon | 2012-03-10 | 33 | -13/+6144 |
| | |\| |
|
| | | * | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! | Simon L'nu | 2012-03-11 | 33 | -13/+6144 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 15 | -494/+883 |
| | | |\
| | |/
| |/| |
|
| | * | | bug #328 | friendica | 2012-03-10 | 1 | -3/+3 |
| | * | | default the text template var on conversations | friendica | 2012-03-10 | 1 | -0/+1 |
| | * | | bug #327 - composed private message is lost if no recip specified. | friendica | 2012-03-10 | 2 | -6/+16 |
| | * | | Merge branch 'pull' | friendica | 2012-03-10 | 11 | -484/+862 |
| | |\ \ |
|
| | | * \ | Merge pull request #118 from tomtom84/master | tomtom84 | 2012-03-10 | 9 | -11/+52 |
| | | |\ \ |
|
| | | | * | | fixed login-fields, fixed. notofication.png, changed locations | tommy tomson | 2012-03-10 | 9 | -11/+52 |
| | | * | | | German translation | Tobias Diekershoff | 2012-03-10 | 2 | -473/+810 |
| | * | | | | revup | friendica | 2012-03-10 | 1 | -1/+1 |
| | |/ / / |
|
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-10 | 8 | -2/+13 |
| | | | |\
| | |_|/
| |/| | |
|
| | * | | | Merge branch 'pull' | friendica | 2012-03-09 | 3 | -1/+12 |
| | |\ \ \ |
|
| | | * \ \ | Merge pull request #117 from unary/issue299 | friendica | 2012-03-09 | 3 | -1/+12 |
| | | |\ \ \ |
|
| | | | * | | | allow user to set number of items to show on network page | Michael Johnston | 2012-03-09 | 3 | -1/+12 |
| | | |/ / / |
|
| | * | | | | spec directory | friendica | 2012-03-09 | 4 | -0/+0 |
| | * | | | | Merge branch 'pull' | friendica | 2012-03-09 | 10 | -86/+157 |
| | |\| | | |
|
| | * | | | | revup | friendica | 2012-03-09 | 1 | -1/+1 |
| | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-09 | 0 | -0/+0 |
| | | | |/
| | |/| |
|
| | | * | | Merge pull request #116 from tomtom84/master | tomtom84 | 2012-03-09 | 5 | -0/+134 |
| | | |\| |
|
| | | | * | add js to hide nav-menus, when clicked outside | tommy tomson | 2012-03-09 | 5 | -0/+134 |
| | | * | | Merge pull request #115 from tomtom84/master | tomtom84 | 2012-03-09 | 6 | -86/+23 |
| | |/| |
| | |/ |
|
| | | * | fixes in css | tommy tomson | 2012-03-09 | 6 | -86/+23 |
| | * | | recover contacts total count which got lost | friendica | 2012-03-09 | 1 | -3/+4 |
| * | | | Added config options for the item cache and the ostatus priority | Michael Vogel | 2012-03-11 | 1 | -0/+6 |
| * | | | Item cache now is one day. | Michael Vogel | 2012-03-11 | 1 | -1/+1 |
| * | | | Corrected some git problems | Michael Vogel | 2012-03-11 | 2 | -89/+0 |
| * | | | Cache: item cache now has an autodelete of old files. The pages plugin now se... | Michael Vogel | 2012-03-11 | 3 | -3/+17 |
| * | | | Pages: Show every community page - even from foreign servers (with caching) | Michael Vogel | 2012-03-11 | 2 | -12/+61 |
| * | | | New plugin that shows community pages in the sidebar | Michael Vogel | 2012-03-11 | 2 | -0/+42 |
| * | | | Caching improved. | Michael Vogel | 2012-03-10 | 1 | -13/+11 |
| * | | | Enabled Caching for items. Changed color of tags in diabook. | Michael Vogel | 2012-03-10 | 2 | -3/+18 |
| * | | | New config options if ostatus polling should use the priority in the contacts | Michael Vogel | 2012-03-10 | 1 | -1/+4 |
| * | | | Mail: Removing signatures, gpg, unnecessary line breaks | Michael Vogel | 2012-03-10 | 3 | -2/+240 |
| * | | | diabook: Moving the location between the icons | Michael Vogel | 2012-03-10 | 3 | -5/+7 |
| * | | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-09 | 255 | -3476/+20733 |
| |\| | |
|
| | * | | Merge branch 'pull' | friendica | 2012-03-09 | 7 | -5/+25 |
| | |\ \ |
|
| | | * \ | Merge pull request #114 from simonlnu/master | Simon | 2012-03-08 | 7 | -5/+25 |
| | | |\ \ |
|
| | | | * | | [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label... | Simon L'nu | 2012-03-09 | 7 | -5/+25 |
| | * | | | | bug #324 - tinymce used for mail even if editplain being used. | friendica | 2012-03-09 | 2 | -48/+37 |
