Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | photo permission inheritance. We want to use the folder permissions unless ↵ | redmatrix | 2015-08-06 | 1 | -0/+17 |
| | | | | specific permissions have been set to over-ride them. If nothing is set, use the channel default. We may have to mess with his further in the case of somebody trying to create a public photo directory when their normal permissions are set to private. Kind of a chicken/egg problem because the folder permissions will be empty. | ||||
* | turn attached audio/video into audio/video elements as well as providing an ↵ | redmatrix | 2015-07-01 | 1 | -1/+7 |
| | | | | attachment link | ||||
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-23 | 1 | -4/+5 |
|\ | | | | | | | | | | | Conflicts: include/items.php mod/item.php | ||||
| * | typo | redmatrix | 2015-06-23 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #356 from solstag/signature_edit_fix | redmatrix | 2015-06-23 | 1 | -2/+2 |
| |\ | | | | | | | properly trims edited posts before signing so signature verification … | ||||
| | * | properly trims edited posts before signing so signature verification works | Alexandre Hannud Abdo | 2015-06-23 | 1 | -2/+2 |
| | | | |||||
| * | | ensure we always sign a trimmed item body. | redmatrix | 2015-06-22 | 1 | -1/+1 |
| |/ | |||||
* | | fix attachment permissions when they also contain an image. | redmatrix | 2015-06-15 | 1 | -0/+15 |
| | | |||||
* | | convert the abook fields | redmatrix | 2015-06-14 | 1 | -2/+2 |
| | | |||||
* | | more work on items | redmatrix | 2015-06-11 | 1 | -6/+47 |
|\| | | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php | ||||
* | | more work on item table optimisation | redmatrix | 2015-06-10 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 1 | -21/+23 |
|\| | |||||
| * | correctly fix attachment permissions from private mentions | Alexandre Hannud Abdo | 2015-06-10 | 1 | -21/+23 |
| | | | | | | | | by postponing code that removes the attachment tag from the body | ||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-02 | 1 | -34/+36 |
|\| | |||||
| * | move the photo and attachment permission syncing past the tag replacement so ↵ | redmatrix | 2015-06-01 | 1 | -34/+36 |
| | | | | | | | | that attachments get the correct permissions when private mentions are used. | ||||
* | | more migration of page types | redmatrix | 2015-05-21 | 1 | -4/+2 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-21 | 1 | -1/+4 |
|\| | |||||
| * | preserve lock on edited comments | redmatrix | 2015-05-21 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 1 | -2/+13 |
|\| | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po | ||||
| * | PRIVACY: possible privacy leakage under a defined set of circumstances | redmatrix | 2015-05-20 | 1 | -4/+13 |
| | | |||||
* | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -25/+4 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 1 | -6/+7 |
| | | | |||||
| * | | for hubzilla we won't be obscuring items, only private mail, this will allow ↵ | redmatrix | 2015-05-05 | 1 | -8/+0 |
| |/ | | | | | | | us to search and cache private posts | ||||
* | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -29/+76 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+1 |
| | | |||||
| * | provide a separate input field for rpost attachments | Mario Vavti | 2015-04-16 | 1 | -1/+1 |
| | | |||||
| * | item_check_service_class wasn't returning correct results | friendica | 2015-04-13 | 1 | -4/+8 |
| | | |||||
| * | update features, allow sys account page deletion | friendica | 2015-04-08 | 1 | -0/+4 |
| | | |||||
| * | add channel_lastpost timestamp to help optimise some outrageously expensive ↵ | friendica | 2015-03-26 | 1 | -0/+7 |
| | | | | | | | | queries. | ||||
| * | item_check_service_class - the join is totally unnecessary | friendica | 2015-03-25 | 1 | -20/+20 |
| | | |||||
| * | operation snakebite, cont. | friendica | 2015-03-22 | 1 | -7/+20 |
| | | |||||
| * | The random bad signatures are because something somewhere is trimming the ↵ | friendica | 2015-03-17 | 1 | -1/+1 |
| | | | | | | | | 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. | ||||
| * | when fixing "naked links" make sure not to double link double urls as seen ↵ | friendica | 2015-03-06 | 1 | -1/+1 |
| | | | | | | | | in archive.org - which has the complete unescaped target url, scheme and all, as part of its own. | ||||
| * | failure to auto update comments if it's your own. | friendica | 2015-02-14 | 1 | -1/+1 |
| | | |||||
| * | issue #896 | friendica | 2015-02-12 | 1 | -1/+1 |
| | | |||||
| * | typo | friendica | 2015-02-12 | 1 | -0/+1 |
| | | |||||
| * | provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵ | friendica | 2015-02-12 | 1 | -3/+3 |
| | | | | | | | | 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. | ||||
| * | item voting tools | friendica | 2015-02-10 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-02-08 | 1 | -0/+1 |
|\| | | | | | | | | | | | Conflicts: mod/events.php view/css/mod_events.css | ||||
| * | undo extra logging | friendica | 2015-02-08 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -6/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php | ||||
| * | remote_user => remote_channel | friendica | 2015-01-28 | 1 | -2/+2 |
| | | |||||
| * | local_user => local_channel | friendica | 2015-01-28 | 1 | -5/+5 |
| | | |||||
* | | more message restrict conversions | friendica | 2015-01-29 | 1 | -5/+4 |
| | | |||||
* | | start on item_restrict conversion | friendica | 2015-01-22 | 1 | -4/+3 |
| | | |||||
* | | more expanding item flags | friendica | 2015-01-22 | 1 | -7/+2 |
| | | |||||
* | | heavy lifting converting item flag bits | friendica | 2015-01-22 | 1 | -1/+1 |
| | | |||||
* | | slow progress removing bitfields on item table | friendica | 2015-01-21 | 1 | -12/+10 |
|/ | |||||
* | correct some activity object types (for comments), also fix a foreach ↵ | friendica | 2015-01-14 | 1 | -14/+21 |
| | | | | warning resulting from recent tag work | ||||
* | some back-end code to support location activity objects. Work in progress. | friendica | 2015-01-14 | 1 | -0/+1 |
| |