Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | |||||
| | * | | "Can edit my webpages" permissions | Thomas Willingham | 2013-08-01 | 3 | -15/+58 |
| | | | | |||||
| * | | | Merge pull request #85 from git-marijus/master | friendica | 2013-08-01 | 3 | -2/+4 |
| |\ \ \ | | |/ / | |/| | | make "selected" class work on all navigation menu items | ||||
| | * | | make "selected" class work on all navigation menu items | marijus | 2013-08-01 | 3 | -2/+4 |
| |/ / | |||||
* / / | yhis should fix the privacy leak - as well as non-private replies to private ↵ | friendica | 2013-08-01 | 4 | -3/+7 |
|/ / | | | | | | | posts | ||||
* | | privacy leakage | friendica | 2013-07-31 | 1 | -1/+1 |
| | | |||||
* | | fix some privacy leakage in logs | friendica | 2013-07-31 | 3 | -25/+29 |
| | | |||||
* | | better mail obscuring | friendica | 2013-07-31 | 7 | -61/+96 |
| | | |||||
* | | missing include | friendica | 2013-07-30 | 1 | -0/+1 |
| | | |||||
* | | attachment permissions not right | friendica | 2013-07-30 | 2 | -40/+46 |
| | | |||||
* | | unencrypt private posts for editing | friendica | 2013-07-30 | 2 | -1/+10 |
| | | |||||
* | | zot feed - getting cut off too early | friendica | 2013-07-29 | 1 | -6/+9 |
| | | |||||
* | | ensure conversation is included | friendica | 2013-07-29 | 1 | -0/+1 |
| | | |||||
* | | fix some weirdness on the zot feed | friendica | 2013-07-29 | 3 | -13/+24 |
| | | |||||
* | | fix bug #84, make imported messages from your clones show up on your wall | friendica | 2013-07-29 | 6 | -3/+30 |
| | | |||||
* | | tgroup_check wasn't allowing comments through. | friendica | 2013-07-29 | 1 | -2/+9 |
| | | |||||
* | | load_pconfig had some issues when given a family | friendica | 2013-07-29 | 2 | -27/+13 |
| | | |||||
* | | browser location issue but this may not fix it | friendica | 2013-07-29 | 2 | -2/+2 |
| | | |||||
* | | encrypt private messages on disk - there are still a couple of places where ↵ | friendica | 2013-07-28 | 4 | -8/+69 |
| | | | | | | | | the text is leaked in the logs during processing. | ||||
* | | cleaning up issues reported in logs | friendica | 2013-07-28 | 2 | -7/+2 |
| | | |||||
* | | improve the red smiley | friendica | 2013-07-28 | 2 | -2/+2 |
| | | |||||
* | | add gz to access denied files to block rotated logs from public access | friendica | 2013-07-26 | 85 | -1323/+1079 |
|/ | |||||
* | the rest of the heavy lifting on clone sync - now we're down to some log ↵ | friendica | 2013-07-25 | 2 | -1/+83 |
| | | | | messages and a whole lot of testing | ||||
* | trying to center the selected channel on the manage page. Dreamhost really ↵ | friendica | 2013-07-25 | 2 | -3/+18 |
| | | | | botched up my dev site so it's taking 5 minute per page load - and I don't have any more time to waste tweaking one line of CSS, grabbing a cup of coffee, and drinking it, before seeing the CSS changes. It still needs more tweaking but I might have to do that on the production site - which loads promptly. | ||||
* | build_sync_packet was looking at stale channel info - load it fresh from the DB. | friendica | 2013-07-25 | 1 | -1/+8 |
| | |||||
* | log the sync packets locally at LOGGER_DATA level | friendica | 2013-07-25 | 1 | -0/+2 |
| | |||||
* | include zot | friendica | 2013-07-25 | 2 | -1/+2 |
| | |||||
* | more work on clone sync | friendica | 2013-07-25 | 4 | -105/+103 |
| | |||||
* | fix media uploads in api (specifically friendica for android) | friendica | 2013-07-25 | 3 | -38/+12 |
| | |||||
* | gprobe requires hex argument | friendica | 2013-07-24 | 1 | -1/+1 |
| |