Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-05-05 | 68 | -3135/+5108 |
|\ | |||||
| * | Option to set theme width added. Minor layout changes | Christian Vogeley | 2012-05-05 | 3 | -8/+87 |
| | | |||||
| * | 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> | ||||
| * | 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 | 2 | -0/+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 |
| | | |||||
| * | 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> | ||||
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-01 | 25 | -71/+432 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 |
| | | | |||||
| | * | diabook-themes: add "last tweets"-box to right_aside, that searches for ↵ | tommy tomson | 2012-05-01 | 5 | -7/+327 |
| | | | | | | | | | | | | #friendica on twitter | ||||
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-29 | 23 | -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 |
| | | | |||||
| * | | 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 | 3 | -10/+13 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: | ||||
| | * | Diabook-dark update, it's almost useable now (if you're lenient). | Thomas Willingham | 2012-04-28 | 3 | -10/+13 |
| | | | |||||
| * | | fix #search-text | Simon L'nu | 2012-04-27 | 4 | -14/+8 |
| |/ | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | implement contact archival | friendica | 2012-04-27 | 1 | -1/+1 |
| | | |||||
| * | another attempt to fix lower tab behaviour on small screens, community back ↵ | Christian Vogeley | 2012-04-27 | 1 | -22/+24 |
| | | | | | | | | in tab area | ||||
| * | remove extra netsearch-box and fix | Simon L'nu | 2012-04-27 | 4 | -24/+14 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | fix contact-friend stuff on profile sidebar | Simon L'nu | 2012-04-27 | 4 | -12/+46 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-04-27 | 380 | -21533/+12285 |
|\| | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-27 | 4 | -20/+34 |
| |\ | |||||
| | * | fix some css errors | Simon L'nu | 2012-04-27 | 4 | -20/+34 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | put community back on the lower tab. It belongs with message streams | friendica | 2012-04-27 | 1 | -4/+3 |
| |/ | |||||
| * | fix 2 issues. contacts img in finder; wall filer title | Simon L'nu | 2012-04-27 | 5 | -1/+63 |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-26 | 1 | -5/+5 |
| |\ | |||||
| | * | fix s/color/colour/g issue | Simon L'nu | 2012-04-26 | 1 | -5/+5 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | make comment edit icons look more like base theme | friendica | 2012-04-26 | 3 | -28/+28 |
| |/ | |||||
| * | Merge pull request #267 from tomtom84/master | friendica | 2012-04-26 | 1 | -1/+6 |
| |\ | | | | | | | add link "remove account" to /mod/settings.php | ||||
| | * | diabook-themes: small-fix | tommy tomson | 2012-04-26 | 1 | -1/+6 |
| | | | |||||
| * | | announced dipsy change. re-tie your boots, we're in for a wee ride ;) | Simon L'nu | 2012-04-26 | 64 | -1515/+3857 |
| |/ | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | Merge pull request #265 from cvogeley/master | friendica | 2012-04-26 | 14 | -2/+999 |
| |\ | | | | | | | cleanzero theme added | ||||
| | * | duepuntozero: move community and manage link to upper right area + css fixes ↵ | Christian Vogeley | 2012-04-25 | 1 | -0/+71 |
| | | | | | | | | | | | | to avoid breaking of design | ||||
| | * | duepuntozero: move community and manage link to upper right area + css fixes ↵ | Christian Vogeley | 2012-04-25 | 1 | -2/+5 |
| | | | | | | | | | | | | to avoid breaking of design | ||||
| | * | added BBCODE thing in comments | Christian Vogeley | 2012-04-25 | 1 | -0/+38 |
| | | | |||||
| | * | add cleanzero theme | Christian Vogeley | 2012-04-25 | 12 | -0/+885 |
| | | | |||||
| * | | convert stylesheets to less, and compress output css | Simon L'nu | 2012-04-26 | 4 | -6353/+6793 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | Diabook-dark more CSS fixes. | Thomas Willingham | 2012-04-25 | 2 | -5/+16 |
| |/ | | | | | | | Slowly getting there. | ||||
| * | this turns out to be harder than I thought | friendica | 2012-04-25 | 2 | -2/+2 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-25 | 12 | -12/+96 |
| |\ |