Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | one </div> to much and css fixes | marijus | 2014-11-03 | 2 | -79/+79 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-11-03 | 3 | -1/+377 |
|\ | |||||
| * | provide example import script | friendica | 2014-11-03 | 3 | -1/+377 |
| | | |||||
* | | if uploading a photo go away to album | marijus | 2014-11-03 | 1 | -2/+7 |
| | | |||||
* | | if deleting a photo go away to album | marijus | 2014-11-03 | 2 | -8/+10 |
|/ | |||||
* | php warnings | friendica | 2014-11-02 | 1 | -23/+23 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-02 | 6 | -24/+23 |
|\ | |||||
| * | Pixelbit restored. Going forwards, we probably want to add a check | Thomas Willingham | 2014-11-02 | 1 | -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/red | marijus | 2014-11-02 | 1 | -1/+0 |
| |\ | |||||
| | * | Remove pixelbits from directory fallback - blocked public searches provide | Thomas Willingham | 2014-11-02 | 1 | -1/+0 |
| | | | | | | | | | | | | no results. | ||||
| * | | css fixes | marijus | 2014-11-02 | 5 | -23/+22 |
| |/ | |||||
* / | I'm going to try again with the conversation request packets. I've looked ↵ | friendica | 2014-11-02 | 2 | -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 ↵ | friendica | 2014-11-02 | 3 | -5/+7 |
| | | | | back on | ||||
* | even more photos work | marijus | 2014-11-01 | 6 | -160/+103 |
| | |||||
* | close the eventual open tool if the other opens | marijus | 2014-11-01 | 1 | -2/+2 |
| | |||||
* | check that we have valid data | friendica | 2014-11-01 | 2 | -10/+17 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-01 | 12 | -87/+70 |
|\ | |||||
| * | do not reload page for photo upload | marijus | 2014-10-31 | 9 | -43/+26 |
| | | |||||
| * | Smarty3 now lives in store | Thomas Willingham | 2014-10-31 | 1 | -4/+0 |
| | | |||||
| * | Merge pull request #671 from pafcu/master | jeroenpraat | 2014-10-31 | 1 | -1/+4 |
| |\ | | | | | | | Fix problem with default birth date | ||||
| | * | Fix problem with default birth date | Stefan Parviainen | 2014-10-31 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-10-31 | 85 | -3609/+3601 |
| |\ \ | |||||
| * | | | more work on photo upload | marijus | 2014-10-31 | 5 | -40/+41 |
| | | | | |||||
* | | | | disable request message response until we work through this | friendica | 2014-11-01 | 3 | -2/+4 |
| | | | | |||||
* | | | | doc updates | friendica | 2014-11-01 | 10 | -0/+1049 |
| |/ / |/| | | |||||
* | | | document request packets a bit more | friendica | 2014-10-31 | 1 | -1/+4 |
| | | | |||||
* | | | doc updates | friendica | 2014-10-31 | 84 | -3604/+3592 |
| | | | |||||
* | | | flag notify packets that are sent in response to a message_id request and ↵ | friendica | 2014-10-31 | 1 | -4/+5 |
|/ / | | | | | | | prevent them from recursing | ||||
* | | Heads up: "custom/module.php" is deprecated. Please read this commit if you ↵ | friendica | 2014-10-30 | 1 | -1/+13 |
| | | | | | | | | are affected. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-30 | 16 | -429/+737 |
|\ \ | |||||
| * | | Debian doco - no longer uses dropbear. | Thomas Willingham | 2014-10-31 | 1 | -2/+2 |
| | | | |||||
| * | | removing this was not a good idea... | marijus | 2014-10-30 | 1 | -0/+4 |
| | | | |||||
| * | | update bootstrap library to version 3.3 | marijus | 2014-10-30 | 8 | -333/+660 |
| | | | |||||
| * | | some work on photo upload | marijus | 2014-10-30 | 7 | -97/+74 |
| | | | |||||
* | | | What this checkin does is catch the case where a comment arrived and there's ↵ | friendica | 2014-10-30 | 8 | -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_merge | friendica | 2014-10-29 | 1 | -10/+12 |
|\| | | |||||
| * | | if someone does not have permission to chat do not show the chatrooms tab | marijus | 2014-10-29 | 1 | -10/+12 |
| | | | |||||
* | | | allow feed paging | friendica | 2014-10-29 | 2 | -1/+4 |
|/ / | |||||
* | | if any privacy tags are created on a top level post, restrict the post; ↵ | friendica | 2014-10-28 | 1 | -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 ↵ | friendica | 2014-10-28 | 1 | -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_merge | friendica | 2014-10-28 | 3 | -29/+66 |
|\ \ | |||||
| * \ | Merge pull request #668 from git-marijus/master | RedMatrix | 2014-10-28 | 3 | -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 fly | marijus | 2014-10-28 | 3 | -29/+66 |
| |/ / | |||||
* / / | change photo tag bubble tip | friendica | 2014-10-28 | 2 | -2/+2 |
|/ / | |||||
* | | several unrelated things - auto_follow wasn't working for new accounts, ↵ | friendica | 2014-10-27 | 6 | -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_merge | friendica | 2014-10-27 | 12 | -5996/+6185 |
|\ \ | |||||
| * | | do not reload page for edit album and some minor cleanup | marijus | 2014-10-27 | 7 | -57/+41 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/friendica/red | Jeroen | 2014-10-27 | 3 | -1/+61 |
| |\ \ | |||||
| * | | | update nl + Terms of Service more prominent in the help files. | Jeroen | 2014-10-27 | 5 | -5939/+6144 |
| | | | | |||||
* | | | | add "repository" permissions role and make sure we have a sane "accept" ↵ | friendica | 2014-10-27 | 3 | -5/+63 |
| |/ / |/| | | | | | | | | default for the custom role. |