Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-07 | 1 | -5/+6 |
|\ | |||||
| * | provide lockstate for photo edit | marijus | 2014-11-07 | 1 | -5/+6 |
| | | |||||
* | | fix broken photo edits when adult flag is changed | friendica | 2014-11-07 | 1 | -8/+7 |
|/ | |||||
* | Provide a way to mark photos as adult and hide them from the default album ↵ | friendica | 2014-11-06 | 1 | -27/+31 |
| | | | | view. Still need a button or setting to enable "unsafe viewing". This has no effect anywhere but in the album views. They can still be viewed by flipping through the individual photos with 'prev' and 'next'. We probably need a comprehensive strategy for how to deal with n-s-f-w photos in albums so consider this a band-aid which requires additional work and integration with other facilities which access these photos. It is entirely optional. | ||||
* | provide a lockstate for photo uploads | marijus | 2014-11-06 | 1 | -1/+4 |
| | |||||
* | crude skeleton for location manager and the UI sucks but at least it's on a ↵ | friendica | 2014-11-05 | 1 | -28/+42 |
| | | | | webpage and you don't have to do it by hand. | ||||
* | some minor cleanup of unreported (and as yet undiscovered) issues with ↵ | friendica | 2014-11-05 | 1 | -0/+1 |
| | | | | permissions toggling. No smoking guns and no obvious issues discovered here. Repeated and tried to duplicate zottell's issue as described without seeing any obvious problems. | ||||
* | changed notification description | friendica | 2014-11-04 | 1 | -1/+1 |
| | |||||
* | minor adjustments to make the form work as designed | friendica | 2014-11-04 | 1 | -2/+3 |
| | |||||
* | ok heads up - potentially destabilising change. I've tried to sort out all ↵ | friendica | 2014-11-04 | 1 | -10/+18 |
| | | | | | | | | | | the default connection permissions for those who don't have a predefined (or therefore have a "custom") permissions role. Unfortunately this includes most people that were using this software more than a month ago. The real changes are that the SELF address book entry no longer holds "auto-permissions" but instead holds your "default permissions" (if you have a pre-defined role, the defaults will be pulled from the role table). The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes. What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected. With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on). | ||||
* | configurable visual alerts/notifications | friendica | 2014-11-04 | 2 | -72/+166 |
| | |||||
* | wall posted comment to a top-level wall post which arrived via a route (e.g. ↵ | friendica | 2014-11-03 | 1 | -0/+3 |
| | | | | was posted to a forum) had no route, hence downstream recipients report route mismatch | ||||
* | 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 | 1 | -1/+3 |
| | |||||
* | even more photos work | marijus | 2014-11-01 | 1 | -11/+9 |
| | |||||
* | check that we have valid data | friendica | 2014-11-01 | 1 | -10/+16 |
| | |||||
* | do not reload page for photo upload | marijus | 2014-10-31 | 1 | -12/+8 |
| | |||||
* | more work on photo upload | marijus | 2014-10-31 | 1 | -7/+5 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-30 | 1 | -36/+13 |
|\ | |||||
| * | some work on photo upload | marijus | 2014-10-30 | 1 | -36/+13 |
| | | |||||
* | | What this checkin does is catch the case where a comment arrived and there's ↵ | friendica | 2014-10-30 | 2 | -2/+16 |
| | | | | | | | | 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. | ||||
* | | allow feed paging | friendica | 2014-10-29 | 1 | -0/+3 |
|/ | |||||
* | 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. | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-28 | 2 | -28/+65 |
|\ | |||||
| * | change the way tagrm works to allow tag removal on the fly | marijus | 2014-10-28 | 2 | -28/+65 |
| | | |||||
* | | change photo tag bubble tip | friendica | 2014-10-28 | 1 | -1/+1 |
|/ | |||||
* | several unrelated things - auto_follow wasn't working for new accounts, ↵ | friendica | 2014-10-27 | 2 | -5/+6 |
| | | | | 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 | 1 | -27/+21 |
|\ | |||||
| * | do not reload page for edit album and some minor cleanup | marijus | 2014-10-27 | 1 | -27/+21 |
| | | |||||
* | | add "repository" permissions role and make sure we have a sane "accept" ↵ | friendica | 2014-10-27 | 1 | -0/+6 |
|/ | | | | default for the custom role. | ||||
* | a couple of photo tag issues | friendica | 2014-10-26 | 2 | -23/+34 |
| | |||||
* | couple of other places where we need to reset stuff completely if the role ↵ | friendica | 2014-10-26 | 1 | -6/+11 |
| | | | | changes | ||||
* | reset ACL just in case it was custom already. | friendica | 2014-10-26 | 1 | -1/+1 |
| | |||||
* | put privacy role selector in settings page. Change visibility of various ↵ | friendica | 2014-10-26 | 1 | -117/+107 |
| | | | | permissions items accordingly. | ||||
* | use intval rather than dbesc since these are ints. Should work regardless, ↵ | friendica | 2014-10-26 | 1 | -2/+2 |
| | | | | but this makes it consistent with the way we do most other queries. | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-26 | 1 | -3/+37 |
|\ | | | | | | | | | Conflicts: mod/like.php | ||||
| * | some work on photos like/dislike | marijus | 2014-10-25 | 2 | -4/+37 |
| | | |||||
* | | allow photos without comments to be liked | friendica | 2014-10-26 | 1 | -2/+15 |
|/ | |||||
* | make bbcode/html includes work in markdown help pages and vice versa | zottel | 2014-10-24 | 1 | -7/+19 |
| | |||||
* | Issue #661 | Thomas Willingham | 2014-10-24 | 1 | -1/+1 |
| | |||||
* | don't offer forum (@name+) completion in comments, since it won't do anything. | friendica | 2014-10-23 | 1 | -2/+2 |
| | |||||
* | improved wall-to-wall detection for comments so we can handle Diaspora ↵ | friendica | 2014-10-22 | 1 | -6/+16 |
| | | | | | | | signing and wall-to-wall attribution correctly. Do it at the point of submission. This also fixes a potential bug in yesterday's wall-to-wall permission setting, if it was a local comment to a remote post. | ||||
* | Merge pull request #655 from pafcu/master | RedMatrix | 2014-10-22 | 1 | -7/+26 |
|\ | | | | | Better handling of incorrect info entered in event | ||||
| * | If entered event info is not valid, let user try again with the old info ↵ | Stefan Parviainen | 2014-10-21 | 1 | -7/+26 |
| | | | | | | | | still there. Closes friendica/red#648 | ||||
* | | private forum issues | friendica | 2014-10-21 | 1 | -0/+15 |
| | | |||||
* | | wrong template loaded issue | friendica | 2014-10-20 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-20 | 1 | -10/+10 |
|\| | |||||
| * | more work on photos | marijus | 2014-10-20 | 1 | -10/+10 |
| | | |||||
* | | move all theme initialisation to one place - just after calling module_init. ↵ | friendica | 2014-10-20 | 1 | -4/+18 |
|/ | | | | Revert if there are serious issues, but please note the issues in as much detail as possible so we can work through them. | ||||
* | merge madness | friendica | 2014-10-19 | 3 | -57/+10 |
| |