| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | move expiration of notifications to the equivalent of "cron daily" to try and... | friendica | 2014-02-11 | 1 | -9/+10 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-11 | 1 | -1/+5 |
|\ |
|
| * | Merge pull request #309 from beardy-unixer/master | friendica | 2014-02-12 | 1 | -1/+5 |
| |\ |
|
| | * | Clear out old notifications in the poller. | Thomas Willingham | 2014-02-11 | 1 | -1/+5 |
| |/ |
|
* / | implement a forced directory update mode where we unconditionally create a di... | friendica | 2014-02-11 | 6 | -19/+33 |
|/ |
|
* | typos in authtest | friendica | 2014-02-10 | 1 | -1/+1 |
* | reversed args in update_modtime, incorrect ud_guid and ud_hash | friendica | 2014-02-10 | 4 | -5/+5 |
* | Check for the correct DB name before pushing. | friendica | 2014-02-10 | 1 | -1/+1 |
* | add channel_notify_flags to list of things which should *not* be synced acros... | friendica | 2014-02-10 | 1 | -1/+1 |
* | fix ambiguous result message from authtest | friendica | 2014-02-10 | 1 | -1/+1 |
* | The scenario is that you're authenticated via magic-auth on a remote hub and ... | friendica | 2014-02-10 | 1 | -3/+5 |
* | add chanview mode to settings | friendica | 2014-02-10 | 2 | -1/+6 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-02-10 | 1 | -1/+1 |
|\ |
|
| * | s/Options All/AllowOverride All | Thomas Willingham | 2014-02-10 | 1 | -1/+1 |
* | | getting bookmark support in tinymce is left as a FIXME. I've got something th... | friendica | 2014-02-10 | 3 | -0/+224 |
|/ |
|
* | 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 hu... | friendica | 2014-02-09 | 1 | -6/+12 |
* | perform remote discovery on abook sync of nomadic clones if remote channel (x... | friendica | 2014-02-09 | 1 | -0/+27 |
* | backend for chatroom activity monitor - honours permissions and returns (json... | friendica | 2014-02-09 | 1 | -0/+43 |
* | 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 |
| | | |\
| | |_|/
| |/| | |
|