aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-05-1114-177/+628
|\
| * fix PM replies after autocomplete changesfriendica2012-05-102-3/+10
| |
| * add photos to PM autocomplete, improved appearancefriendica2012-05-103-3/+401
| |
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-104-15/+18
| |\
| | * Merge remote-tracking branch 'origin/master'tommy tomson2012-05-113-9/+12
| | |\
| | | * Diabook-dark. More touchups.Thomas Willingham2012-05-102-8/+11
| | | |
| | * | diabook-theme: small fixtommy tomson2012-05-112-7/+7
| | | |
| * | | rev updatefriendica2012-05-102-91/+79
| | |/ | |/|
| * | specified background image does not existfriendica2012-05-101-1/+1
| |/
| * diabook-theme: some fixestommy tomson2012-05-105-50/+55
| |
| * priv mail autocomplete, improved contrast for darkzero, etc.friendica2012-05-101-2/+1
| |
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-1020-56/+49
| |\
| * | email autocompletefriendica2012-05-103-18/+69
| | |
* | | Merge remote branch 'upstream/master'zottel2012-05-1023-118/+123
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/master'tommy tomson2012-05-102-7/+13
| |\ \
| | * \ Merge pull request #292 from simonlnu/masterSimon2012-05-092-7/+13
| | |\ \ | | | |/ | | |/| don't make -desc so obnoxious looking
| | | * don't make -desc so obnoxious lookingSimon L'nu2012-05-102-7/+13
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-102-61/+73
| | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: rev update rev update * master:
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0916-486/+650
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: send browser back to correct page (with query args) after posting slight improvement in a couple of queries Diabook-dark - do things the right way instead of the stupid way. Fix TinyMCE, but needs adding to theme.php Fix jquery.fancybox, but still needs adding to theme.php Diabook-dark cleaned up a bit. don't provide 'show more' on remote friends in common unless there are actually more make it optional to optimize the item table after expire wrap private message autocomplete in an ifdef to make it easier to test/develop DE update for the strings make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation * master:
| | | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0714-360/+598
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: finished dry run - now for real test diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie. don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of stuck processes trying to connect with dead or dying servers significantly. separate poll_interval from delivery_interval - default is the same. * master:
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: reset permissions to forum default when adding forum delivery chain * master:
| * | | | | diabook-theme: some css/bug-fixestommy tomson2012-05-1018-49/+36
| |/ / / /
| * | | | rev updatefriendica2012-05-091-1/+1
| | | | |
| * | | | rev updatefriendica2012-05-092-61/+73
| | |_|/ | |/| |
| * | | send browser back to correct page (with query args) after postingfriendica2012-05-091-1/+1
| | | |
* | | | Merge remote branch 'upstream/master'zottel2012-05-0914-468/+621
|\| | |
| * | | slight improvement in a couple of queriesfriendica2012-05-083-8/+20
| | | |
| * | | Diabook-dark - do things the right way instead of the stupid way.Thomas Willingham2012-05-092-360/+12
| | | |
| * | | Fix TinyMCE, but needs adding to theme.phpThomas Willingham2012-05-091-0/+41
| | | |
| * | | Fix jquery.fancybox, but still needs adding to theme.phpThomas Willingham2012-05-091-0/+360
| | | |
| * | | Diabook-dark cleaned up a bit.Thomas Willingham2012-05-093-20/+5
| | | |
| * | | don't provide 'show more' on remote friends in common unless there are ↵friendica2012-05-082-2/+3
| | | | | | | | | | | | | | | | actually more
| * | | make it optional to optimize the item table after expirefriendica2012-05-083-93/+157
| | | |
| * | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-082-338/+369
| |\ \ \
| | * | | DE update for the stringsTobias Diekershoff2012-05-082-338/+369
| | | | |
| * | | | wrap private message autocomplete in an ifdef to make it easier to test/developfriendica2012-05-081-7/+14
| |/ / /
* | | | Merge remote branch 'upstream/master'zottel2012-05-0815-377/+626
|\| | |
| * | | make mod-follow hookable (e.g. service class limits) and also begin to ↵friendica2012-05-071-17/+28
| | |/ | |/| | | | | | | prepare it for functionalisation
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-05-075-127/+298
| |\ \
| | * | diabook-themes: state of the boxes at right_aside are now stored in db, ↵tommy tomson2012-05-085-127/+298
| | | | | | | | | | | | | | | | instead of cookie.
| * | | finished dry run - now for real testfriendica2012-05-071-1/+3
| |/ /
| * | don't throw "did not contain xml" error if it's a valid rss that doesn't ↵friendica2012-05-071-1/+1
| | | | | | | | | | | | have the <?xml declaration
| * | If a contact has had delivery issues in the last 15 minutes, send new posts ↵friendica2012-05-076-231/+290
| | | | | | | | | | | | | | | | | | | | | straight to the queue and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of stuck processes trying to connect with dead or dying servers significantly.
| * | separate poll_interval from delivery_interval - default is the same.friendica2012-05-073-1/+7
| |/
* | Merge remote branch 'upstream/master'zottel2012-05-0740-611/+6304
|\|
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-063-48/+54
| |\
| | * Merge pull request #291 from simonlnu/masterSimon2012-05-063-48/+54
| | |\ | | | | | | | | minor css tweaks
| | | * more css tweaks. nothing majorSimon L'nu2012-05-073-48/+54
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-070-0/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off. mail autcomplete testing email recip autocomplete rev update diabook-theme: small fix diabook-theme: add "Earth Layers"-box at right_side diabook-theme: twitterbox-bugfix diabook: small fix diabook-theme: bugfix * master:
| * / reset permissions to forum default when adding forum delivery chainfriendica2012-05-062-3/+14
| |/