Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | s/Options All/AllowOverride All | Thomas Willingham | 2014-02-10 | 1 | -1/+1 |
| | |||||
* | more bookmark fixes | friendica | 2014-02-10 | 2 | -2/+2 |
| | |||||
* | better bookmark escaping | friendica | 2014-02-10 | 2 | -5/+11 |
| | |||||
* | don't add bookmark tags to naked links inside code blocks | friendica | 2014-02-10 | 3 | -1/+15 |
| | |||||
* | since the project donate section was added to siteinfo - add a way for the ↵ | friendica | 2014-02-09 | 1 | -6/+12 |
| | | | | hub admin to add in a donation section to keep the hub running. | ||||
* | perform remote discovery on abook sync of nomadic clones if remote channel ↵ | friendica | 2014-02-09 | 1 | -0/+27 |
| | | | | (xchan) is unknown | ||||
* | backend for chatroom activity monitor - honours permissions and returns ↵ | friendica | 2014-02-09 | 1 | -0/+43 |
| | | | | (json) how many in room and last chat timestamp, regardless of whether the observer is actually in the room. | ||||
* | Merge pull request #307 from git-marijus/master | friendica | 2014-02-10 | 3 | -5/+39 |
|\ | | | | | theming chat a little | ||||
| * | 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 |
| |\ | | | | | | | Add class to bookmark links to make it better themable | ||||
| | * | . | 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 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g.: css (not yet included) .bookmark-identifier{ display:none; } .bookmark:hover:before{ text-decoration:none; content:"#^"; color:#000000; background:#FFFFFF; } .bookmark:hover{ color: #FFFFFF; background: #3465A4; } | ||||
* / | 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 | ||||
| | * | 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 |
|/ | | | | -- auto-linkify it and create a bookmark tag. | ||||
* | create a new "subdued" CSS class for things that shouldn't be in your face ↵ | friendica | 2014-02-08 | 3 | -4/+13 |
| | | | | unless you want them and intentionally hover over them. Typically this would be accomplished via an opacity or colour change, but themes are free to use other methods. Also changed the channel_tabs "chatroom" link to use the subdued class if no rooms have been created rather than a count of chatrooms. Themse should probably create a .subdued and .subdued:hover definition because we'll probably take most of the stuff which is now hardwired to use opacity by id and change it to use the class definition instead. | ||||
* | 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 |
| |\ | | | | | | | 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. |