Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-02 | 1 | -6/+56 |
|\ | |||||
| * | asjld work | redmatrix | 2015-06-02 | 1 | -3/+13 |
| | | |||||
| * | bare bones ASLD | redmatrix | 2015-05-31 | 1 | -4/+44 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-31 | 1 | -3/+40 |
|\| | |||||
| * | some basic background work for activitystreams-json-ld-2.0 conversions | redmatrix | 2015-05-31 | 1 | -0/+37 |
| | | |||||
| * | there was a reason we included that file | redmatrix | 2015-05-28 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 1 | -4/+2 |
|\| | | | | | | | | | | | Conflicts: index.php mod/setup.php | ||||
| * | Merge pull request #332 from solstag/zotfeedcleanup | Klaus | 2015-05-24 | 1 | -3/+1 |
| |\ | | | | | | | Import security only when necessary, use correct variable in log | ||||
| | * | Import security only when necessary, use correct variable in log | Alexandre Hannud Abdo | 2015-05-22 | 1 | -3/+1 |
| | | | | | | | | | | | | Just some cleanup, seemed like the intent of previous changes was so | ||||
| * | | federation problem from diaspora comments relayed through red channels due ↵ | redmatrix | 2015-05-23 | 1 | -1/+1 |
| |/ | | | | | | | to typo | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 1 | -6/+21 |
|\| | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po | ||||
| * | cloning abook entries was broken in several ways if the target xchan wasn't ↵ | redmatrix | 2015-05-20 | 1 | -0/+8 |
| | | | | | | | | available on the clone site. This should make it less broken. | ||||
| * | don't allow item_id to update without a valid post id | redmatrix | 2015-05-20 | 1 | -0/+5 |
| | | |||||
| * | PRIVACY: possible privacy leakage under a defined set of circumstances | redmatrix | 2015-05-20 | 1 | -5/+8 |
| | | |||||
* | | re-arrange the html cache a bit | redmatrix | 2015-05-20 | 1 | -0/+2 |
| | | |||||
* | | add rot47 to the mix. This shouldn't affect the speed to any measurable degree. | redmatrix | 2015-05-19 | 1 | -4/+4 |
| | | |||||
* | | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵ | redmatrix | 2015-05-19 | 1 | -9/+10 |
| | | | | | | | | cipher would be adequate for our requirements. | ||||
* | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -60/+17 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-13 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php | ||||
| | * | product was a bad string to use because we may require it for e-commerce, ↵ | redmatrix | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | and RED_PLATFORM is equally problematic for other reasons. | ||||
| * | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 1 | -20/+21 |
| | | | |||||
| * | | no need to obscure the diaspora signature if we're not obscuring the posts | redmatrix | 2015-05-06 | 1 | -4/+10 |
| | | | |||||
| * | | for hubzilla we won't be obscuring items, only private mail, this will allow ↵ | redmatrix | 2015-05-05 | 1 | -50/+1 |
| |/ | | | | | | | us to search and cache private posts | ||||
* | | Merge branch 'master' into tres | friendica | 2015-04-29 | 1 | -3/+9 |
|\| | | | | | | | | | Conflicts: include/notifier.php | ||||
| * | zotfeed issues | friendica | 2015-04-24 | 1 | -3/+3 |
| | | |||||
| * | block unfederated posts from zot_feed | friendica | 2015-04-23 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -547/+633 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css | ||||
| * | issue #176, sender copy of item not obscured if using private mention | friendica | 2015-04-20 | 1 | -1/+3 |
| | | |||||
| * | match parens | friendica | 2015-04-14 | 1 | -1/+1 |
| | | |||||
| * | post_activity_item incorrectly setting the obj_type when a valid type was ↵ | friendica | 2015-04-14 | 1 | -1/+1 |
| | | | | | | | | specified | ||||
| * | Some documentation and whitespaces at line endings. | Klaus Weidenbach | 2015-04-10 | 1 | -159/+232 |
| | | |||||
| * | update features, allow sys account page deletion | friendica | 2015-04-08 | 1 | -0/+5 |
| | | |||||
| * | Correcting reported Doxygen syntax warnings. | Klaus Weidenbach | 2015-03-29 | 1 | -457/+405 |
| | | | | | | | | | | | | | | Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation. | ||||
| * | remove bogus grouping from fix for #938 | friendica | 2015-03-28 | 1 | -2/+2 |
| | | |||||
| * | issue #938 | friendica | 2015-03-28 | 1 | -2/+8 |
| | | |||||
| * | also allow service classes to set post expiration. These take priority over ↵ | friendica | 2015-03-24 | 1 | -3/+3 |
| | | | | | | | | the site default. | ||||
| * | more work on expiration, make system limits useful - even in retrospect | friendica | 2015-03-24 | 1 | -1/+5 |
| | | |||||
| * | provide a site-wide expiration policy without loopholes - still need work to ↵ | friendica | 2015-03-24 | 1 | -1/+1 |
| | | | | | | | | reduce the impact of expiration queries. | ||||
| * | sql errors on postgres with yestderday's optimisation | friendica | 2015-03-24 | 1 | -2/+2 |
| | | |||||
| * | improve performance of the zotfeed queries | friendica | 2015-03-23 | 1 | -10/+9 |
| | | |||||
| * | some tabs title statuseditor restructuring | Mario Vavti | 2015-03-21 | 1 | -1/+1 |
| | | |||||
| * | The random bad signatures are because something somewhere is trimming the ↵ | friendica | 2015-03-17 | 1 | -2/+2 |
| | | | | | | | | body text. It could be any one of hundreds of functions that touch the message body. We really want to trim the body text, so I'm putting back all the trim statements - in mod/item and item_store and item_store_update. The last fix for random bad sigs noted that one of the trims wasn't there, so the others were removed. The correct fix is for all the trims to be there. We will probably have a few (quite a few) bad sigs during the transition back to trimmed text but this should nail it for anybody on recent code and with new content. | ||||
| * | The never ending saga of parent = 0 bugs on Dreamhost. | friendica | 2015-03-01 | 1 | -0/+10 |
| | | |||||
| * | this may actually fix the deliver loop when deleting existing items. It's ↵ | friendica | 2015-02-25 | 1 | -0/+15 |
| | | | | | | | | hackish but I don't see any other way out. | ||||
| * | Found the cause of the delete looping, and I can prevent it going forward. ↵ | friendica | 2015-02-25 | 1 | -1/+10 |
| | | | | | | | | The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments. | ||||
| * | call post_local hooks prior to storing a post that is going to be sourced. ↵ | friendica | 2015-02-25 | 1 | -0/+2 |
| | | | | | | | | There are some fields in the actual stored item that may change when we start the second delivery chain so a few plugins may not deal with these items correctly. Since we only source public items these effects will be slight. | ||||
| * | Fixes tag delivery regex for when multiple tags are present | Alexandre Hannud Abdo | 2015-02-13 | 1 | -2/+2 |
| | | | | | | | | | | Previous regex would cause matches to span several tags when present, thus never recognizing the mention. | ||||
| * | provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵ | friendica | 2015-02-12 | 1 | -5/+4 |
| | | | | | | | | searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief. | ||||
| * | Dot not trim body in order to avoid issues with signature checks | Alexandre Hannud Abdo | 2015-02-12 | 1 | -2/+2 |
| | | |||||
| * | issue #843 | friendica | 2015-02-11 | 1 | -0/+3 |
| | |