Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |
| | ||||||
* | missing event permissions | friendica | 2014-10-15 | 1 | -0/+1 | |
| | ||||||
* | $comments > $commentbox | marijus | 2014-10-15 | 1 | -1/+1 | |
| | ||||||
* | some work on single photo view comments | marijus | 2014-10-15 | 1 | -1/+2 | |
| | ||||||
* | one more item_id > id | marijus | 2014-10-15 | 1 | -1/+1 | |
| | ||||||
* | it seems we do not have an key called item_id here so must be id only | marijus | 2014-10-15 | 1 | -1/+1 | |
| | ||||||
* | chanman is now 'locs' and a couple of post handlers have been defined. | friendica | 2014-10-14 | 2 | -31/+90 | |
| | ||||||
* | fix import sql error | friendica | 2014-10-13 | 1 | -1/+1 | |
| | ||||||
* | When you delete something in /cloud stay in the right folder. | Klaus Weidenbach | 2014-10-14 | 1 | -20/+27 | |
| | | | | | | | When you deleted a file in /cloud you was always jumped back to /cloud/[channel], now you will stay in the parent folder. Some more doxygen documentation. Removed duplicate data from logging output and reduced logging in RedDAV in general. | |||||
* | A fix, but I have no case to verify. | Klaus | 2014-10-12 | 1 | -2/+2 | |
| | | | I could not find out under which conditions this is relevant and therefore have no test case, but it must be of instance RedDAV\RedFile. | |||||
* | Moved classes from reddav.php into own files. | Klaus Weidenbach | 2014-10-12 | 1 | -2/+2 | |
| | | | | | | Finished moving classes out from include/reddav.php into own files. Also continued with namespace for RedDAV. Improved some docs and added some todos and fixmes. | |||||
* | Show tag in siteinfo. Not useful for us, quite useful for admins. | Thomas Willingham | 2014-10-11 | 1 | -1/+4 | |
| | ||||||
* | FFS, another oops | Thomas Willingham | 2014-10-11 | 1 | -2/+0 | |
| | ||||||
* | Fix webpages. Sycning between too many codebases... | Thomas Willingham | 2014-10-11 | 1 | -1/+3 | |
| | ||||||
* | Unbreak webpages | Thomas Willingham | 2014-10-11 | 1 | -3/+1 | |
| | ||||||
* | fix diaspora reshare tags | friendica | 2014-10-10 | 1 | -1/+1 | |
| | ||||||
* | This is a fix to not interfere the ongoing adding of ↵ | marijus | 2014-10-10 | 3 | -4/+2 | |
| | | | | | | | .generic-content-wrapper with the ongoing styling of redbasic theme. adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet. Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing. | |||||
* | Added and changed on some places div class generic-content-wrapper. And ↵ | Jeroen | 2014-10-09 | 3 | -3/+10 | |
| | | | | added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it. | |||||
* | oembed issues | friendica | 2014-10-08 | 1 | -2/+3 | |
| | ||||||
* | dav issue | friendica | 2014-10-08 | 1 | -1/+0 | |
| | ||||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-08 | 1 | -1/+3 | |
|\ | ||||||
| * | it's probably better to return an int type in json | tuscanhobbit | 2014-10-08 | 1 | -1/+2 | |
| | | ||||||
| * | The simplest way to hide hubs in statistics | tuscanhobbit | 2014-10-08 | 1 | -1/+2 | |
| | | ||||||
* | | disable email notifications when bulk importing content. | friendica | 2014-10-08 | 1 | -0/+5 | |
|/ | ||||||
* | Merge pull request #620 from dawnbreak/RedDAV | RedMatrix | 2014-10-07 | 1 | -12/+18 | |
|\ | | | | | Moved RedBrowser class from reddav.php to it's own file. | |||||
| * | Moved RedBrowser class from reddav.php to it's own file. | Klaus Weidenbach | 2014-10-06 | 1 | -12/+18 | |
| | | | | | | | | | | | | | | | | | | First step on cleaning up ReadDAV classes and restructuring it bit in preparation for adding some more DAV features, photo access, CalDAV, etc. and hopefully also some PHPunits. Add a PHP5.3 namespace for RedDAV classes. Any objections against this or the vendor namespace? Add some more documentation for RedBrowser. | |||||
* | | found one bug trying to fetch the recursive reshare from hell. I still think ↵ | friendica | 2014-10-06 | 1 | -11/+11 | |
| | | | | | | | | there's a problem with attribution but we'll have to wait and find that once we have some content to track. Also in private messages, on the message list page, change the text from delete message to delete conversation, because that's what we're really doing. | |||||
* | | shareable design elements | friendica | 2014-10-06 | 4 | -11/+68 | |
|/ | ||||||
* | try and guess mimetype for openid profile photo | friendica | 2014-10-05 | 1 | -1/+3 | |
| | ||||||
* | Merge pull request #616 from dawnbreak/docu | RedMatrix | 2014-10-06 | 1 | -42/+44 | |
|\ | | | | | Documentation and some restructure in RedBasicAuth | |||||
| * | Some documentation for include/reddav.php and a bit code cleanup. | Klaus Weidenbach | 2014-10-05 | 1 | -42/+44 | |
| | | | | | | | | | | Removed some duplicate code in RedBasicAuth and restructured a bit. Still work in progress. |