aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* don't make -desc so obnoxious lookingSimon L'nu2012-05-102-7/+13
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-102-61/+73
|\
| * rev updatefriendica2012-05-091-1/+1
| * rev updatefriendica2012-05-092-61/+73
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0916-486/+650
|\|
| * send browser back to correct page (with query args) after postingfriendica2012-05-091-1/+1
| * 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 actual...friendica2012-05-082-2/+3
| * 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
| |/
| * make mod-follow hookable (e.g. service class limits) and also begin to prepar...friendica2012-05-071-17/+28
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0714-360/+598
|\|
| * 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, inste...tommy tomson2012-05-085-127/+298
| * | 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 have...friendica2012-05-071-1/+1
| * If a contact has had delivery issues in the last 15 minutes, send new posts s...friendica2012-05-076-231/+290
| * separate poll_interval from delivery_interval - default is the same.friendica2012-05-073-1/+7
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-070-0/+0
|/
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-063-48/+54
|\
| * Merge pull request #291 from simonlnu/masterSimon2012-05-063-48/+54
| |\
| | * more css tweaks. nothing majorSimon L'nu2012-05-073-48/+54
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-070-0/+0
| |/
* / reset permissions to forum default when adding forum delivery chainfriendica2012-05-062-3/+14
|/
* Merge branch 'ac'friendica2012-05-067-14/+454
|\
| * I'll leave the private mail recipient autocomplete partially done. Need a goo...friendica2012-05-061-3/+10
| * mail autcomplete testingfriendica2012-05-067-15/+448
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-0618-236/+1321
|\ \ | |/ |/|
| * diabook-theme: small fixtommy tomson2012-05-071-1/+1
| * diabook-theme: add "Earth Layers"-box at right_sidetommy tomson2012-05-076-24/+269
| * diabook-theme: twitterbox-bugfixtommy tomson2012-05-066-15/+701
| * diabook: small fixtommy tomson2012-05-061-5/+8
| * Merge remote-tracking branch 'origin/master'tommy tomson2012-05-068-185/+320
| |\
| | * Merge pull request #290 from simonlnu/masterSimon2012-05-068-185/+320
| | |\
| | | * fixing widths to be more dynamic where possible. font size fixes. add README.mdSimon L'nu2012-05-068-185/+320
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-063-25/+29
| | | |\ | | | |/ | | |/|
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0517-262/+4358
| | | |\
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-040-0/+0
| * | | | diabook-theme: bugfixtommy tomson2012-05-061-18/+34
| |/ / /
* | | | email recip autocompletefriendica2012-05-061-0/+25
* | | | rev updatefriendica2012-05-062-79/+105
|/ / /
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-058-37/+4046
|\ \ \ | | |/ | |/|
| * | diabook-theme: small fixtommy tomson2012-05-061-2/+2
| * | diabook-theme: twitter-box-update at right_asidetommy tomson2012-05-063-5/+34