aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
| * | css fixesmarijus2014-11-025-23/+22
| |/
* / I'm going to try again with the conversation request packets. I've looked thi...friendica2014-11-022-13/+60
|/
* add some more safety checks before turning the conversation request messages ...friendica2014-11-023-5/+7
* 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 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 pre...friendica2014-10-311-4/+5
|/ /
* | Heads up: "custom/module.php" is deprecated. Please read this commit if you a...friendica2014-10-301-1/+13
* | 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
* | | 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; since...friendica2014-10-281-1/+14
* | the default permissions for new connections when using a custom role is inade...friendica2014-10-281-1/+5
* | 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 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, error...friendica2014-10-276-13/+31
* | 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" defau...friendica2014-10-273-5/+63
| |/ / |/| |
* | | 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 ch...friendica2014-10-261-6/+11