aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \
| * | 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
* | | more work on photo uploadmarijus2014-10-315-40/+41
|/ /
* | 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.
* | | some documentation of permission roles and what the differences are.friendica2014-10-273-1/+61
|/ /
* | turn down the preview logging. Haven't needed that level of detail recently.friendica2014-10-261-2/+2
| |
* | a couple of photo tag issuesfriendica2014-10-262-23/+34
| |
* | couple of other places where we need to reset stuff completely if the role ↵friendica2014-10-261-6/+11
| | | | | | | | changes
* | reset ACL just in case it was custom already.friendica2014-10-261-1/+1
| |
* | put privacy role selector in settings page. Change visibility of various ↵friendica2014-10-266-150/+157
| | | | | | | | permissions items accordingly.
* | use intval rather than dbesc since these are ints. Should work regardless, ↵friendica2014-10-261-2/+2
| | | | | | | | but this makes it consistent with the way we do most other queries.
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-263-14/+114
|\ \ | | | | | | | | | | | | Conflicts: mod/like.php
| * | wrong vars in templatemarijus2014-10-261-2/+2
| | |
| * | some work on photos like/dislikemarijus2014-10-254-15/+114
| | |
* | | allow photos without comments to be likedfriendica2014-10-262-3/+16
|/ /
* | moved post_to_red to its own project ( https://github.com/friendica/wptored ↵friendica2014-10-253-533/+1
| | | | | | | | ), which I was planning to do anyway since it's kind of lost in the util folder, but also because having it there may present licensing issues, as it's GPL.
* | the to-do list is getting longer again.friendica2014-10-241-0/+3
| |
* | doh - this needs to be markdown, not bbcodefriendica2014-10-241-2/+2
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-2413-33/+45
|\ \
| * \ Merge pull request #665 from zzottel/masterRedMatrix2014-10-251-7/+19
| |\ \ | | | | | | | | make bbcode/html includes work in markdown help pages and vice versa
| | * | make bbcode/html includes work in markdown help pages and vice versazottel2014-10-241-7/+19
| |/ /
| * | Issue #661Thomas Willingham2014-10-241-1/+1
| | |
| * | Merge pull request #664 from zzottel/masterzzottel2014-10-2411-25/+25
| |\ \ | | | | | | | | German help and addon footer correction