aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Didn't git add again after fixing typo...Thomas Willingham2013-09-181-1/+1
|
* Filestorage perms (no ACL), fix nav for browsers that can't handle PCSS, put ↵Thomas Willingham2013-09-183-0/+23
| | | | content wrapper back now JS is fixed for features page.
* missing verb on items linked to photosfriendica2013-09-171-1/+1
|
* sync photo permissions with the attached item whenever they change.friendica2013-09-172-2/+20
|
* bumped the capslockfriendica2013-09-171-1/+1
|
* Merge https://github.com/friendica/red into zpullfriendica2013-09-174-3/+20
|\
| * Merge pull request #142 from dsp1986/masterfriendica2013-09-172-3/+3
| |\ | | | | | | | | | | | | Thanks! fix include paths
| | * fix include pathsdsp19862013-09-172-3/+3
| | |
| * | Merge pull request #141 from MicMee/masterfriendica2013-09-172-0/+17
| |\ \ | | | | | | | | Preparation for server / hubloc handling
| | * | removed logger statementMichael Meer2013-09-171-1/+0
| | | |
| | * | extend admin page for hubloc / server key managementMichael Meer2013-09-173-0/+18
| | | |
* | | | SEO: add keywords to appropriate channel pagesfriendica2013-09-171-0/+7
|/ / /
* / / add -C cfgfile option to shred to allow multiple configurations. I just ↵friendica2013-09-173-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 ↵friendica2013-09-161-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 postsfriendica2013-09-162-10/+17
| |
* | use prepare_body in api calls to properly render content, add 'mode' to ↵friendica2013-09-164-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 zpullfriendica2013-09-161-1/+1
|\ \
| * \ Merge pull request #139 from tazmandevil/masterThomas Willingham2013-09-161-1/+1
| |\ \ | | | | | | | | fixed link to wiki
| | * | fixed link to wikiTazman DeVille2013-09-171-1/+1
| |/ /
* / / several oauth fixes - shred doesn't completely work yet, but it also doesn't ↵friendica2013-09-168-39/+781
|/ / | | | | | | completely NOT work, so at least there's some improvement
* | found itfriendica2013-09-151-3/+3
| |
* | spurious blank linesfriendica2013-09-153-3/+0
| |
* | Merge https://github.com/friendica/red into zpullfriendica2013-09-151-3/+0
|\ \
| * | Content wrapper breaks feature settings. Get rid of it as a quick fix until ↵Thomas Willingham2013-09-161-3/+0
| | | | | | | | | | | | I get a chance to work out why it works everywhere except there.
* | | more loggingfriendica2013-09-151-0/+3
|/ /
* | Merge https://github.com/friendica/red into zpullfriendica2013-09-151-1/+2
|\ \
| * \ Merge pull request #137 from unary/fbrowserThomas Willingham2013-09-151-1/+2
| |\ \ | | | | | | | | fix photo file browser
| | * | fix photo file browserMichael Johnston2013-09-151-1/+2
| |/ /
* / / don't create a directory sync notification (entry in the updates table) if ↵friendica2013-09-151-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 zpullfriendica2013-09-152-12/+13
|\ \
| * \ Merge pull request #136 from cvogeley/masterfriendica2013-09-142-12/+13
| |\ \ | | | | | | | | Search by date
| | * \ Upstream mergeChristian Vogeley2013-09-1592-2558/+3573
| | |\ \ | | |/ / | |/| |
| | * | Search by dateChristian Vogeley2013-09-152-12/+13
| | | | | | | | | | | | | | | | Search by date (archive) works a bit now
* | | | implement what I hope will now be the server side of directory sync, add ↵friendica2013-09-154-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 pushingfriendica2013-09-141-2/+3
| | |
* | | some fixes to directory keyword searchesfriendica2013-09-142-3/+5
| | |
* | | Merge https://github.com/friendica/red into zpullfriendica2013-09-141-5/+6
|\ \ \
| * \ \ Merge pull request #135 from unary/menueditfriendica2013-09-141-5/+6
| |\ \ \ | | | | | | | | | | allow update of menu_desc, fix bug in duplicate menu_name check
| | * | | set menu_channel_id before we use it in a queryMichael Johnston2013-09-141-3/+2
| | | | |
| | * | | let me edit menu_desc even if menu_name has not changedMichael Johnston2013-09-141-2/+4
| | | | |
* | | | | no longer usedfriendica2013-09-141-68/+0
|/ / / /
* | | | Merge https://github.com/friendica/red into zpullfriendica2013-09-141-1303/+1611
|\| | |
| * | | Merge pull request #132 from pixelroot/masterOlaf Conradi2013-09-141-1303/+1611
| |\ \ \ | | | | | | | | | | modified: view/ru/messages.po
| | * | | modified: view/ru/messages.popixelroot2013-09-131-1303/+1611
| | | | |
| * | | | Revert broken commitOlaf Conradi2013-09-141-92/+2
| | | | |
| * | | | First try to tell a comment from a like/dislike in notification systemmrjive2013-09-141-2/+92
| | | | |
* | | | | this might fix "find channels" but I can't test the keyword search until ↵friendica2013-09-142-2/+2
|/ / / / | | | | | | | | | | | | this is running on a production site.
* | | / import_xchan - check every known hubloc/location field and create a new ↵friendica2013-09-142-5/+9
| |_|/ |/| | | | | | | | hubloc if anything at all changed anywhere.
* | | doc update, put more telemetry on notifier and try to ensure that private ↵friendica2013-09-1357-1065/+1586
| | | | | | | | | | | | posts have recipients.
* | | need to figure out what's causing thisfriendica2013-09-121-0/+6
| | |