Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | wee bit of css cleanup | friendica | 2013-08-06 | 3 | -297/+102 |
| | |||||
* | Add a site access policy (to determine if this is really a public site or ↵ | friendica | 2013-08-06 | 7 | -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 update | friendica | 2013-08-06 | 1 | -1901/+1385 |
| | |||||
* | Merge pull request #89 from pixelroot/master | friendica | 2013-08-06 | 1 | -6559/+4136 |
|\ | | | | | modified: view/ru/messages.po | ||||
| * | modified: view/ru/messages.po | pixelroot | 2013-08-06 | 1 | -10/+10 |
| | | |||||
| * | modified: view/ru/messages.po | pixelroot | 2013-08-06 | 1 | -6559/+4136 |
| | | |||||
* | | convert all stored json calls to json_decode_plus() | friendica | 2013-08-06 | 6 | -24/+24 |
| | | |||||
* | | we've been storing json_encoded structures on disk in several places because ↵ | friendica | 2013-08-06 | 4 | -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_deliver | friendica | 2013-08-05 | 1 | -2/+6 |
| | | |||||
* | | fine tuning the error checks | friendica | 2013-08-05 | 1 | -1/+6 |
| | | |||||
* | | keep total of imported xchans correct - even if one or mail failures occur | friendica | 2013-08-05 | 1 | -4/+7 |
| | | |||||
* | | more error checking in case import_xchan fails | friendica | 2013-08-05 | 1 | -0/+8 |
| | | |||||
* | | use url part of array | friendica | 2013-08-05 | 1 | -1/+1 |
| | | |||||
* | | put rotated/compressed logs (.gz) into ignore list | friendica | 2013-08-05 | 1 | -0/+1 |
| | | |||||
* | | prune old suggested channels | friendica | 2013-08-05 | 1 | -0/+10 |
| | | |||||
* | | populate initial suggestions (ultimately we want to do this at install time ↵ | friendica | 2013-08-05 | 6 | -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 zpull | friendica | 2013-08-05 | 0 | -0/+0 |
|\ \ | |||||
| * | | Issue #88 | Thomas Willingham | 2013-08-05 | 1 | -1/+1 |
| | | | |||||
* | | | enotify: localize things we know how to translate | friendica | 2013-08-05 | 4 | -9/+15 |
|/ / | |||||
* | | directory server sitelist module (needed for public site list and building ↵ | friendica | 2013-08-04 | 2 | -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 ↵ | friendica | 2013-08-04 | 1 | -1/+1 |
| | | | | | | | | work again. | ||||
* | | progress on unfriending | friendica | 2013-08-04 | 2 | -21/+34 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-04 | 1 | -5/+1 |
|\ \ | |||||
| * | | Template boo-boo | Thomas Willingham | 2013-08-04 | 1 | -5/+1 |
| | | | |||||
* | | | basic *account* removal, but the channel removal which it calls still needs ↵ | friendica | 2013-08-04 | 4 | -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 see | friendica | 2013-08-04 | 2 | -31/+30 |
| | | |||||
* | | $yoursite/~foo has taken you to foo's channel page for ages. If you're ↵ | friendica | 2013-08-04 | 2 | -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 directory | friendica | 2013-08-03 | 3 | -4/+27 |
| | | |||||
* | | doc updates | friendica | 2013-08-03 | 9 | -13/+13 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-03 | 3 | -349/+160 |
|\ \ | |||||
| * \ | Merge pull request #87 from cvogeley/master | friendica | 2013-08-03 | 3 | -349/+160 |
| |\ \ | | | | | | | | | includes/bbcode.php:check if bbcode tag exists before executing regexes | ||||
| | * | | change back mod to 644 | Christian Vogeley | 2013-08-03 | 2 | -0/+0 |
| | | | | |||||
| | * | | Revert "Revert "merge"" | Christian Vogeley | 2013-08-03 | 119 | -1512/+1510 |
| | | | | | | | | | | | | | | | | This reverts commit 9294f72adb3c076932558b6f29a4c570e7962764. | ||||
| | * | | Revert "merge" | Christian Vogeley | 2013-08-03 | 119 | -1510/+1512 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit c0cd147a3a9a86b270ea32026089ced16fb2f50c, reversing changes made to d2d1e54bfe928fe4cdfdcfc7e9acf658cda76898. | ||||
| | * | | merge | Christian Vogeley | 2013-08-03 | 119 | -1512/+1510 |
| | |\ \ | |||||
| | * | | | Check existance of bbcode tags before executing regexes, to avoid ↵ | Christian Vogeley | 2013-07-28 | 1 | -109/+160 |
| | | | | | | | | | | | | | | | | | | | | unnecessary execution | ||||
| | * | | | . | Christian Vogeley | 2013-07-27 | 2 | -0/+143 |
| | | | | | |||||
| | * | | | don't know why they were marked as changed | Christian Vogeley | 2013-07-27 | 2 | -143/+0 |
| | | | | | |||||
| | * | | | don't why they were marked as changed | Christian Vogeley | 2013-07-27 | 2 | -240/+0 |
| | | | | | |||||
* | | | | | rev update | friendica | 2013-08-03 | 1 | -1/+1 |
|/ / / / | |||||
* | / / | Make Zot a bit more prominent in the README | friendica | 2013-08-02 | 1 | -0/+1 |
| |/ / |/| | | |||||
* | | | basic email invitations - and doc update | friendica | 2013-08-02 | 26 | -378/+393 |
| | | | |||||
* | | | potentially fixes the "federation" bug w/r/t/ tagged forums | friendica | 2013-08-01 | 1 | -2/+2 |
| | | | |||||
* | | | minor - change nav_set_selected() to only highlight intros if on that ↵ | friendica | 2013-08-01 | 1 | -1/+1 |
| | | | | | | | | | | | | particular connections page and not for any connections page. | ||||
* | | | pass item by reference so title can be altered | friendica | 2013-08-01 | 2 | -13/+21 |
| | | | |||||
* | | | ensure that no unencrypted content leaks through item_store which is private ↵ | friendica | 2013-08-01 | 4 | -12/+28 |
| | | | | | | | | | | | | | | | | | | - we typically do this in mod/item, but some functions bypass mod/item to create private posts | ||||
* | | | add "xchan_instance_url" for communicating with services that lack nomadic ↵ | friendica | 2013-08-01 | 3 | -2/+11 |
| | | | | | | | | | | | | identity. This will be set to the url of the Red site that they are connected with. Only the nomadic identity clone at that site can communicate directly with them. Other instances will need to relay through that site - and if it goes down, that connection is stuffed. | ||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-01 | 6 | -17/+61 |
|\ \ \ | |||||
| * \ \ | Merge pull request #86 from beardy-unixer/master | friendica | 2013-08-01 | 3 | -15/+57 |
| |\ \ \ | | | | | | | | | | | "Can edit my webpages" permissions | ||||
| | * | | | Remove logging | Thomas Willingham | 2013-08-01 | 1 | -1/+0 |
| | | | | |