| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | 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 | |
| | |\ | | | | | | | let oneself be added to a collection in exchange for deleted contacts | |||||
| | | * | 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 | |||||
| | | * \ \ | 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 | |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | from me: provide future ability to have an optional edit link/icon next to menus (such as bookmarks) | |||||
| * | | | | | | | | | 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 ↵ | friendica | 2014-02-07 | 3 | -2804/+2919 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cert. If you don't make the cut, you will either not be listed as a public site or you will be de-listed. Period. This is non-negotiable. | |||||
| * | | | | | | | | | 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 ↵ | Thomas Willingham | 2014-02-07 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for mounting one's own directory rather than the cloud root. | |||||
| * | | | | | | | | | | | extend the usermenu so we don't have to keep going back to channel homepage ↵ | friendica | 2014-02-06 | 1 | -3/+7 | |
| | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to get to the other channel links | |||||
| * | | | | | | | | | | make all naked links bookmark-able | friendica | 2014-02-06 | 2 | -2/+2 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | / | apply service class restriction to the number of channels allowed in a ↵ | friendica | 2014-02-06 | 1 | -0/+11 | |
| | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | chatroom at a time ('chatters_inroom'). If you've got a public site you probably want to restrict this. | |||||
| * | | | | | | | | add bookmark tag to naked links if they're red sites. We can do this because ↵ | friendica | 2014-02-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | red links are linkified when the post is submitted. Can't do this for other naked links because they only get linkified during display and won't have a taxonomy object attached to the message. | |||||
| * | | | | | | | | notification bug - don't use $r, we already set it to something else that we ↵ | friendica | 2014-02-06 | 2 | -3/+6 | |
| | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | need further on. | |||||
| * | | | | | | | leave out the quotes | friendica | 2014-02-06 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | more important things to mention. And this is still only the important stuff. | friendica | 2014-02-06 | 2 | -1/+2 | |
| | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | | a couple more | friendica | 2014-02-05 | 2 | -0/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'newhomepage' | friendica | 2014-02-05 | 2 | -206/+72 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | this is basic but perhaps that's what we really need. | friendica | 2014-02-05 | 1 | -15/+62 | |
| | | | | | | | | ||||||
| | * | | | | | | cleanup in preparation for new page | friendica | 2014-02-02 | 1 | -196/+3 | |
| | | | | | | | | ||||||
| | * | | | | | | some intial work on a splashier homepage | friendica | 2014-01-22 | 2 | -14/+26 | |
| | | | | | | | | ||||||
| * | | | | | | | add chatrooms template | friendica | 2014-02-05 | 1 | -0/+10 | |
| | | | | | | | | ||||||
| * | | | | | | | add chatroom links | friendica | 2014-02-05 | 2 | -1/+24 | |
| | | | | | | | | ||||||
| * | | | | | | | fix the xchan lookup tool | friendica | 2014-02-05 | 1 | -1/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | allow bookmarks to use richtext | friendica | 2014-02-05 | 3 | -3/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | cleanup - nothing more | friendica | 2014-02-05 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | fix auto-add of bookmarks to find sender correctly and optionally auto add ↵ | friendica | 2014-02-05 | 1 | -4/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bookmarks for self | |||||
| * | | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-05 | 3 | -2/+72 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge pull request #298 from cvogeley/master | friendica | 2014-02-06 | 1 | -2/+13 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Other not so elegant way of detecting touch screen devices | |||||
| | | * | | | | | | | Other not so elegant way of detecting touch screen devices | Christian Vogeley | 2014-02-02 | 1 | -2/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But at least it seems to work | |||||
| | * | | | | | | | | Merge pull request #302 from git-marijus/master | friendica | 2014-02-06 | 2 | -0/+59 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | add a sanitized style tag to bbcode | |||||
| | | * | | | | | | add a sanitized style tag to bbcode | marijus | 2014-02-05 | 2 | -0/+59 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-05 | 23 | -26/+244 | |
| | | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | | * | | | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-02-04 | 12 | -1161/+1270 | |
| | | |\ \ \ \ \ \ | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |