| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge remote branch 'upstream/master' | zottel | 2012-05-11 | 14 | -177/+628 |
| |\ |
|
| | * | fix PM replies after autocomplete changes | friendica | 2012-05-10 | 2 | -3/+10 |
| | * | add photos to PM autocomplete, improved appearance | friendica | 2012-05-10 | 3 | -3/+401 |
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-10 | 4 | -15/+18 |
| | |\ |
|
| | | * | Merge remote-tracking branch 'origin/master' | tommy tomson | 2012-05-11 | 3 | -9/+12 |
| | | |\ |
|
| | | | * | Diabook-dark. More touchups. | Thomas Willingham | 2012-05-10 | 2 | -8/+11 |
| | | * | | diabook-theme: small fix | tommy tomson | 2012-05-11 | 2 | -7/+7 |
| | * | | | rev update | friendica | 2012-05-10 | 2 | -91/+79 |
| | | |/
| |/| |
|
| | * | | specified background image does not exist | friendica | 2012-05-10 | 1 | -1/+1 |
| | |/ |
|
| | * | diabook-theme: some fixes | tommy tomson | 2012-05-10 | 5 | -50/+55 |
| | * | priv mail autocomplete, improved contrast for darkzero, etc. | friendica | 2012-05-10 | 1 | -2/+1 |
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-10 | 20 | -56/+49 |
| | |\ |
|
| | * | | email autocomplete | friendica | 2012-05-10 | 3 | -18/+69 |
| * | | | Merge remote branch 'upstream/master' | zottel | 2012-05-10 | 23 | -118/+123 |
| |\ \ \
| | |/
| |/| |
|
| | * | | Merge remote-tracking branch 'origin/master' | tommy tomson | 2012-05-10 | 2 | -7/+13 |
| | |\ \ |
|
| | | * \ | Merge pull request #292 from simonlnu/master | Simon | 2012-05-09 | 2 | -7/+13 |
| | | |\ \
| | | |/
| | |/| |
|
| | | | * | don't make -desc so obnoxious looking | Simon L'nu | 2012-05-10 | 2 | -7/+13 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-10 | 2 | -61/+73 |
| | | | |\
| | | |/
| | |/| |
|
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-09 | 16 | -486/+650 |
| | | | |\ |
|
| | | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-07 | 14 | -360/+598 |
| | | | |\ \ |
|
| | | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-07 | 0 | -0/+0 |
| | * | | | | | diabook-theme: some css/bug-fixes | tommy tomson | 2012-05-10 | 18 | -49/+36 |
| | |/ / / / |
|
| | * | | | | rev update | friendica | 2012-05-09 | 1 | -1/+1 |
| | * | | | | rev update | friendica | 2012-05-09 | 2 | -61/+73 |
| | | |_|/
| |/| | |
|
| | * | | | send browser back to correct page (with query args) after posting | friendica | 2012-05-09 | 1 | -1/+1 |
| * | | | | Merge remote branch 'upstream/master' | zottel | 2012-05-09 | 14 | -468/+621 |
| |\| | | |
|
| | * | | | slight improvement in a couple of queries | friendica | 2012-05-08 | 3 | -8/+20 |
| | * | | | Diabook-dark - do things the right way instead of the stupid way. | Thomas Willingham | 2012-05-09 | 2 | -360/+12 |
| | * | | | Fix TinyMCE, but needs adding to theme.php | Thomas Willingham | 2012-05-09 | 1 | -0/+41 |
| | * | | | Fix jquery.fancybox, but still needs adding to theme.php | Thomas Willingham | 2012-05-09 | 1 | -0/+360 |
| | * | | | Diabook-dark cleaned up a bit. | Thomas Willingham | 2012-05-09 | 3 | -20/+5 |
| | * | | | don't provide 'show more' on remote friends in common unless there are actual... | friendica | 2012-05-08 | 2 | -2/+3 |
| | * | | | make it optional to optimize the item table after expire | friendica | 2012-05-08 | 3 | -93/+157 |
| | * | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-08 | 2 | -338/+369 |
| | |\ \ \ |
|
| | | * | | | DE update for the strings | Tobias Diekershoff | 2012-05-08 | 2 | -338/+369 |
| | * | | | | wrap private message autocomplete in an ifdef to make it easier to test/develop | friendica | 2012-05-08 | 1 | -7/+14 |
| | |/ / / |
|
| * | | | | Merge remote branch 'upstream/master' | zottel | 2012-05-08 | 15 | -377/+626 |
| |\| | | |
|
| | * | | | make mod-follow hookable (e.g. service class limits) and also begin to prepar... | friendica | 2012-05-07 | 1 | -17/+28 |
| | | |/
| |/| |
|
| | * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-07 | 5 | -127/+298 |
| | |\ \ |
|
| | | * | | diabook-themes: state of the boxes at right_aside are now stored in db, inste... | tommy tomson | 2012-05-08 | 5 | -127/+298 |
| | * | | | finished dry run - now for real test | friendica | 2012-05-07 | 1 | -1/+3 |
| | |/ / |
|
| | * | | don't throw "did not contain xml" error if it's a valid rss that doesn't have... | friendica | 2012-05-07 | 1 | -1/+1 |
| | * | | If a contact has had delivery issues in the last 15 minutes, send new posts s... | friendica | 2012-05-07 | 6 | -231/+290 |
| | * | | separate poll_interval from delivery_interval - default is the same. | friendica | 2012-05-07 | 3 | -1/+7 |
| | |/ |
|
| * | | Merge remote branch 'upstream/master' | zottel | 2012-05-07 | 40 | -611/+6304 |
| |\| |
|
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-06 | 3 | -48/+54 |
| | |\ |
|
| | | * | Merge pull request #291 from simonlnu/master | Simon | 2012-05-06 | 3 | -48/+54 |
| | | |\ |
|
| | | | * | more css tweaks. nothing major | Simon L'nu | 2012-05-07 | 3 | -48/+54 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-07 | 0 | -0/+0 |
| | | |/ |
|
| | * / | reset permissions to forum default when adding forum delivery chain | friendica | 2012-05-06 | 2 | -3/+14 |
| | |/ |
|
