aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-05-1280-1204/+8689
|\
| * Darkzero - fixed notifications bar.Thomas Willingham2012-05-121-0/+14
| * diabook-theme: update mapquery and small fixtommy tomson2012-05-115-158/+596
| * diabook-theme: add "population density 2010"-layer to EarthLayers-boxtommy tomson2012-05-115-16/+448
| * fix search/new against possible email leakagefriendica2012-05-111-0/+3
| * better test of email reply visibilityfriendica2012-05-112-3/+3
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-112-1/+63
| |\
| | * diabook-theme:small fixtommy tomson2012-05-112-1/+63
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-05-112-81/+41
| |\|
| | * diabook-theme: small fixtommy tomson2012-05-111-81/+1
| | * diabook-theme: include prv_message autocompletetommy tomson2012-05-111-0/+40
| * | moderated comment templatesfriendica2012-05-115-0/+112
| |/
| * 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
| |\
| | * 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 lookingSimon L'nu2012-05-102-7/+13
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-102-61/+73
| | | | |\ | | | | |/ | | | |/|
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0916-486/+650
| | | | |\
| | | | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0714-360/+598
| | | | |\ \
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-070-0/+0
| | * | | | | diabook-theme: some css/bug-fixestommy tomson2012-05-1018-49/+36
| | |/ / / /
| * / / / / email autocompletefriendica2012-05-103-18/+69
| |/ / / /
| * | | | 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
| * | | 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 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