aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-06-1659-883/+1003
|\
| * directory search by hubfriendica2013-06-161-1/+3
| |
| * hopefully this won't screw up everything - if it does, revert. Otherwise ↵friendica2013-06-162-23/+31
| | | | | | | | this should work at delivery time to check tag deliveries and bounce the message before it's stored if the channel doesn't allow you to post and you aren't allowed to tag deliver either. Previously this was handled after the post was already stored so you needed posting permission as well as tag deliver permission to get past the checks.
| * flag taggable connections in acl selectorfriendica2013-06-165-17/+18
| |
| * don't federate webpages ;-)friendica2013-06-151-0/+6
| |
| * fix "new connection has less permissions than public"friendica2013-06-151-4/+12
| |
| * hijack the #getzot tagfriendica2013-06-151-9/+17
| |
| * silence a pointless warningfriendica2013-06-152-2/+2
| |
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-141-0/+85
| |\
| | * Merge pull request #57 from git-marijus/patch-1Thomas Willingham2013-06-141-30/+33
| | |\ | | | | | | | | beautify code
| | | * beautify codegit-marijus2013-06-141-30/+33
| | |/
| | * Lighttpd sample configThomas Willingham2013-06-141-0/+82
| | |
| * | push refresh messages, performance work on conversations and configs, doc ↵friendica2013-06-1437-327/+398
| |/ | | | | | | updates
| * possibly fix skipped pages on endless scrollfriendica2013-06-131-6/+15
| |
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-131-0/+29
| |\
| | * Nginx config - add an index in case they don't have a http blockThomas Willingham2013-06-131-0/+1
| | |
| | * Add sample nginx conf in doc/install - we'll keep configs and trouble ↵Thomas Willingham2013-06-131-0/+28
| | | | | | | | | | | | | | | | | | shooting doco here, where everything can be plain text, since it's for people who haven't got Red installed yet/properly, and may not be able to read markdown easily.
| * | missing includefriendica2013-06-132-1/+2
| |/
| * feeds are bit more standards compliant and a bit less broken nowfriendica2013-06-123-60/+52
| |
| * very minimal Atom feed - there will be a lot of bugs and unparseable content ↵friendica2013-06-121-192/+64
| | | | | | | | if you've got elaborately structured objects, but I got the thing to at least render in firefox given some quick test posts. If you find bugs (as you certainly will), feel free to fix them.
| * missed a few zrl/zmg conversions, like for translate_item and enotify messagesfriendica2013-06-123-27/+28
| |
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-093-0/+6
| |\
| | * Another missing includeThomas Willingham2013-06-091-0/+1
| | |
| | * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2013-06-0912-261/+278
| | |\
| | * | Quick fix for PCSS until the cleaned up version is finished.Thomas Willingham2013-06-092-0/+5
| | | |
| * | | rev updatefriendica2013-06-091-1/+1
| | |/ | |/|
| * | import requires a valid accountfriendica2013-06-081-0/+7
| | |
| * | Merge https://github.com/friendica/red into zpullfriendica2013-06-083-6/+10
| |\|
| | * Rename newmessage widget (since we'll need to put more stuff in it as we ↵Thomas Willingham2013-06-072-6/+9
| | | | | | | | | | | | make zotmail look like email), and add a "check mail" button.
| | * Another missing includeThomas Willingham2013-06-071-0/+1
| | |
| * | remove uploaded import file once we're done with it.friendica2013-06-0812-261/+271
| |/
* | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-06-0782-691/+1154
|\|
| * by default pending connections have no rightsfriendica2013-06-061-2/+2
| |
| * no GMT_TIMESTAMP() in mysql - use UTC_TIMESTAMP() insteadfriendica2013-06-062-2/+2
| |
| * photo album listing widget brokenfriendica2013-06-052-4/+4
| |
| * set default channel to new import if a default channel wasn't already setfriendica2013-06-051-0/+2
| |
| * missing include, plus change to new red api path for basic exportfriendica2013-06-051-2/+2
| |
| * doh - would probably help to decode the data before trying to use it...friendica2013-06-052-1/+2
| |
| * This should get community tagging pretty close to working - deleting a ↵friendica2013-06-042-6/+36
| | | | | | | | community tag is left as a FIXME
| * tagging posts now sends out a presumably legal activity message - all that's ↵friendica2013-06-042-68/+23
| | | | | | | | missing is catching it on the post owner's side, checking if people can tag this stream, and then add the tag to the parent message.
| * DB: add timestamps to hubloc table so we can eventually expire dead entries.friendica2013-06-043-4/+18
| |
| * community tagging - it's not much closer to working but a really good ↵friendica2013-06-043-64/+61
| | | | | | | | developer can now possibly hack their way through it instead of "there's only one person on the planet that can ever make this work".
| * fix buggered contact photosfriendica2013-06-033-1/+32
| |
| * syntax errorfriendica2013-06-031-1/+1
| |
| * templatise alt_pagerfriendica2013-06-034-15/+15
| |
| * move oohembed service to addonfriendica2013-06-031-5/+10
| |
| * quick and dirty (real dirty) template docofriendica2013-06-033-0/+223
| |
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-034-13/+45
| |\
| | * Make a start at making mail look less dreadful.Thomas Willingham2013-06-022-1/+39
| | |
| | * TypoThomas Willingham2013-06-021-1/+1
| | |