Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix string horkage | friendica | 2013-08-09 | 2 | -109/+103 |
| | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-09 | 1 | -422/+379 |
|\ | |||||
| * | Merge pull request #92 from pixelroot/master | friendica | 2013-08-09 | 1 | -422/+379 |
| |\ | | | | | | | modified: view/ru/messages.po | ||||
| | * | modified: view/ru/messages.po | pixelroot | 2013-08-09 | 1 | -422/+379 |
| | | | |||||
* | | | string parse error extracting one particular string | friendica | 2013-08-09 | 4 | -1280/+1425 |
|/ / | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2013-08-09 | 3 | -1/+18 |
|\ \ | |||||
| * \ | Merge pull request #90 from beardy-unixer/master | friendica | 2013-08-08 | 3 | -1/+18 |
| |\ \ | | | | | | | | | Add access policy to admin panel. | ||||
| | * | | Unbork webpage permissions - missed this because most of my channel_ids are 1. | Thomas Willingham | 2013-08-07 | 1 | -1/+7 |
| | | | | |||||
| | * | | Add access policy to admin panel. | Thomas Willingham | 2013-08-07 | 2 | -0/+11 |
| | | | | |||||
* | | | | add a few missing doc pages | friendica | 2013-08-09 | 6 | -0/+488 |
| | | | | |||||
* | | | | move sitekey creation to the account creation function instead of during ↵ | friendica | 2013-08-09 | 103 | -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 link | friendica | 2013-08-08 | 1 | -0/+2 |
| | | | |||||
* | | | malformed ru string file | friendica | 2013-08-08 | 3 | -534/+534 |
| | | | |||||
* | | | Merge pull request #91 from pixelroot/master | friendica | 2013-08-08 | 1 | -533/+533 |
|\ \ \ | | |/ | |/| | modified: view/ru/messages.po | ||||
| * | | modified: view/ru/messages.po | pixelroot | 2013-08-08 | 1 | -533/+533 |
| | | | |||||
* | | | Add public visibility setting to privacy groups (collections). This doesn't ↵ | friendica | 2013-08-07 | 5 | -49/+80 |
| |/ |/| | | | | | yet make them visible, but allows them to be visible (like a Cc: instead of a Bcc:) | ||||
* | | remove some un-needed code | friendica | 2013-08-07 | 1 | -1320/+10 |
| | | |||||
* | | big changes to photo->store() which is now photo->save() and takes an array ↵ | friendica | 2013-08-07 | 4 | -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. | friendica | 2013-08-06 | 2 | -3/+3 |
| | | |||||
* | | 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 |