| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-04 | 4 | -22/+34 |
|\ |
|
| * | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-25 | 2 | -4/+5 |
| |\ |
|
| | * | Diabook-dark - some more cleaning up | Thomas Willingham | 2012-05-19 | 2 | -4/+5 |
| * | | Performance tests | Michael Vogel | 2012-05-20 | 1 | -0/+5 |
| |/ |
|
| * | diabook-theme: small fixes | tommy tomson | 2012-05-13 | 2 | -18/+24 |
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-05-12 | 4 | -27/+543 |
|\| |
|
| * | diabook-theme: fix in earthlayers | tommy tomson | 2012-05-12 | 3 | -29/+26 |
| * | diabook-theme: some fixes | tommy tomson | 2012-05-12 | 3 | -0/+519 |
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-05-12 | 36 | -202/+6257 |
|\| |
|
| * | diabook-theme: update mapquery and small fix | tommy tomson | 2012-05-11 | 5 | -158/+596 |
| * | diabook-theme: add "population density 2010"-layer to EarthLayers-box | tommy tomson | 2012-05-11 | 5 | -16/+448 |
| * | diabook-theme:small fix | tommy tomson | 2012-05-11 | 2 | -1/+63 |
| * | diabook-theme: small fix | tommy tomson | 2012-05-11 | 1 | -81/+1 |
| * | diabook-theme: include prv_message autocomplete | tommy tomson | 2012-05-11 | 1 | -0/+40 |
| * | Merge remote-tracking branch 'origin/master' | tommy tomson | 2012-05-11 | 2 | -8/+11 |
| |\ |
|
| | * | Diabook-dark. More touchups. | Thomas Willingham | 2012-05-10 | 2 | -8/+11 |
| * | | diabook-theme: small fix | tommy tomson | 2012-05-11 | 2 | -7/+7 |
| |/ |
|
| * | diabook-theme: some fixes | tommy tomson | 2012-05-10 | 5 | -50/+55 |
| * | diabook-theme: some css/bug-fixes | tommy tomson | 2012-05-10 | 18 | -49/+36 |
| * | 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 |
| * | diabook-themes: state of the boxes at right_aside are now stored in db, inste... | tommy tomson | 2012-05-08 | 5 | -127/+298 |
| * | diabook-theme: small fix | tommy tomson | 2012-05-07 | 1 | -1/+1 |
| * | diabook-theme: add "Earth Layers"-box at right_side | tommy tomson | 2012-05-07 | 6 | -24/+269 |
| * | diabook-theme: twitterbox-bugfix | tommy tomson | 2012-05-06 | 6 | -15/+701 |
| * | diabook: small fix | tommy tomson | 2012-05-06 | 1 | -5/+8 |
| * | diabook-theme: bugfix | tommy tomson | 2012-05-06 | 1 | -18/+34 |
| * | diabook-theme: small fix | tommy tomson | 2012-05-06 | 1 | -2/+2 |
| * | diabook-theme: twitter-box-update at right_aside | tommy tomson | 2012-05-06 | 3 | -5/+34 |
| * | diabook-theme: can now set the twitter search term in theme-settings & small ... | tommy tomson | 2012-05-05 | 8 | -33/+4013 |
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-05-05 | 48 | -567/+1052 |
|\| |
|
| * | diabook-theme: small fix | tommy tomson | 2012-05-03 | 2 | -2/+4 |
| * | diabook-theme: small fix | tommy tomson | 2012-05-03 | 1 | -0/+1 |
| * | diabook-theme: made boxes at right_aside sortable | tommy tomson | 2012-05-03 | 29 | -57/+122 |
| * | Moved Meta Viewport from global head.tpl to diabook's header | Max Weller | 2012-05-02 | 2 | -0/+9 |
| * | diabook-themes: more improvements in theme.php, add titles to bbcode under co... | tommy tomson | 2012-05-02 | 4 | -28/+47 |
| * | diabook-theme: tryied to improve performance a bit | tommy tomson | 2012-05-02 | 2 | -377/+370 |
| * | diabook-theme: fix footer/impressum | tommy tomson | 2012-05-02 | 1 | -1/+3 |
| * | More Diabook-dark touch-ups. Should *really* be useable this time...with edi... | Thomas Willingham | 2012-05-01 | 2 | -5/+7 |
| * | diabook-themes: small fix at "community pages"-box | tommy tomson | 2012-05-01 | 2 | -6/+6 |
| * | diabook-themes: add "community profiles"-box to right_column | tommy tomson | 2012-05-01 | 22 | -69/+110 |
| * | diabook-themes: add "last tweets"-box to right_aside, that searches for #frie... | tommy tomson | 2012-05-01 | 5 | -7/+327 |
| * | diabook-themes: small fix | tommy tomson | 2012-04-29 | 2 | -2/+2 |
| * | diabook-themes: bug/css-fixes | tommy tomson | 2012-04-29 | 23 | -98/+126 |
| * | Diabook-dark update, it's almost useable now (if you're lenient). | Thomas Willingham | 2012-04-28 | 3 | -10/+13 |
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-04-27 | 285 | -13821/+291 |
|\| |
|
| * | diabook-themes: small-fix | tommy tomson | 2012-04-26 | 1 | -1/+6 |
| * | Diabook-dark more CSS fixes. | Thomas Willingham | 2012-04-25 | 2 | -5/+16 |