Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | log any attempt to call mod_magic | friendica | 2013-09-29 | 1 | -0/+2 | |
| | | ||||||
* | | RSS feeds as channel sources. It's feasible and within reach, however ↵ | friendica | 2013-09-29 | 1 | -45/+35 | |
| | | | | | | | | | | | | | | | | there's a lot of work left to do. How bad does anybody want it? Let's find out... | |||||
* | | remove the "Similar Interests" link until somebody makes it work | friendica | 2013-09-29 | 2 | -1/+3 | |
| | | ||||||
* | | sources management page | friendica | 2013-09-29 | 6 | -0/+205 | |
| | | ||||||
* | | Ugh, typo | Thomas Willingham | 2013-09-29 | 1 | -1/+1 | |
| | | ||||||
* | | Add kdevelop files to .gitignore | Thomas Willingham | 2013-09-29 | 1 | -1/+4 | |
| | | ||||||
* | | Missing include | Thomas Willingham | 2013-09-29 | 1 | -1/+1 | |
| | | ||||||
* | | Typo | Thomas Willingham | 2013-09-29 | 1 | -1/+1 | |
| | | ||||||
* | | Issue #117 | Thomas Willingham | 2013-09-29 | 2 | -10/+18 | |
| | | ||||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-29 | 2 | -3/+2 | |
|\ \ | ||||||
| * | | Prevent toolbar overlapping comanche nav links. | Thomas Willingham | 2013-09-28 | 1 | -1/+0 | |
| | | | ||||||
| * | | Fix Comanche menus | Thomas Willingham | 2013-09-28 | 1 | -2/+2 | |
| | | | ||||||
* | | | Issue #158 | friendica | 2013-09-29 | 4 | -6/+13 | |
|/ / | ||||||
* | | close comment | friendica | 2013-09-28 | 2 | -1/+2 | |
| | | ||||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-28 | 33 | -0/+1400 | |
|\ \ | ||||||
| * \ | Merge pull request #157 from 0xAF/master | friendica | 2013-09-28 | 33 | -0/+1400 | |
| |\ \ | | | | | | | | | Add colorpicker jquery plugin for themes | |||||
| | * | | Add colorpicker jquery plugin for themes | Stanislav Lechev [0xAF] | 2013-09-28 | 33 | -0/+1400 | |
| |/ / | ||||||
* | | | fix can_comment_on_post when viewing wall-to-wall | friendica | 2013-09-28 | 4 | -15/+35 | |
| | | | ||||||
* | | | string update | friendica | 2013-09-28 | 1 | -536/+589 | |
| | | | ||||||
* | | | doc updates | friendica | 2013-09-28 | 69 | -334/+587 | |
|/ / | ||||||
* | | convert to plaintext before matching words in body. Otherwise every post I ↵ | friendica | 2013-09-26 | 1 | -1/+5 | |
| | | | | | | | | make with a link in it is going to match a test for zot. | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-26 | 3 | -2/+31 | |
|\ \ | ||||||
| * | | Actually, lets add a content wrapper while we're in there. | Thomas Willingham | 2013-09-27 | 1 | -0/+2 | |
| | | | ||||||
| * | | Typo | Thomas Willingham | 2013-09-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | Issue #131 | Thomas Willingham | 2013-09-27 | 2 | -2/+11 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2013-09-27 | 8 | -11/+39 | |
| |\ \ | ||||||
| * | | | Minor theme stuff - make the pages toolbar a toolbar, get rid of a naughty ↵ | Thomas Willingham | 2013-09-27 | 2 | -1/+19 | |
| | | | | | | | | | | | | | | | | center tag, and stop very long tags overlapping the directory. | |||||
* | | | | aggregate channels | friendica | 2013-09-26 | 1 | -26/+86 | |
| |/ / |/| | | ||||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-26 | 2 | -2/+6 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #155 from oohlaf/fixes | Olaf Conradi | 2013-09-26 | 1 | -1/+5 | |
| |\ \ \ | | |/ / | |/| | | Explain why public comments are disabled and what needs to happen to enable them. | |||||
| | * | | Add explanation why public comments are disabled. | Olaf Conradi | 2013-09-26 | 1 | -1/+5 | |
| | | | | ||||||
| * | | | Typo | Thomas Willingham | 2013-09-26 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | structure for channel unions | friendica | 2013-09-26 | 7 | -10/+34 | |
|/ / / | ||||||
* / / | suppress creating the directory update record for profile updates which are ↵ | friendica | 2013-09-25 | 6 | -10/+24 | |
|/ / | | | | | | | part of the normal import_xchan sequence - otherwise we get two for every change. Create it normally if we are called with a profile_update message and don't go through the whole import_xchan thing. | |||||
* | | populate the new fields in the directory updates table | friendica | 2013-09-24 | 1 | -9/+17 | |
| | | ||||||
* | | don't send email notifications for likes (as comment notifications). We'll ↵ | friendica | 2013-09-24 | 1 | -1/+6 | |
| | | | | | | | | need a separate preference for whether you want notifications for likes. | |||||
* | | add some text for issue #79 | friendica | 2013-09-24 | 1 | -0/+7 | |
| | | ||||||
* | | Merge pull request #154 from oohlaf/fixes | Olaf Conradi | 2013-09-24 | 1 | -2/+2 | |
|\ \ | | | | | | | Fix name of Bleichenbacher | |||||
| * | | Fix name of Bleichenbacher | Olaf Conradi | 2013-09-24 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #153 from zzottel/master | zzottel | 2013-09-24 | 1 | -2/+2 | |
|\ \ | | | | | | | Fix observer=1 tag. Using only observer without =1 won't work anymore | |||||
| * | | Fix observer=1 tag. Using only observer without =1 won't work anymore now. | zottel | 2013-09-24 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-24 | 2 | -0/+42 | |
|\ \ | ||||||
| * \ | Merge pull request #152 from MicMee/master | friendica | 2013-09-24 | 2 | -0/+42 | |
| |\ \ | | | | | | | | | Preparation for maintenance od hubloc/server | |||||
| | * | | added new smarty template admin_hubloc.tpl | Michael Meer | 2013-09-24 | 1 | -0/+22 | |
| | | | | ||||||
| | * | | admin hubloc page now with content from all hublocs, in next steps I add ↵ | Michael Meer | 2013-09-24 | 1 | -0/+20 | |
| |/ / | | | | | | | | | | some tests with zping and reduce the content to known problems. | |||||
* / / | reduce susceptibility to bleichenberger attack | friendica | 2013-09-24 | 4 | -8/+21 | |
|/ / | ||||||
* | | spice this up a little bit... | friendica | 2013-09-23 | 1 | -0/+8 | |
| | | ||||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-23 | 1 | -0/+20 | |
|\ \ | ||||||
| * \ | Merge pull request #151 from zzottel/master | friendica | 2013-09-23 | 1 | -0/+20 | |
| |\ \ | | | | | | | | | add [observer] tags and [observer.baseurl] | |||||
| | * | | add [observer] tags and [observer.baseurl] | zottel | 2013-09-23 | 1 | -0/+20 | |
| |/ / |