aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #91 from pixelroot/masterfriendica2013-08-081-533/+533
|\ | | | | modified: view/ru/messages.po
| * modified: view/ru/messages.popixelroot2013-08-081-533/+533
| |
* | Add public visibility setting to privacy groups (collections). This doesn't ↵friendica2013-08-075-49/+80
| | | | | | | | yet make them visible, but allows them to be visible (like a Cc: instead of a Bcc:)
* | remove some un-needed codefriendica2013-08-071-1320/+10
| |
* | big changes to photo->store() which is now photo->save() and takes an array ↵friendica2013-08-074-20/+172
| | | | | | | | instead of a list of args. Also the beginning of the migration to using photo_flags to indicate special purpose photos such as profile photos and contact photos and "thing" photos.
* | This is an actual arrowhead, the nabla is a math operator.friendica2013-08-062-3/+3
| |
* | wee bit of css cleanupfriendica2013-08-063-297/+102
| |
* | Add a site access policy (to determine if this is really a public site or ↵friendica2013-08-067-15/+42
| | | | | | | | just an open site) and add an orphan flag to xchans in case all their hublocs go away. Get rid of a couple of DO NOT EDIT template messages which were still lurking in the tree.
* | ru string updatefriendica2013-08-061-1901/+1385
| |
* | Merge pull request #89 from pixelroot/masterfriendica2013-08-061-6559/+4136
|\| | | | | modified: view/ru/messages.po
| * modified: view/ru/messages.popixelroot2013-08-061-10/+10
| |
| * modified: view/ru/messages.popixelroot2013-08-061-6559/+4136
| |
* | convert all stored json calls to json_decode_plus()friendica2013-08-066-24/+24
| |
* | we've been storing json_encoded structures on disk in several places because ↵friendica2013-08-064-7/+14
| | | | | | | | it's a lot easier to parse than xml - but OMG do they get mangled - stored as single quoted strings when escaped as if double quoted. We need to use my new function json_decode_plus() wherever we need to parse one of these babies to make sure we get it right. Maybe we should've just used serialize().
* | add extra logging to tag_deliverfriendica2013-08-051-2/+6
| |
* | fine tuning the error checksfriendica2013-08-051-1/+6
| |
* | keep total of imported xchans correct - even if one or mail failures occurfriendica2013-08-051-4/+7
| |
* | more error checking in case import_xchan failsfriendica2013-08-051-0/+8
| |
* | use url part of arrayfriendica2013-08-051-1/+1
| |
* | put rotated/compressed logs (.gz) into ignore listfriendica2013-08-051-0/+1
| |
* | prune old suggested channelsfriendica2013-08-051-0/+10
| |
* | populate initial suggestions (ultimately we want to do this at install time ↵friendica2013-08-056-88/+96
| | | | | | | | as well as from the poller so that new sites have friend suggestions when they create their first channel).
* | Merge https://github.com/friendica/red into zpullfriendica2013-08-050-0/+0
|\ \
| * | Issue #88Thomas Willingham2013-08-051-1/+1
| | |
* | | enotify: localize things we know how to translatefriendica2013-08-054-9/+15
|/ /
* | directory server sitelist module (needed for public site list and building ↵friendica2013-08-042-0/+52
| | | | | | | | friend suggestions for new sites/channels with no known contacts)
* | js_upload is wretched, but at least fix the HTML in the template so it will ↵friendica2013-08-041-1/+1
| | | | | | | | work again.
* | progress on unfriendingfriendica2013-08-042-21/+34
| |
* | Merge https://github.com/friendica/red into zpullfriendica2013-08-041-5/+1
|\ \
| * | Template boo-booThomas Willingham2013-08-041-5/+1
| | |
* | | basic *account* removal, but the channel removal which it calls still needs ↵friendica2013-08-044-24/+52
|/ / | | | | | | (lots of) work. Oh and the intro table is no longer used and won't be - so it's gone.
* | don't show connections with removed xchans - as there isn't much to seefriendica2013-08-042-31/+30
| |
* | $yoursite/~foo has taken you to foo's channel page for ages. If you're ↵friendica2013-08-042-4/+11
| | | | | | | | logged in locally, $yoursite/~ will now take you to *your* channel page. If you aren't logged in, it won't.
* | connect link in directoryfriendica2013-08-033-4/+27
| |
* | doc updatesfriendica2013-08-039-13/+13
| |
* | Merge https://github.com/friendica/red into zpullfriendica2013-08-033-349/+160
|\ \
| * \ Merge pull request #87 from cvogeley/masterfriendica2013-08-033-349/+160
| |\ \ | | | | | | | | includes/bbcode.php:check if bbcode tag exists before executing regexes
| | * | change back mod to 644Christian Vogeley2013-08-032-0/+0
| | | |
| | * | Revert "Revert "merge""Christian Vogeley2013-08-03119-1512/+1510
| | | | | | | | | | | | | | | | This reverts commit 9294f72adb3c076932558b6f29a4c570e7962764.
| | * | Revert "merge"Christian Vogeley2013-08-03119-1510/+1512
| | | | | | | | | | | | | | | | | | | | This reverts commit c0cd147a3a9a86b270ea32026089ced16fb2f50c, reversing changes made to d2d1e54bfe928fe4cdfdcfc7e9acf658cda76898.
| | * | mergeChristian Vogeley2013-08-03119-1512/+1510
| | |\ \
| | * | | Check existance of bbcode tags before executing regexes, to avoid ↵Christian Vogeley2013-07-281-109/+160
| | | | | | | | | | | | | | | | | | | | unnecessary execution
| | * | | .Christian Vogeley2013-07-272-0/+143
| | | | |
| | * | | don't know why they were marked as changedChristian Vogeley2013-07-272-143/+0
| | | | |
| | * | | don't why they were marked as changedChristian Vogeley2013-07-272-240/+0
| | | | |
* | | | | rev updatefriendica2013-08-031-1/+1
|/ / / /
* | / / Make Zot a bit more prominent in the READMEfriendica2013-08-021-0/+1
| |/ / |/| |
* | | basic email invitations - and doc updatefriendica2013-08-0226-378/+393
| | |
* | | potentially fixes the "federation" bug w/r/t/ tagged forumsfriendica2013-08-011-2/+2
| | |
* | | minor - change nav_set_selected() to only highlight intros if on that ↵friendica2013-08-011-1/+1
| | | | | | | | | | | | particular connections page and not for any connections page.