| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #288 from simonlnu/master | Simon | 2012-05-04 | 6 | -787/+795 |
|\ |
|
| * | fix lightbox; finished dark, now on to light | Simon L'nu | 2012-05-04 | 6 | -787/+795 |
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-04 | 10 | -686/+970 |
| |\
| |/
|/| |
|
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-04 | 2 | -656/+876 |
|\ \ |
|
| * \ | Merge pull request #287 from mschmitt/master | friendica | 2012-05-04 | 2 | -656/+876 |
| |\ \ |
|
| | * | | Esperanto 100% | Martin Schmitt | 2012-05-04 | 2 | -656/+876 |
| |/ / |
|
* / / | category removal | friendica | 2012-05-04 | 2 | -5/+16 |
|/ / |
|
* | | "show more" friends in common | friendica | 2012-05-04 | 6 | -25/+78 |
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-04 | 0 | -0/+0 |
|/ |
|
* | DE strings | Tobias Diekershoff | 2012-05-04 | 2 | -621/+847 |
* | implement max load average before queuing/deferring delivery and poller proce... | friendica | 2012-05-03 | 4 | -1/+28 |
* | yet another bug in remote_friends_in_common | friendica | 2012-05-03 | 2 | -1/+2 |
* | string update | friendica | 2012-05-03 | 1 | -2/+2 |
* | use html symbols for double quotes | friendica | 2012-05-03 | 1 | -1/+1 |
* | string update | friendica | 2012-05-03 | 4 | -94/+91 |
* | Merge pull request #284 from fabrixxm/master | friendica | 2012-05-03 | 1 | -3/+3 |
|\ |
|
| * | validate_url() and validate_email() validate also IP address. | Fabio Comuni | 2012-05-03 | 1 | -3/+3 |
* | | Merge pull request #286 from grossard/french_proofreading | friendica | 2012-05-03 | 14 | -60/+64 |
|\ \ |
|
| * | | proofreading the mail templates in fr | Ludovic Grossard | 2012-05-03 | 14 | -60/+64 |
|/ / |
|
* | | Merge pull request #285 from simonlnu/master | Simon | 2012-05-03 | 10 | -1927/+3306 |
|\ \
| |/
|/| |
|
| * | forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv ... | Simon L'nu | 2012-05-03 | 2 | -1/+3 |
| * | major reworking of dispy dark. light to follow | Simon L'nu | 2012-05-03 | 10 | -1927/+3304 |
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-03 | 3 | -7/+37 |
| |\
| |/
|/| |
|
* | | diabook-theme: small fix | tommy tomson | 2012-05-03 | 2 | -2/+4 |
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-02 | 29 | -57/+123 |
|\ \ |
|
* | | | Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnso... | friendica | 2012-05-02 | 1 | -5/+33 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-03 | 36 | -82/+210 |
| | |\
| | |/
| |/| |
|
| * | | 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 |
|/ / |
|
* | | use cid rather than uid in perms | friendica | 2012-05-02 | 1 | -3/+12 |
* | | Merge pull request #283 from fermionic/private-events-post-correctly-in-diaspora | friendica | 2012-05-02 | 1 | -0/+19 |
|\ \ |
|
| * | | Modify events_post() in mod/events.php to set the `private` field to true whe... | Zach Prezkuta | 2012-05-02 | 1 | -0/+19 |
|/ / |
|
* | | use mysql replace on cache items | friendica | 2012-05-02 | 1 | -12/+30 |
* | | fixing common friends | friendica | 2012-05-02 | 1 | -6/+7 |
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-02 | 7 | -396/+418 |
|\ \ |
|
| * \ | Merge pull request #282 from max-weller/master | friendica | 2012-05-02 | 3 | -1/+9 |
| |\ \ |
|
| | * | | Moved Meta Viewport from global head.tpl to diabook's header | Max Weller | 2012-05-02 | 3 | -1/+9 |
| |/ / |
|
* | | | rev update | friendica | 2012-05-02 | 2 | -5/+12 |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-02 | 11 | -412/+458 |
| | |\
| | |/
| |/| |
|
| * | | diabook-themes: more improvements in theme.php, add titles to bbcode under co... | tommy tomson | 2012-05-02 | 4 | -28/+47 |
| * | | 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 |
|/ / |
|
* | | missing param | friendica | 2012-05-02 | 1 | -1/+2 |
* | | provide "service_class" identifier which will let us provide service_class li... | friendica | 2012-05-02 | 3 | -3/+14 |
* | | delineate the new profile changes from the rest of the text | friendica | 2012-05-02 | 1 | -1/+1 |
* | | how did that happen? | friendica | 2012-05-02 | 1 | -1/+1 |
* | | shuffle results of remote_common_friends widget | friendica | 2012-05-02 | 2 | -8/+25 |
* | | only validate once | friendica | 2012-05-01 | 1 | -3/+0 |
* | | perform basic validation | friendica | 2012-05-01 | 2 | -3/+9 |
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-02 | 6 | -4/+109 |
| |\
| |/
|/| |
|