aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix string horkagefriendica2013-08-092-109/+103
|
* Merge https://github.com/friendica/red into zpullfriendica2013-08-091-422/+379
|\
| * Merge pull request #92 from pixelroot/masterfriendica2013-08-091-422/+379
| |\ | | | | | | modified: view/ru/messages.po
| | * modified: view/ru/messages.popixelroot2013-08-091-422/+379
| | |
* | | string parse error extracting one particular stringfriendica2013-08-094-1280/+1425
|/ /
* | Merge https://github.com/friendica/red into zpullfriendica2013-08-093-1/+18
|\ \
| * \ Merge pull request #90 from beardy-unixer/masterfriendica2013-08-083-1/+18
| |\ \ | | | | | | | | Add access policy to admin panel.
| | * | Unbork webpage permissions - missed this because most of my channel_ids are 1.Thomas Willingham2013-08-071-1/+7
| | | |
| | * | Add access policy to admin panel.Thomas Willingham2013-08-072-0/+11
| | | |
* | | | add a few missing doc pagesfriendica2013-08-096-0/+488
| | | |
* | | | move sitekey creation to the account creation function instead of during ↵friendica2013-08-09103-1776/+1797
|/ / / | | | | | | | | | channel creation. Channel import bypassed sitekey creation completely. We should do it during install, but it's possible somebody might have to install manually and the sitekey would never get created. This is the best compromise I can come up with. Looks like the doc tree was also updated in this checkin
* | | donate linkfriendica2013-08-081-0/+2
| | |
* | | malformed ru string filefriendica2013-08-083-534/+534
| | |
* | | 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