| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 0 | -0/+0 |
| * | Merge pull request #167 from unary/typo | Simon | 2012-03-25 | 1 | -1/+1 |
| |\ |
|
| | * | typo datarry -> datarray | Michael Johnston | 2012-03-25 | 1 | -1/+1 |
| * | | Merge pull request #169 from simonlnu/master | Simon | 2012-03-25 | 6 | -14/+44 |
| |\ \ |
|
| | * | | add in the search box | Simon L'nu | 2012-03-25 | 6 | -13/+43 |
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 6 | -2/+22 |
| | |\ \
| |/ /
|/| | |
|
| * | | | Merge branch 'pull' | friendica | 2012-03-25 | 3 | -9/+17 |
| |\ \ \ |
|
| * | | | | theme screenshots | friendica | 2012-03-25 | 6 | -2/+22 |
| | | * | | minor fix to dispy theme.php | Simon L'nu | 2012-03-25 | 1 | -1/+1 |
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 0 | -0/+0 |
| | |/ / |
|
| | * | | Merge pull request #168 from simonlnu/master | Simon | 2012-03-25 | 1 | -1/+1 |
| | |\ \
| | |/
| |/| |
|
| | | * | urgent fix to dispy-dark theme.php | Simon L'nu | 2012-03-25 | 1 | -1/+1 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 0 | -0/+0 |
| | |/ |
|
| | * | small fixes | tommy tomson | 2012-03-25 | 2 | -8/+16 |
| |/ |
|
| * | enotify plugin hook | friendica | 2012-03-25 | 1 | -2/+24 |
| * | NOTIFY_SYSTEM | friendica | 2012-03-25 | 2 | -1/+9 |
| * | Merge pull request #166 from simonlnu/master | Simon | 2012-03-25 | 19 | -18/+455 |
| |\ |
|
| | * | dispy-dark not experimental. start implementing fpostit | Simon L'nu | 2012-03-25 | 19 | -16/+452 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 12 | -36/+152 |
| | |\
| |/
|/| |
|
| * | | Merge pull request #165 from tomtom84/master | tomtom84 | 2012-03-24 | 10 | -29/+135 |
| |\ \ |
|
| | * | | move community_pages to right_aside, fixes in css | tommy tomson | 2012-03-25 | 10 | -29/+135 |
| |/ / |
|
| * | | Merge branch 'pull' | friendica | 2012-03-24 | 8 | -38/+105 |
| |\ \ |
|
| | * \ | Merge pull request #164 from simonlnu/master | Simon | 2012-03-24 | 8 | -38/+105 |
| | |\ \ |
|
| * | | | | improved the inivitations and added a bit of sales pitch. | friendica | 2012-03-24 | 2 | -7/+17 |
| |/ / / |
|
| | | * | increase version to 1.0 for dispys \o/ | Simon L'nu | 2012-03-25 | 2 | -2/+3 |
| | |/ |
|
| | * | implement filer/file-as | Simon L'nu | 2012-03-25 | 8 | -38/+105 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 2 | -9/+15 |
| | |\
| |/
|/| |
|
| * | | bug #329 - compress the plugin list on the friendica info page | friendica | 2012-03-24 | 1 | -7/+12 |
| * | | bug #346 - add oembed maxwidth to oembed request | friendica | 2012-03-24 | 1 | -2/+3 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-24 | 42 | -122/+5673 |
| | |\
| |/
|/| |
|
| * | | prevent duplicate friend suggestions | friendica | 2012-03-24 | 2 | -1/+10 |
| * | | block filed items from deletion | friendica | 2012-03-24 | 2 | -4/+4 |
| * | | add the bang | friendica | 2012-03-24 | 1 | -2/+2 |
| * | | Merge branch 'pull' | friendica | 2012-03-24 | 4 | -4/+4 |
| |\ \ |
|
| | * | | small fix in css | tommy tomson | 2012-03-24 | 4 | -4/+4 |
| * | | | network filter is now a permission group | friendica | 2012-03-24 | 2 | -2/+16 |
| |/ / |
|
| * | | Merge pull request #163 from tomtom84/master | tomtom84 | 2012-03-24 | 20 | -94/+5443 |
| |\ \ |
|
| | * | | add right_aside to diabook-blue | tommy tomson | 2012-03-24 | 20 | -94/+5443 |
| |/ / |
|
| * | | Merge pull request #162 from tomtom84/master | tomtom84 | 2012-03-23 | 10 | -3/+19 |
| |\ \ |
|
| | * | | add connectable services to right_aside | tommy tomson | 2012-03-24 | 10 | -3/+19 |
| |/ / |
|
| * | | Merge pull request #161 from tomtom84/master | tomtom84 | 2012-03-23 | 10 | -17/+180 |
| |\ \ |
|
| | * | | add PostIt to right_aside, fixes in css | tommy tomson | 2012-03-24 | 10 | -17/+180 |
| |/ / |
|
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-23 | 43 | -127/+5589 |
| | |\
| |/
|/| |
|
| * | | Merge pull request #160 from fabrixxm/master | tomtom84 | 2012-03-23 | 5 | -223/+86 |
| |\ \ |
|
| | * | | diabook: theme.php | Fabio Comuni | 2012-03-23 | 3 | -221/+79 |
| | * | | user settings: don't show emoticons | Fabio Comuni | 2012-03-23 | 2 | -2/+7 |
| | * | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-23 | 14 | -20/+5280 |
| | |\ \
| |/ /
|/| | |
|
| * | | | fix in css right_aside | tommy tomson | 2012-03-23 | 5 | -34/+4953 |
| * | | | small fix | tommy tomson | 2012-03-23 | 1 | -1/+1 |
| * | | | Merge pull request #159 from tomtom84/master | tomtom84 | 2012-03-22 | 2 | -14/+15 |
| |\ \ \ |
|
