| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-01 | 26 | -71/+433 |
|\ |
|
| * | 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 #frie... | tommy tomson | 2012-05-01 | 5 | -7/+327 |
| * | | make 'aaa joined group bbb' work from the initiating end, new privacy pref to... | friendica | 2012-04-30 | 1 | -0/+1 |
| |/ |
|
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-30 | 9 | -1652/+1434 |
|\| |
|
| * | Merge pull request #277 from mschmitt/master | friendica | 2012-04-30 | 2 | -784/+649 |
| |\ |
|
| | * | 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 |
|\| |
|
| * | 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 transact... | friendica | 2012-04-28 | 1 | -0/+0 |
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-28 | 1 | -1/+1 |
|\| |
|
| * | 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 |
|\| |
|
| * | break up poller into separate processes | friendica | 2012-04-27 | 1 | -0/+1 |
| * | add tooltip title to common_tabs | friendica | 2012-04-27 | 1 | -1/+1 |
| * | Diabook-dark update, it's almost useable now (if you're lenient). | Thomas Willingham | 2012-04-28 | 3 | -10/+13 |
| * | Added "important changes" to admin menu for admins who don't follow | Thomas Willingham | 2012-04-28 | 1 | -0/+1 |
* | | fix #search-text | Simon L'nu | 2012-04-27 | 4 | -14/+8 |
|/ |
|
* | implement contact archival | friendica | 2012-04-27 | 2 | -1/+4 |
* | another attempt to fix lower tab behaviour on small screens, community back i... | Christian Vogeley | 2012-04-27 | 1 | -22/+24 |
* | remove extra netsearch-box and fix | Simon L'nu | 2012-04-27 | 4 | -24/+14 |
* | fix contact-friend stuff on profile sidebar | Simon L'nu | 2012-04-27 | 4 | -12/+46 |
* | 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 |
* | | put community back on the lower tab. It belongs with message streams | friendica | 2012-04-27 | 1 | -4/+3 |
|/ |
|
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-27 | 5 | -1/+63 |
|\ |
|
| * | fix 2 issues. contacts img in finder; wall filer title | Simon L'nu | 2012-04-27 | 5 | -1/+63 |
* | | fix view contacts | friendica | 2012-04-27 | 1 | -1/+1 |
|/ |
|
* | reset qcomment selector after insert. | friendica | 2012-04-26 | 1 | -0/+1 |
* | put fakelink back in birthday notice | friendica | 2012-04-26 | 1 | -1/+1 |
* | birthday contact link goes to event page instead of remote profile | friendica | 2012-04-26 | 1 | -1/+1 |
* | 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 |
* | | 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 |
|\ |
|
| * | 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 |
|/ |
|
* | Merge pull request #265 from cvogeley/master | friendica | 2012-04-26 | 14 | -2/+999 |
|\ |
|
| * | duepuntozero: move community and manage link to upper right area + css fixes ... | Christian Vogeley | 2012-04-25 | 1 | -0/+71 |
| * | duepuntozero: move community and manage link to upper right area + css fixes ... | Christian Vogeley | 2012-04-25 | 1 | -2/+5 |
| * | 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 |
* | | Diabook-dark more CSS fixes. | Thomas Willingham | 2012-04-25 | 2 | -5/+16 |
|/ |
|
* | this turns out to be harder than I thought | friendica | 2012-04-25 | 2 | -2/+2 |