Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #307 from git-marijus/master | friendica | 2014-02-10 | 3 | -5/+39 | |
|\ \ | ||||||
| * | | whitespace | marijus | 2014-02-10 | 1 | -1/+1 | |
| * | | moving background-color to style.css | marijus | 2014-02-09 | 2 | -2/+2 | |
| * | | theming chat a little | marijus | 2014-02-09 | 3 | -5/+39 | |
* | | | more XSS blockage of uploaded files | friendica | 2014-02-09 | 1 | -1/+10 | |
* | | | don't allow the browser to open uploaded html/css/js | friendica | 2014-02-09 | 1 | -1/+12 | |
|/ / | ||||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-09 | 1 | -0/+1 | |
|\ \ | ||||||
| * | | Doco - abcjsplugin from Olivier | Thomas Willingham | 2014-02-09 | 1 | -0/+1 | |
* | | | fix the "every other link gets messed up" problem | friendica | 2014-02-09 | 1 | -1/+3 | |
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-09 | 2 | -0/+5 | |
|\| | | ||||||
| * | | Merge pull request #306 from cvogeley/master | friendica | 2014-02-09 | 2 | -0/+5 | |
| |\ \ | ||||||
| | * | | . | Christian Vogeley | 2014-02-09 | 1 | -0/+1 | |
| | * | | Add class to bookmark links to make it better them able | Christian Vogeley | 2014-02-09 | 1 | -0/+4 | |
| |/ / | ||||||
* / / | fix wall photos | friendica | 2014-02-09 | 3 | -2/+11 | |
|/ / | ||||||
* | | that's better | friendica | 2014-02-08 | 2 | -1/+3 | |
* | | revert last fix, it double tags | friendica | 2014-02-08 | 1 | -1/+1 | |
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-08 | 1 | -0/+1 | |
|\ \ | ||||||
| * \ | Merge pull request #305 from beardy-unixer/master | friendica | 2014-02-09 | 1 | -0/+1 | |
| |\ \ | ||||||
| | * | | Pass mids to conv_item template | Thomas Willingham | 2014-02-08 | 1 | -0/+1 | |
| |/ / | ||||||
* / / | allow somebody to type #^{{naked link}} | friendica | 2014-02-08 | 1 | -1/+1 | |
|/ / | ||||||
* | | create a new "subdued" CSS class for things that shouldn't be in your face un... | friendica | 2014-02-08 | 3 | -4/+13 | |
* | | make bookmarks message into an 'info' so it expires and goes away after a bit | friendica | 2014-02-07 | 1 | -1/+1 | |
* | | set default for account_level in DB | friendica | 2014-02-07 | 3 | -3/+10 | |
* | | fix issue with double linkify in the git feed | friendica | 2014-02-07 | 1 | -1/+7 | |
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-07 | 4 | -4023/+4213 | |
|\ \ | ||||||
| * \ | Merge pull request #304 from git-marijus/master | friendica | 2014-02-08 | 2 | -6/+6 | |
| |\ \ | ||||||
| | * \ | Merge branch 'upstream' | marijus | 2014-02-07 | 115 | -9003/+9513 | |
| | |\ \ | ||||||
| | | * | | let oneself be added to a collection in exchange for deleted contacts | marijus | 2014-02-07 | 2 | -6/+6 | |
| | | * | | Merge branch 'master' of https://github.com/friendica/red into upstream | marijus | 2014-02-07 | 2 | -4017/+4207 | |
| | | |\ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Merge pull request #303 from tuscanhobbit/master | Paolo T | 2014-02-07 | 2 | -4017/+4207 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | IT: update to the strings | tuscanhobbit | 2014-02-07 | 0 | -0/+0 | |
| | |\ \ \ | ||||||
| | * | | | | IT: update to the strings | tuscanhobbit | 2014-02-07 | 2 | -3857/+4049 | |
| | | | | * | Merge branch 'master' of https://github.com/friendica/red into upstream | marijus | 2014-02-07 | 110 | -4976/+5293 | |
| | | | | |\ | | |_|_|_|/ | |/| | | | | ||||||
| | | | | * | Merge branch 'master' of https://github.com/friendica/red into upstream | marijus | 2014-02-06 | 2 | -4/+7 | |
| | | | | |\ | ||||||
| | | | | * \ | Merge branch 'master' of https://github.com/friendica/red into upstream | marijus | 2014-02-06 | 15 | -220/+213 | |
| | | | | |\ \ | ||||||
| | | | * | \ \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-06 | 2 | -1/+2 | |
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | ||||||
| | | | * | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-06 | 12 | -219/+152 | |
| | | | |\ \ \ \ | ||||||
| | | | * \ \ \ \ | Merge branch 'upstream' | marijus | 2014-02-05 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ | | | | | | |_|/ / | | | | | |/| | | | ||||||
| | | | | * | | | | Merge branch 'master' of https://github.com/friendica/red into upstream | marijus | 2014-02-05 | 143 | -3694/+5472 | |
| | | | | |\ \ \ \ | ||||||
| | | | | * | | | | | comment out since it is not clear if this is not implemented yet or obsolete | marijus | 2014-01-31 | 1 | -2/+2 | |
* | | | | | | | | | | from olivier: use double quotes in js strings, updated FR translation | friendica | 2014-02-07 | 5 | -5104/+7623 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | order menu_list by description, not name | friendica | 2014-02-07 | 1 | -1/+1 | |
* | | | | | | | | | To be listed as a public site, you need to be an https site with a valid cert... | friendica | 2014-02-07 | 3 | -2804/+2919 | |
* | | | | | | | | | doc updates | friendica | 2014-02-07 | 99 | -2159/+2337 | |
* | | | | | | | | | missing element in new chatroom link | friendica | 2014-02-06 | 1 | -1/+4 | |
* | | | | | | | | | mod/ping - don't perform any database calls if installing | friendica | 2014-02-06 | 1 | -0/+6 | |
* | | | | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-06 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-02-07 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Minor doco - markdown doesn't like angle brackets. Also give instructions fo... | Thomas Willingham | 2014-02-07 | 1 | -6/+6 | |
* | | | | | | | | | | | extend the usermenu so we don't have to keep going back to channel homepage t... | friendica | 2014-02-06 | 1 | -3/+7 | |
| |/ / / / / / / / / |/| | | | | | | | | |