| Commit message (Expand) | Author | Age | Files | Lines |
* | Pieces we'll need to tie together chanman and account/channel deletion and di... | friendica | 2013-09-17 | 6 | -21/+89 |
* | Didn't git add again after fixing typo... | Thomas Willingham | 2013-09-18 | 1 | -1/+1 |
* | Filestorage perms (no ACL), fix nav for browsers that can't handle PCSS, put ... | Thomas Willingham | 2013-09-18 | 3 | -0/+23 |
* | missing verb on items linked to photos | friendica | 2013-09-17 | 1 | -1/+1 |
* | sync photo permissions with the attached item whenever they change. | friendica | 2013-09-17 | 2 | -2/+20 |
* | bumped the capslock | friendica | 2013-09-17 | 1 | -1/+1 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-17 | 4 | -3/+20 |
|\ |
|
| * | Merge pull request #142 from dsp1986/master | friendica | 2013-09-17 | 2 | -3/+3 |
| |\ |
|
| | * | fix include paths | dsp1986 | 2013-09-17 | 2 | -3/+3 |
| * | | Merge pull request #141 from MicMee/master | friendica | 2013-09-17 | 2 | -0/+17 |
| |\ \ |
|
| | * | | removed logger statement | Michael Meer | 2013-09-17 | 1 | -1/+0 |
| | * | | extend admin page for hubloc / server key management | Michael Meer | 2013-09-17 | 3 | -0/+18 |
* | | | | SEO: add keywords to appropriate channel pages | friendica | 2013-09-17 | 1 | -0/+7 |
|/ / / |
|
* / / | add -C cfgfile option to shred to allow multiple configurations. I just added... | friendica | 2013-09-17 | 3 | -2/+9 |
|/ / |
|
* | | assuming permissions are correct, unobscure photo comments. Should probably m... | friendica | 2013-09-16 | 1 | -1/+2 |
* | | more work on viewing obscured api posts | friendica | 2013-09-16 | 2 | -10/+17 |
* | | use prepare_body in api calls to properly render content, add 'mode' to conve... | friendica | 2013-09-16 | 4 | -8/+13 |
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-16 | 1 | -1/+1 |
|\ \ |
|
| * \ | Merge pull request #139 from tazmandevil/master | Thomas Willingham | 2013-09-16 | 1 | -1/+1 |
| |\ \ |
|
| | * | | fixed link to wiki | Tazman DeVille | 2013-09-17 | 1 | -1/+1 |
| |/ / |
|
* / / | several oauth fixes - shred doesn't completely work yet, but it also doesn't ... | friendica | 2013-09-16 | 8 | -39/+781 |
|/ / |
|
* | | found it | friendica | 2013-09-15 | 1 | -3/+3 |
* | | spurious blank lines | friendica | 2013-09-15 | 3 | -3/+0 |
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-15 | 1 | -3/+0 |
|\ \ |
|
| * | | Content wrapper breaks feature settings. Get rid of it as a quick fix until ... | Thomas Willingham | 2013-09-16 | 1 | -3/+0 |
* | | | more logging | friendica | 2013-09-15 | 1 | -0/+3 |
|/ / |
|
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-15 | 1 | -1/+2 |
|\ \ |
|
| * \ | Merge pull request #137 from unary/fbrowser | Thomas Willingham | 2013-09-15 | 1 | -1/+2 |
| |\ \ |
|
| | * | | fix photo file browser | Michael Johnston | 2013-09-15 | 1 | -1/+2 |
| |/ / |
|
* / / | don't create a directory sync notification (entry in the updates table) if th... | friendica | 2013-09-15 | 1 | -17/+30 |
|/ / |
|
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-15 | 2 | -12/+13 |
|\ \ |
|
| * \ | Merge pull request #136 from cvogeley/master | friendica | 2013-09-14 | 2 | -12/+13 |
| |\ \ |
|
| | * \ | Upstream merge | Christian Vogeley | 2013-09-15 | 92 | -2558/+3573 |
| | |\ \
| | |/ /
| |/| | |
|
| | * | | Search by date | Christian Vogeley | 2013-09-15 | 2 | -12/+13 |
* | | | | implement what I hope will now be the server side of directory sync, add view... | friendica | 2013-09-15 | 4 | -18/+40 |
|/ / / |
|
* | | | fix the missing brace before pushing | friendica | 2013-09-14 | 1 | -2/+3 |
* | | | some fixes to directory keyword searches | friendica | 2013-09-14 | 2 | -3/+5 |
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-14 | 1 | -5/+6 |
|\ \ \ |
|
| * \ \ | Merge pull request #135 from unary/menuedit | friendica | 2013-09-14 | 1 | -5/+6 |
| |\ \ \ |
|
| | * | | | set menu_channel_id before we use it in a query | Michael Johnston | 2013-09-14 | 1 | -3/+2 |
| | * | | | let me edit menu_desc even if menu_name has not changed | Michael Johnston | 2013-09-14 | 1 | -2/+4 |
* | | | | | no longer used | friendica | 2013-09-14 | 1 | -68/+0 |
|/ / / / |
|
* | | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-09-14 | 1 | -1303/+1611 |
|\| | | |
|
| * | | | Merge pull request #132 from pixelroot/master | Olaf Conradi | 2013-09-14 | 1 | -1303/+1611 |
| |\ \ \ |
|
| | * | | | modified: view/ru/messages.po | pixelroot | 2013-09-13 | 1 | -1303/+1611 |
| * | | | | Revert broken commit | Olaf Conradi | 2013-09-14 | 1 | -92/+2 |
| * | | | | First try to tell a comment from a like/dislike in notification system | mrjive | 2013-09-14 | 1 | -2/+92 |
* | | | | | this might fix "find channels" but I can't test the keyword search until this... | friendica | 2013-09-14 | 2 | -2/+2 |
|/ / / / |
|
* | | / | import_xchan - check every known hubloc/location field and create a new hublo... | friendica | 2013-09-14 | 2 | -5/+9 |
| |_|/
|/| | |
|
* | | | doc update, put more telemetry on notifier and try to ensure that private pos... | friendica | 2013-09-13 | 57 | -1065/+1586 |