aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-05-1255-776/+7168
|\
| * 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
| * 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-113-0/+97
| |/
| * fix PM replies after autocomplete changesfriendica2012-05-101-0/+4
| * Merge remote-tracking branch 'origin/master'tommy tomson2012-05-113-9/+12
| |\
| | * Diabook-dark. More touchups.Thomas Willingham2012-05-102-8/+11
| | * specified background image does not existfriendica2012-05-101-1/+1
| * | diabook-theme: small fixtommy tomson2012-05-112-7/+7
| |/
| * 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
| | |\
| | | * don't make -desc so obnoxious lookingSimon L'nu2012-05-102-7/+13
| | * | diabook-theme: some css/bug-fixestommy tomson2012-05-1018-49/+36
| | |/
| * / email autocompletefriendica2012-05-102-1/+45
| |/
| * 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-081-1/+1
| * DE update for the stringsTobias Diekershoff2012-05-082-338/+369
| * diabook-themes: state of the boxes at right_aside are now stored in db, inste...tommy tomson2012-05-085-127/+298
| * separate poll_interval from delivery_interval - default is the same.friendica2012-05-071-0/+1
| * more css tweaks. nothing majorSimon L'nu2012-05-073-48/+54
| * 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
| |\
| | * fixing widths to be more dynamic where possible. font size fixes. add README.mdSimon L'nu2012-05-068-185/+320
| * | diabook-theme: bugfixtommy tomson2012-05-061-18/+34
| |/
| * diabook-theme: small fixtommy tomson2012-05-061-2/+2
| * diabook-theme: twitter-box-update at right_asidetommy tomson2012-05-063-5/+34
| * diabook-theme: can now set the twitter search term in theme-settings & small ...tommy tomson2012-05-058-33/+4013
* | Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-05-0599-5410/+7641
|\|
| * Merge pull request #289 from cvogeley/masterfriendica2012-05-053-8/+87
| |\
| | * Option to set theme width added. Minor layout changesChristian Vogeley2012-05-053-8/+87
| * | DE: new email templates translatedTobias Diekershoff2012-05-052-28/+27
| |/
| * fix lightbox; finished dark, now on to lightSimon L'nu2012-05-046-787/+795
| * Esperanto 100%Martin Schmitt2012-05-042-656/+876
| * "show more" friends in commonfriendica2012-05-042-2/+2
| * DE stringsTobias Diekershoff2012-05-042-621/+847
| * implement max load average before queuing/deferring delivery and poller proce...friendica2012-05-031-0/+1