Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 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> | ||||
* | Esperanto 100% | Martin Schmitt | 2012-05-04 | 2 | -656/+876 |
| | |||||
* | "show more" friends in common | friendica | 2012-05-04 | 2 | -2/+2 |
| | |||||
* | DE strings | Tobias Diekershoff | 2012-05-04 | 2 | -621/+847 |
| | |||||
* | implement max load average before queuing/deferring delivery and poller ↵ | friendica | 2012-05-03 | 1 | -0/+1 |
| | | | | processes | ||||
* | proofreading the mail templates in fr | Ludovic Grossard | 2012-05-03 | 14 | -60/+64 |
| | | | | fixed typo, grammar, spelling… | ||||
* | forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv ↵ | Simon L'nu | 2012-05-03 | 2 | -1/+3 |
| | | | | | | (which it includes) Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | major reworking of dispy dark. light to follow | Simon L'nu | 2012-05-03 | 10 | -1927/+3304 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | 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 | 3 | -1/+9 |
| | | | | | | | | | I mistakenly added this <meta> tag to the global header, but it causes problems for other themes, as they have other optimal widths. I also added a style to diabook which makes the jGrowl messages appear below the header bar, so you can still click the menu items without having to close messages first. | ||||
* | diabook-themes: more improvements in theme.php, add titles to bbcode under ↵ | tommy tomson | 2012-05-02 | 4 | -28/+47 |
| | | | | coment-box | ||||
* | 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 |
| | |||||
* | fix size | friendica | 2012-05-01 | 1 | -1/+1 |
| | |||||
* | add template | friendica | 2012-05-01 | 1 | -0/+21 |
| | |||||
* | first try common friends for visitors | friendica | 2012-05-01 | 1 | -1/+1 |
| | |||||
* | More Diabook-dark touch-ups. Should *really* be useable this time...with ↵ | Thomas Willingham | 2012-05-01 | 2 | -5/+7 |
| | | | | editplain anyway. | ||||
* | diabook-themes: small fix at "community pages"-box | tommy tomson | 2012-05-01 | 2 | -6/+6 |
| | |||||
* | lighten bg and darken font on dispy light | Simon L'nu | 2012-05-01 | 2 | -9/+11 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | sub-minor change to head.tpl | Simon L'nu | 2012-05-01 | 1 | -1/+1 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-01 | 26 | -71/+433 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: add "community profiles"-box to right_column change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter rev update start adding tooltips to tab menus fix join group notifications * master: | ||||
| * | diabook-themes: add "community profiles"-box to right_column | tommy tomson | 2012-05-01 | 22 | -69/+110 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-30 | 5 | -7/+327 |
| |\ | |||||
| | * | diabook-themes: add "last tweets"-box to right_aside, that searches for ↵ | tommy tomson | 2012-05-01 | 5 | -7/+327 |
| | | | | | | | | | | | | #friendica on twitter | ||||
| * | | make 'aaa joined group bbb' work from the initiating end, new privacy pref ↵ | friendica | 2012-04-30 | 1 | -0/+1 |
| |/ | | | | | | | | | | | to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages | ||||
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-30 | 9 | -1652/+1434 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: provide "xxx joined yyy" notifications adding META viewport tag for better look on tablets Update Esperanto to 100% DE update to the strings activitystreams schema constants for "join group" missed a db field typo in profile_selectors, fix remote tagging not all profile selector choices have unique or direct translations log db error strings in all cases admin page to manage failed updates improved db error logging close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw) * master: | ||||
| * | Merge pull request #277 from mschmitt/master | friendica | 2012-04-30 | 2 | -784/+649 |
| |\ | | | | | | | Update Esperanto to 100% | ||||
| | * | Update Esperanto to 100% | Martin Schmitt | 2012-04-30 | 2 | -784/+649 |
| | | | |||||
| * | | adding META viewport tag for better look on tablets | Max Weller | 2012-04-30 | 1 | -0/+1 |
| |/ | |||||
| * | DE update to the strings | Tobias Diekershoff | 2012-04-30 | 4 | -868/+766 |
| | | |||||
| * | admin page to manage failed updates | friendica | 2012-04-29 | 2 | -0/+18 |
| | | |||||
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-29 | 24 | -98/+126 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: the heart should really be red. fix location change notification enhanced profile reporting for single values add db field for removed account, which will also be the first test of update error checking toggle to archive unfriends, though render them useless indicate successful updates diabook-themes: small fix diabook-themes: bug/css-fixes some constants for the db update failure possibilities bring back the email and logging of update failures, but without the transactions * master: | ||||
| * | 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 |
| | | |||||
| * | bring back the email and logging of update failures, but without the ↵ | friendica | 2012-04-28 | 1 | -0/+0 |
| | | | | | | | | transactions | ||||
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-28 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | * remotes/upstream/master: a few more continues that should be returns small bugfix. sometimes also avatar pics were rescaled * master: | ||||
| * | small bugfix. sometimes also avatar pics were rescaled | Christian Vogeley | 2012-04-28 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-28 | 6 | -11/+16 |
|\| | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: break up poller into separate processes add tooltip title to common_tabs PRIVACY: if wall is blocked, don't provide public keywords in HTML meta Diabook-dark update, it's almost useable now (if you're lenient). Added "important changes" to admin menu for admins who don't follow the github properly. * master: | ||||
| * | break up poller into separate processes | friendica | 2012-04-27 | 1 | -0/+1 |
| | |