Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix merge conflict | Stefan Parviainen | 2014-11-08 | 14 | -189/+345 |
|\ | |||||
| * | provide lockstate for photo edit | marijus | 2014-11-07 | 1 | -1/+1 |
| | | |||||
| * | Provide a way to mark photos as adult and hide them from the default album ↵ | friendica | 2014-11-06 | 1 | -1/+3 |
| | | | | | | | | 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. | ||||
| * | crude skeleton for location manager and the UI sucks but at least it's on a ↵ | friendica | 2014-11-05 | 1 | -0/+26 |
| | | | | | | | | webpage and you don't have to do it by hand. | ||||
| * | Merge pull request #674 from pafcu/master | RedMatrix | 2014-11-06 | 1 | -1/+1 |
| |\ | | | | | | | Fix duplicate element id | ||||
| * | | minor adjustments to make the form work as designed | friendica | 2014-11-04 | 1 | -6/+9 |
| | | | |||||
| * | | ok heads up - potentially destabilising change. I've tried to sort out all ↵ | friendica | 2014-11-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+23 |
| | | | |||||
| * | | class > id mixup | marijus | 2014-11-04 | 1 | -1/+1 |
| | | | |||||
| * | | missing </div> | marijus | 2014-11-04 | 1 | -2/+3 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-11-03 | 2 | -86/+81 |
| |\ \ | |||||
| | * | | one </div> to much and css fixes | marijus | 2014-11-03 | 1 | -79/+74 |
| | | | | |||||
| | * | | if deleting a photo go away to album | marijus | 2014-11-03 | 1 | -7/+7 |
| | | | | |||||
| * | | | various UI issues related to having an enormous number of entries in the ↵ | friendica | 2014-11-03 | 1 | -1/+27 |
| |/ / | | | | | | | | | | posted_date selector including years/months that had no posts | ||||
| * | | css fixes | marijus | 2014-11-02 | 3 | -14/+14 |
| | | | |||||
| * | | even more photos work | marijus | 2014-11-01 | 4 | -91/+90 |
| | | | |||||
| * | | close the eventual open tool if the other opens | marijus | 2014-11-01 | 1 | -2/+2 |
| | | | |||||
| * | | do not reload page for photo upload | marijus | 2014-10-31 | 6 | -19/+11 |
| | | | |||||
| * | | Smarty3 now lives in store | Thomas Willingham | 2014-10-31 | 1 | -4/+0 |
| | | | |||||
| * | | more work on photo upload | marijus | 2014-10-31 | 1 | -15/+26 |
| | | | |||||
| * | | some work on photo upload | marijus | 2014-10-30 | 2 | -36/+49 |
| | | | |||||
| * | | change the way tagrm works to allow tag removal on the fly | marijus | 2014-10-28 | 1 | -1/+1 |
| | | | |||||
| * | | several unrelated things - auto_follow wasn't working for new accounts, ↵ | friendica | 2014-10-27 | 1 | -8/+8 |
| | | | | | | | | | | | | 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. | ||||
| * | | do not reload page for edit album and some minor cleanup | marijus | 2014-10-27 | 4 | -17/+16 |
| | | | |||||
| * | | put privacy role selector in settings page. Change visibility of various ↵ | friendica | 2014-10-26 | 1 | -24/+22 |
| | | | | | | | | | | | | permissions items accordingly. | ||||
| * | | wrong vars in template | marijus | 2014-10-26 | 1 | -2/+2 |
| | | | |||||
| * | | some work on photos like/dislike | marijus | 2014-10-25 | 2 | -11/+77 |
| | | | |||||
| * | | don't offer forum (@name+) completion in comments, since it won't do anything. | friendica | 2014-10-23 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #655 from pafcu/master | RedMatrix | 2014-10-22 | 1 | -0/+1 |
| |\ \ | | | | | | | | | Better handling of incorrect info entered in event | ||||
| * | | | fix nav double dropdown | marijus | 2014-10-21 | 1 | -4/+8 |
| | | | | |||||
| * | | | minor correction and typo | marijus | 2014-10-20 | 1 | -4/+3 |
| | | | | |||||
* | | | | Fix highlighting of login button | Stefan Parviainen | 2014-11-08 | 1 | -2/+2 |
| |_|/ |/| | | |||||
* | | | Fix duplicate element id | Stefan Parviainen | 2014-11-05 | 1 | -1/+1 |
| |/ |/| | |||||
* | | If entered event info is not valid, let user try again with the old info ↵ | Stefan Parviainen | 2014-10-21 | 1 | -0/+1 |
|/ | | | | still there. Closes friendica/red#648 | ||||
* | not quite there yet but getting closer | marijus | 2014-10-20 | 1 | -79/+81 |
| | |||||
* | more work on photos | marijus | 2014-10-20 | 1 | -34/+41 |
| | |||||
* | link tag closed prematurely | friendica | 2014-10-19 | 2 | -3/+3 |
| | |||||
* | merge madness | friendica | 2014-10-19 | 3 | -93/+17 |
| | |||||
* | mark signature forgeries | friendica | 2014-10-16 | 2 | -2/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/pafcu/red | Stefan Parviainen | 2014-10-16 | 4 | -21/+31 |
|\ | |||||
| * | missing event permissions | friendica | 2014-10-15 | 2 | -3/+4 |
| | | |||||
| * | some work on single photo view comments | marijus | 2014-10-15 | 2 | -18/+27 |
| | | |||||
* | | Login menu | Stefan Parviainen | 2014-10-16 | 1 | -7/+8 |
|/ | |||||
* | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-10-13 | 1 | -2/+2 |
|\ | |||||
| * | bring back PM upload functionality and why oh why are we still loading tinymce? | friendica | 2014-10-13 | 1 | -2/+2 |
| | | |||||
* | | really fix connedit > collection > checkbox | marijus | 2014-10-13 | 1 | -7/+3 |
|/ | |||||
* | fix connedit > collection > checkbox position | marijus | 2014-10-12 | 1 | -6/+8 |
| | |||||
* | Show tag in siteinfo. Not useful for us, quite useful for admins. | Thomas Willingham | 2014-10-11 | 1 | -0/+3 |
| | |||||
* | Also that doesn't work anymore - prettyPhoto relic | Thomas Willingham | 2014-10-11 | 1 | -1/+1 |
| | |||||
* | Give Redbasic the -styled back | Thomas Willingham | 2014-10-11 | 1 | -1/+1 |
| |