Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-05-12 | 12 | -6179/+3648 |
|\ | |||||
| * | 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 |
| | | |||||
| * | finished migrating dispy light - maybe | Simon L'nu | 2012-05-12 | 8 | -6152/+3105 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-05-12 | 55 | -776/+7168 |
|\| | |||||
| * | Darkzero - fixed notifications bar. | Thomas Willingham | 2012-05-12 | 1 | -0/+14 |
| | | |||||
| * | 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 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-11 | 2 | -1/+63 |
| |\ | |||||
| | * | diabook-theme:small fix | tommy tomson | 2012-05-11 | 2 | -1/+63 |
| | | | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-11 | 2 | -81/+41 |
| |\| | |||||
| | * | 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 |
| | | | |||||
| * | | moderated comment templates | friendica | 2012-05-11 | 3 | -0/+97 |
| |/ | |||||
| * | fix PM replies after autocomplete changes | friendica | 2012-05-10 | 1 | -0/+4 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' | tommy tomson | 2012-05-11 | 3 | -9/+12 |
| |\ | |||||
| | * | Diabook-dark. More touchups. | Thomas Willingham | 2012-05-10 | 2 | -8/+11 |
| | | | |||||
| | * | specified background image does not exist | friendica | 2012-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | diabook-theme: small fix | tommy tomson | 2012-05-11 | 2 | -7/+7 |
| |/ | |||||
| * | diabook-theme: some fixes | tommy tomson | 2012-05-10 | 5 | -50/+55 |
| | | |||||
| * | priv mail autocomplete, improved contrast for darkzero, etc. | friendica | 2012-05-10 | 1 | -2/+1 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-10 | 20 | -56/+49 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/master' | tommy tomson | 2012-05-10 | 2 | -7/+13 |
| | |\ | |||||
| | | * | don't make -desc so obnoxious looking | Simon L'nu | 2012-05-10 | 2 | -7/+13 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | diabook-theme: some css/bug-fixes | tommy tomson | 2012-05-10 | 18 | -49/+36 |
| | |/ | |||||
| * / | email autocomplete | friendica | 2012-05-10 | 2 | -1/+45 |
| |/ | |||||
| * | 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 |
| | | |||||
| * | don't provide 'show more' on remote friends in common unless there are ↵ | friendica | 2012-05-08 | 1 | -1/+1 |
| | | | | | | | | actually more | ||||
| * | DE update for the strings | Tobias Diekershoff | 2012-05-08 | 2 | -338/+369 |
| | | |||||
| * | diabook-themes: state of the boxes at right_aside are now stored in db, ↵ | tommy tomson | 2012-05-08 | 5 | -127/+298 |
| | | | | | | | | instead of cookie. | ||||
| * | separate poll_interval from delivery_interval - default is the same. | friendica | 2012-05-07 | 1 | -0/+1 |
| | | |||||
| * | more css tweaks. nothing major | Simon L'nu | 2012-05-07 | 3 | -48/+54 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | 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 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' | tommy tomson | 2012-05-06 | 8 | -185/+320 |
| |\ | |||||
| | * | fixing widths to be more dynamic where possible. font size fixes. add README.md | Simon L'nu | 2012-05-06 | 8 | -185/+320 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | 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 |
| | | | | | | | | fixes | ||||
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-05-05 | 99 | -5410/+7641 |
|\| | |||||
| * | Merge pull request #289 from cvogeley/master | friendica | 2012-05-05 | 3 | -8/+87 |
| |\ | | | | | | | Option to set theme width added. Minor layout changes | ||||
| | * | Option to set theme width added. Minor layout changes | Christian Vogeley | 2012-05-05 | 3 | -8/+87 |
| | | | |||||
| * | | DE: new email templates translated | Tobias Diekershoff | 2012-05-05 | 2 | -28/+27 |
| |/ | |||||
| * | fix lightbox; finished dark, now on to light | Simon L'nu | 2012-05-04 | 6 | -787/+795 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> |