| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-14 | 2 | -67/+67 |
|\ |
|
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-13 | 2 | -18/+24 |
| |\ |
|
| * | | rev update | friendica | 2012-05-13 | 2 | -67/+67 |
* | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-13 | 20 | -252/+4973 |
|\ \ \
| | |/
| |/| |
|
| * | | diabook-theme: small fixes | tommy tomson | 2012-05-13 | 2 | -18/+24 |
| |/ |
|
| * | rename get_language() to get_browser_language() | friendica | 2012-05-13 | 4 | -6/+6 |
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-12 | 22 | -6589/+4277 |
| |\ |
|
| * | | slackr drop shadows | friendica | 2012-05-12 | 3 | -63/+64 |
| * | | language detection library | friendica | 2012-05-12 | 11 | -0/+4713 |
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-12 | 8 | -156/+1040 |
| |\ \ |
|
| * | | | rev update | friendica | 2012-05-12 | 2 | -228/+229 |
* | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-12 | 0 | -0/+0 |
| |_|/
|/| | |
|
* | | | Merge pull request #295 from simonlnu/master | Simon | 2012-05-12 | 11 | -54/+89 |
|\ \ \ |
|
| * | | | css fixes; new screenshots | Simon L'nu | 2012-05-12 | 11 | -54/+89 |
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-12 | 4 | -391/+575 |
| |\ \ \
| |/ / /
|/| | | |
|
* | | | | Merge pull request #294 from mschmitt/master | friendica | 2012-05-12 | 4 | -391/+575 |
|\ \ \ \ |
|
| * | | | | Ĝisdatigis la esperantlingvan tradukaĵon al 100%. | Martin Schmitt | 2012-05-12 | 4 | -391/+575 |
| | |_|/
| |/| | |
|
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-12 | 0 | -0/+0 |
| |/ /
|/| | |
|
* | | | 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 pull request #293 from simonlnu/master | Simon | 2012-05-12 | 8 | -6152/+3105 |
|\ \ \
| |/ /
|/| | |
|
| * | | finished migrating dispy light - maybe | Simon L'nu | 2012-05-12 | 8 | -6152/+3105 |
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-11 | 22 | -323/+1737 |
| |\ \
| |/ /
|/| | |
|
* | | | 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 |
| |/
|/| |
|
* | | fix search/new against possible email leakage | friendica | 2012-05-11 | 1 | -0/+3 |
* | | better test of email reply visibility | friendica | 2012-05-11 | 2 | -3/+3 |
* | | 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 | 5 | -0/+112 |
|/ / |
|
* | | fix PM replies after autocomplete changes | friendica | 2012-05-10 | 2 | -3/+10 |
* | | add photos to PM autocomplete, improved appearance | friendica | 2012-05-10 | 3 | -3/+401 |
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-10 | 4 | -15/+18 |
|\ \ |
|
| * \ | Merge remote-tracking branch 'origin/master' | tommy tomson | 2012-05-11 | 3 | -9/+12 |
| |\ \ |
|
| * | | | diabook-theme: small fix | tommy tomson | 2012-05-11 | 2 | -7/+7 |
* | | | | rev update | friendica | 2012-05-10 | 2 | -91/+79 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-10 | 0 | -0/+0 |
| | |/ |
|
| | * | 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: 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 |
| |\ |
|
| | * | Merge pull request #292 from simonlnu/master | Simon | 2012-05-09 | 2 | -7/+13 |
| | |\ |
|
| | | * | don't make -desc so obnoxious looking | Simon L'nu | 2012-05-10 | 2 | -7/+13 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-10 | 2 | -61/+73 |
| | | |\
| | | |/
| | |/| |
|