aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* one </div> to much and css fixesmarijus2014-11-032-79/+79
|
* Merge branch 'master' of https://github.com/friendica/redmarijus2014-11-033-1/+377
|\
| * provide example import scriptfriendica2014-11-033-1/+377
| |
* | if uploading a photo go away to albummarijus2014-11-031-2/+7
| |
* | if deleting a photo go away to albummarijus2014-11-032-8/+10
|/
* php warningsfriendica2014-11-021-23/+23
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-026-24/+23
|\
| * Pixelbit restored. Going forwards, we probably want to add a checkThomas Willingham2014-11-021-0/+1
| | | | | | | | | | | | that a directory is returning something in find_upstream_directory() since this was spotted by a new install who thought *they* were broken.
| * Merge branch 'master' of https://github.com/friendica/redmarijus2014-11-021-1/+0
| |\
| | * Remove pixelbits from directory fallback - blocked public searches provideThomas Willingham2014-11-021-1/+0
| | | | | | | | | | | | no results.
| * | css fixesmarijus2014-11-025-23/+22
| |/
* / I'm going to try again with the conversation request packets. I've looked ↵friendica2014-11-022-13/+60
|/ | | | this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
* add some more safety checks before turning the conversation request messages ↵friendica2014-11-023-5/+7
| | | | back on
* even more photos workmarijus2014-11-016-160/+103
|
* close the eventual open tool if the other opensmarijus2014-11-011-2/+2
|
* check that we have valid datafriendica2014-11-012-10/+17
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-0112-87/+70
|\
| * do not reload page for photo uploadmarijus2014-10-319-43/+26
| |
| * Smarty3 now lives in storeThomas Willingham2014-10-311-4/+0
| |
| * Merge pull request #671 from pafcu/masterjeroenpraat2014-10-311-1/+4
| |\ | | | | | | Fix problem with default birth date
| | * Fix problem with default birth dateStefan Parviainen2014-10-311-1/+4
| | |
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-3185-3609/+3601
| |\ \
| * | | more work on photo uploadmarijus2014-10-315-40/+41
| | | |
* | | | disable request message response until we work through thisfriendica2014-11-013-2/+4
| | | |
* | | | doc updatesfriendica2014-11-0110-0/+1049
| |/ / |/| |
* | | document request packets a bit morefriendica2014-10-311-1/+4
| | |
* | | doc updatesfriendica2014-10-3184-3604/+3592
| | |
* | | flag notify packets that are sent in response to a message_id request and ↵friendica2014-10-311-4/+5
|/ / | | | | | | prevent them from recursing
* | Heads up: "custom/module.php" is deprecated. Please read this commit if you ↵friendica2014-10-301-1/+13
| | | | | | | | are affected.
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-3016-429/+737
|\ \
| * | Debian doco - no longer uses dropbear.Thomas Willingham2014-10-311-2/+2
| | |
| * | removing this was not a good idea...marijus2014-10-301-0/+4
| | |
| * | update bootstrap library to version 3.3marijus2014-10-308-333/+660
| | |
| * | some work on photo uploadmarijus2014-10-307-97/+74
| | |
* | | What this checkin does is catch the case where a comment arrived and there's ↵friendica2014-10-308-23/+180
| | | | | | | | | | | | a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-291-10/+12
|\| |
| * | if someone does not have permission to chat do not show the chatrooms tabmarijus2014-10-291-10/+12
| | |
* | | allow feed pagingfriendica2014-10-292-1/+4
|/ /
* | if any privacy tags are created on a top level post, restrict the post; ↵friendica2014-10-281-1/+14
| | | | | | | | since it could have been quite sensitive. If there were errors processing the actual tag restrict the post to the profile owner. Also make the "privacy tag over-rides ACL" behaviour configurable. Default is that privacy tags over-ride the ACL.
* | the default permissions for new connections when using a custom role is ↵friendica2014-10-281-1/+5
| | | | | | | | inadequate. Until we can make it configurable start off with something like a public social role. We're typically taking the person straight to the connection editor so they can change it before any privacy damage is done
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-283-29/+66
|\ \
| * \ Merge pull request #668 from git-marijus/masterRedMatrix2014-10-283-29/+66
| |\ \ | | | | | | | | change the way tagrm works to allow tag removal on the fly
| | * | change the way tagrm works to allow tag removal on the flymarijus2014-10-283-29/+66
| |/ /
* / / change photo tag bubble tipfriendica2014-10-282-2/+2
|/ /
* | several unrelated things - auto_follow wasn't working for new accounts, ↵friendica2014-10-276-13/+31
| | | | | | | | error returned in private mention to a collection, and added auto-completion to photo tags; though it only matches people so the hover text is now wrong. Also made the photo edit form XHTML (XML) compliant.
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-2712-5996/+6185
|\ \
| * | do not reload page for edit album and some minor cleanupmarijus2014-10-277-57/+41
| | |
| * | Merge branch 'master' of https://github.com/friendica/redJeroen2014-10-273-1/+61
| |\ \
| * | | update nl + Terms of Service more prominent in the help files.Jeroen2014-10-275-5939/+6144
| | | |
* | | | add "repository" permissions role and make sure we have a sane "accept" ↵friendica2014-10-273-5/+63
| |/ / |/| | | | | | | | default for the custom role.