Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | content wrapper back now JS is fixed for features page. | ||||
* | 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 |
| |\ | | | | | | | | | | | | | Thanks! fix include paths | ||||
| | * | fix include paths | dsp1986 | 2013-09-17 | 2 | -3/+3 |
| | | | |||||
| * | | Merge pull request #141 from MicMee/master | friendica | 2013-09-17 | 2 | -0/+17 |
| |\ \ | | | | | | | | | Preparation for server / hubloc handling | ||||
| | * | | 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 ↵ | friendica | 2013-09-17 | 3 | -2/+9 |
|/ / | | | | | | | added the option for multiple configs, I didn't make it work as it requires quite a bit of change to the shred program flow; which tries to load the default config before doing anything at all. | ||||
* | | assuming permissions are correct, unobscure photo comments. Should probably ↵ | friendica | 2013-09-16 | 1 | -1/+2 |
| | | | | | | | | make sure permissions are correct and figure out why some photo comments on public photos are getting stored with privacy. This probably requires that whenever we change photo permissions for linked photos/items we change the item permissions to match. They might be out of sync. | ||||
* | | 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 ↵ | friendica | 2013-09-16 | 4 | -8/+13 |
| | | | | | | | | conversation templates so that themes can use the module context to suppress or show comments as desired | ||||
* | | 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 | ||||
| | * | | 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 |
|/ / | | | | | | | completely NOT work, so at least there's some improvement | ||||
* | | 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 |
| | | | | | | | | | | | | I get a chance to work out why it works everywhere except there. | ||||
* | | | 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 | ||||
| | * | | 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 ↵ | friendica | 2013-09-15 | 1 | -17/+30 |
|/ / | | | | | | | the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it. | ||||
* | | 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 |
| |\ \ | | | | | | | | | Search by date | ||||
| | * \ | Upstream merge | Christian Vogeley | 2013-09-15 | 92 | -2558/+3573 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | Search by date | Christian Vogeley | 2013-09-15 | 2 | -12/+13 |
| | | | | | | | | | | | | | | | | Search by date (archive) works a bit now | ||||
* | | | | implement what I hope will now be the server side of directory sync, add ↵ | friendica | 2013-09-15 | 4 | -18/+40 |
|/ / / | | | | | | | | | | viewsrc to item_photo_menu, and log what changed in import_xchan update objects so we can find out why there are so many updates when nothing _obvious_ has changed that should trigger it. | ||||
* | | | 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 |
| |\ \ \ | | | | | | | | | | | allow update of menu_desc, fix bug in duplicate menu_name check | ||||
| | * | | | 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 | ||||
| | * | | | 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 ↵ | friendica | 2013-09-14 | 2 | -2/+2 |
|/ / / / | | | | | | | | | | | | | this is running on a production site. | ||||
* | | / | import_xchan - check every known hubloc/location field and create a new ↵ | friendica | 2013-09-14 | 2 | -5/+9 |
| |_|/ |/| | | | | | | | | hubloc if anything at all changed anywhere. | ||||
* | | | doc update, put more telemetry on notifier and try to ensure that private ↵ | friendica | 2013-09-13 | 57 | -1065/+1586 |
| | | | | | | | | | | | | posts have recipients. | ||||
* | | | need to figure out what's causing this | friendica | 2013-09-12 | 1 | -0/+6 |
| | | |