| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-17 | 3 | -4/+4 |
| |\ |
|
| | * | compare ssl_policy precisely in case somebody was bitten by template processo... | friendica | 2012-03-17 | 1 | -1/+1 |
| | * | template processor broken with foreach k=>v and k is integer 0 | friendica | 2012-03-17 | 2 | -3/+3 |
| * | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-17 | 31 | -321/+504 |
| |\| |
|
| | * | cut/paste error | friendica | 2012-03-17 | 1 | -1/+1 |
| | * | scheme checking for webservers without $_SERVER['HTTPS'] | friendica | 2012-03-16 | 1 | -1/+6 |
| | * | Merge pull request #145 from simonlnu/master | Simon | 2012-03-16 | 4 | -16/+10 |
| | |\ |
|
| | | * | [fix] whitespace in photo_view and like_noshare. dispy-dark clean up | Simon L'nu | 2012-03-17 | 4 | -16/+10 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-17 | 0 | -0/+0 |
| | |/ |
|
| | * | Merge pull request #144 from simonlnu/master | Simon | 2012-03-16 | 3 | -7/+9 |
| | |\ |
|
| | | * | remove auto-complete from darkzero-NS, dispys, since the comment one is now g... | Simon L'nu | 2012-03-16 | 2 | -6/+0 |
| | | * | make auto-complete work in more places | Simon L'nu | 2012-03-16 | 1 | -1/+9 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | |/ |
|
| | * | Merge pull request #143 from simonlnu/master | Simon | 2012-03-16 | 1 | -0/+3 |
| | |\ |
|
| | | * | make auto-complete in darkzero-NS. other themes can use this easily. might ne... | Simon L'nu | 2012-03-16 | 1 | -0/+3 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 2 | -7/+18 |
| | | |\
| | |/
| |/| |
|
| | * | | convert boolean or int settings to strings to work around issues with templat... | friendica | 2012-03-16 | 1 | -7/+7 |
| | * | | add "send pm" link to photo dropdown for Diaspora contacts | friendica | 2012-03-16 | 1 | -0/+11 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | |/ |
|
| | * | Merge branch 'pull' | friendica | 2012-03-16 | 19 | -200/+325 |
| | |\ |
|
| | | * | Merge pull request #142 from simonlnu/master | Simon | 2012-03-16 | 2 | -0/+18 |
| | | |\ |
|
| | | | * | make profiles-menu disappear when clicked outside it | Simon L'nu | 2012-03-16 | 2 | -0/+18 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | | |/ |
|
| | | * | Merge pull request #141 from CatoTH/master | Simon | 2012-03-16 | 4 | -10/+18 |
| | | |\ |
|
| | | | * | Bugfix of old IEs | Tobias Hößl | 2012-03-16 | 1 | -1/+1 |
| | | | * | Forgot to remove a debug line | Tobias Hößl | 2012-03-16 | 1 | -1/+0 |
| | | | * | Use tabindex to enable easy navigation in the dialog to write private mails; ... | Tobias Hößl | 2012-03-16 | 4 | -11/+20 |
| | | * | | Merge pull request #140 from simonlnu/master | Simon | 2012-03-16 | 15 | -195/+294 |
| | | |\ \ |
|
| | | | * | | weee, dispys get another update | Simon L'nu | 2012-03-16 | 15 | -195/+294 |
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 5 | -98/+141 |
| | | | |\ \
| | | |/ /
| | |/| | |
|
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | | | |\ \ |
|
| | * | | | | | wrong link in d* comment notifications | friendica | 2012-03-16 | 2 | -2/+2 |
| | |/ / / / |
|
| | * | | | | syntax error from pasted text, remove ^M's | friendica | 2012-03-16 | 1 | -96/+96 |
| | * | | | | bug #335 network search broken after new ssl policy settings | friendica | 2012-03-16 | 2 | -2/+2 |
| | * | | | | whitespace | friendica | 2012-03-16 | 1 | -0/+1 |
| | * | | | | notification for disapora comments | friendica | 2012-03-16 | 1 | -0/+42 |
| | | |_|/
| |/| | |
|
| * | | | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-16 | 51 | -189/+619 |
| |\| | | |
|
| | * | | | Merge pull request #139 from simonlnu/master | Simon | 2012-03-15 | 1 | -1/+1 |
| | |\| |
| | |/
| |/| |
|
| | | * | missing close double quote in mail_list.tpl | Simon L'nu | 2012-03-16 | 1 | -1/+1 |
| | * | | Merge pull request #138 from simonlnu/master | Simon | 2012-03-15 | 1 | -0/+6 |
| | |\| |
|
| | | * | more changes in dispy-dark | Simon L'nu | 2012-03-16 | 1 | -0/+6 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | |/ |
|
| | * | turn indexes back off (this is from an errant checkin a year or more ago) | friendica | 2012-03-15 | 1 | -1/+1 |
| | * | Merge branch 'pull' | friendica | 2012-03-15 | 15 | -32/+86 |
| | |\ |
|
| | | * | Merge pull request #137 from tomtom84/master | tomtom84 | 2012-03-15 | 15 | -32/+86 |
| | | |\ |
|
| | | | * | added icons to profile_side, fixes in css | tommy tomson | 2012-03-16 | 15 | -32/+86 |
| | | |/ |
|
| | * / | undo git stuffup | friendica | 2012-03-15 | 3 | -4/+8 |
| | |/ |
|
| | * | Merge branch 'pull' | friendica | 2012-03-15 | 28 | -157/+448 |
| | |\ |
|
| | | * | Merge pull request #136 from annando/master | friendica | 2012-03-15 | 12 | -71/+329 |
| | | |\ |
|
| | | | * | html2bbcode: Disabled size conversion | Michael Vogel | 2012-03-15 | 1 | -9/+9 |
