aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-173-4/+4
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | compare ssl_policy precisely in case somebody was bitten by template processo...friendica2012-03-171-1/+1
* | | | | | template processor broken with foreach k=>v and k is integer 0friendica2012-03-172-3/+3
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-170-0/+0
|/ / / / /
* | | | | cut/paste errorfriendica2012-03-171-1/+1
* | | | | scheme checking for webservers without $_SERVER['HTTPS']friendica2012-03-161-1/+6
* | | | | Merge pull request #145 from simonlnu/masterSimon2012-03-164-16/+10
|\ \ \ \ \
| * | | | | [fix] whitespace in photo_view and like_noshare. dispy-dark clean upSimon L'nu2012-03-174-16/+10
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-170-0/+0
|/ / / / /
* | | | | Merge pull request #144 from simonlnu/masterSimon2012-03-163-7/+9
|\ \ \ \ \
| * | | | | remove auto-complete from darkzero-NS, dispys, since the comment one is now g...Simon L'nu2012-03-162-6/+0
| * | | | | make auto-complete work in more placesSimon L'nu2012-03-161-1/+9
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
|/ / / / /
* | | | | Merge pull request #143 from simonlnu/masterSimon2012-03-161-0/+3
|\ \ \ \ \
| * | | | | make auto-complete in darkzero-NS. other themes can use this easily. might ne...Simon L'nu2012-03-161-0/+3
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-162-7/+18
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | convert boolean or int settings to strings to work around issues with templat...friendica2012-03-161-7/+7
* | | | | | add "send pm" link to photo dropdown for Diaspora contactsfriendica2012-03-161-0/+11
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
|/ / / / /
* | | | | Merge branch 'pull'friendica2012-03-1619-200/+325
|\ \ \ \ \
| * \ \ \ \ Merge pull request #142 from simonlnu/masterSimon2012-03-162-0/+18
| |\ \ \ \ \
| | * | | | | make profiles-menu disappear when clicked outside itSimon L'nu2012-03-162-0/+18
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| |/ / / / /
| * | | | | Merge pull request #141 from CatoTH/masterSimon2012-03-164-10/+18
| |\ \ \ \ \
| | * | | | | Bugfix of old IEsTobias Hößl2012-03-161-1/+1
| | * | | | | Forgot to remove a debug lineTobias Hößl2012-03-161-1/+0
| | * | | | | Use tabindex to enable easy navigation in the dialog to write private mails; ...Tobias Hößl2012-03-164-11/+20
| * | | | | | Merge pull request #140 from simonlnu/masterSimon2012-03-1615-195/+294
| |\ \ \ \ \ \
| | * | | | | | weee, dispys get another updateSimon L'nu2012-03-1615-195/+294
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-165-98/+141
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| | |\ \ \ \ \ \
* | | | | | | | | wrong link in d* comment notificationsfriendica2012-03-162-2/+2
|/ / / / / / / /
* | | | | | | | syntax error from pasted text, remove ^M'sfriendica2012-03-161-96/+96
* | | | | | | | bug #335 network search broken after new ssl policy settingsfriendica2012-03-162-2/+2
* | | | | | | | whitespacefriendica2012-03-161-0/+1
* | | | | | | | notification for disapora commentsfriendica2012-03-161-0/+42
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #139 from simonlnu/masterSimon2012-03-151-1/+1
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | missing close double quote in mail_list.tplSimon L'nu2012-03-161-1/+1
* | | | | | Merge pull request #138 from simonlnu/masterSimon2012-03-151-0/+6
|\| | | | |
| * | | | | more changes in dispy-darkSimon L'nu2012-03-161-0/+6
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
|/ / / / /
* | | | | turn indexes back off (this is from an errant checkin a year or more ago)friendica2012-03-151-1/+1
* | | | | Merge branch 'pull'friendica2012-03-1515-32/+86
|\ \ \ \ \
| * \ \ \ \ Merge pull request #137 from tomtom84/mastertomtom842012-03-1515-32/+86
| |\ \ \ \ \
| | * | | | | added icons to profile_side, fixes in csstommy tomson2012-03-1615-32/+86
| |/ / / / /
* / / / / / undo git stuffupfriendica2012-03-153-4/+8
|/ / / / /
* | | | | Merge branch 'pull'friendica2012-03-1528-157/+448
|\ \ \ \ \
| * \ \ \ \ Merge pull request #136 from annando/masterfriendica2012-03-1512-71/+329
| |\ \ \ \ \
| | * | | | | html2bbcode: Disabled size conversionMichael Vogel2012-03-151-9/+9
| | * | | | | Merge commit 'upstream/master'Michael Vogel2012-03-15114-870/+2820
| | |\ \ \ \ \