Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-01-15 | 3 | -6/+7 |
|\ | |||||
| * | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-15 | 3 | -9/+21 |
| |\ | |||||
| * | | dav: throw exception if channel for requested DAV directory is deleted | friendica | 2014-01-15 | 3 | -6/+7 |
| | | | |||||
* | | | Probably shouldn't list REGISTER_CLOSED sites on a list of open hubs. | Thomas Willingham | 2014-01-14 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge pull request #268 from cvogeley/master | cvogeley | 2014-01-11 | 2 | -4/+6 |
|\ \ | | | | | | | delete confirmation popup for blocks and layouts | ||||
| * | | delete confirmation popup for blocks and layouts | Christian Vogeley | 2014-01-12 | 2 | -4/+6 |
| | | | |||||
* | | | Merge pull request #267 from cvogeley/master | cvogeley | 2014-01-11 | 1 | -1/+6 |
|\| | | | | | | | | Do the same thang for webpage blocks | ||||
| * | | Do the same thang for webpage blocks | Christian Vogeley | 2014-01-12 | 1 | -1/+6 |
| | | | |||||
* | | | Merge pull request #266 from cvogeley/master | cvogeley | 2014-01-11 | 1 | -2/+7 |
|\| | | | | | | | | Fix webpage layout title editing | ||||
| * | | Fix webpage layout title editing | Christian Vogeley | 2014-01-12 | 1 | -2/+7 |
| | | | |||||
* | | | Merge pull request #265 from cvogeley/master | cvogeley | 2014-01-11 | 1 | -2/+2 |
|\| | | |/ |/| | Fix page layout selector | ||||
| * | Fix page layout selector | Christian Vogeley | 2014-01-12 | 1 | -2/+2 |
| | | |||||
* | | mod_attach: output stream wasn't working | friendica | 2014-01-11 | 1 | -4/+6 |
| | | |||||
* | | preserve mid on edits | friendica | 2014-01-10 | 1 | -2/+9 |
|/ | |||||
* | make goaway link work | marijus | 2014-01-10 | 1 | -2/+2 |
| | |||||
* | and don't send duplicate notices <sigh> | zottel | 2014-01-10 | 1 | -3/+0 |
| | |||||
* | add security fix to load case, too | zottel | 2014-01-10 | 1 | -3/+9 |
| | |||||
* | security fix for channel?mid= per zottel | friendica | 2014-01-10 | 1 | -2/+4 |
| | |||||
* | directory creation error, display localtimes on cloud webpage, doc updates | friendica | 2014-01-10 | 1 | -0/+2 |
| | |||||
* | mod_filestorage: provide a URL for linking to webpages and other websites | friendica | 2014-01-09 | 1 | -1/+4 |
| | |||||
* | add cloud link to profile_tabs and Comanchify the sucker | friendica | 2014-01-09 | 1 | -0/+15 |
| | |||||
* | some minor cleanup on plinks for some very subtle permissions issues | friendica | 2014-01-09 | 5 | -23/+24 |
| | |||||
* | fix notices | zottel | 2014-01-09 | 1 | -7/+12 |
| | |||||
* | took out some left-overs from the debugging phase | zottel | 2014-01-09 | 1 | -12/+0 |
| | |||||
* | fix a bug that made it possible for everyone to access any message from other | zottel | 2014-01-09 | 1 | -0/+26 |
| | | | | channels using channel/<channel>/?mid=... | ||||
* | attachment issue | friendica | 2014-01-08 | 1 | -1/+1 |
| | |||||
* | add store directory write check to install checks | friendica | 2014-01-08 | 1 | -0/+20 |
| | |||||
* | This should be approaching completion for file OS storage. May be a few ↵ | friendica | 2014-01-08 | 1 | -1/+8 |
| | | | | minor bugs remaining due to some late-breaking fixes but I've been testing it as I go. | ||||
* | Merge pull request #258 from zzottel/master | friendica | 2014-01-08 | 1 | -28/+48 |
|\ | | | | | Add display of a thread to channel module | ||||
| * | Add display of a thread to channel module using channel/<channel>/?mid=<mid> | zottel | 2014-01-08 | 1 | -28/+48 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-08 | 1 | -0/+2 |
|\ \ | |||||
| * | | Pass hash and extension to the photo templates for plugins that require | Thomas Willingham | 2014-01-08 | 1 | -0/+2 |
| | | | | | | | | | | | | links we can't construct from what's already there. | ||||
* | | | preparatory work for supporting a "list view" mode for conversations. This ↵ | friendica | 2014-01-08 | 4 | -0/+4 |
|/ / | | | | | | | would be useful for forum-like channels and/or block-oriented themes. | ||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-08 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix new connection nav URL | Thomas Willingham | 2014-01-08 | 1 | -1/+1 |
| |/ | |||||
* / | qr enhancements | friendica | 2014-01-08 | 1 | -0/+3 |
|/ | |||||
* | keep the to-do list somewhat current. | friendica | 2014-01-08 | 1 | -1/+8 |
| | |||||
* | qr code support | friendica | 2014-01-07 | 1 | -0/+8 |
| | |||||
* | make storage limit service classes apply to accounts, not channels. Also ↵ | friendica | 2014-01-07 | 2 | -5/+6 |
| | | | | include a css file that was missing from work yesterday. | ||||
* | filestorage re-org and cleanup | friendica | 2014-01-06 | 1 | -2/+4 |
| | |||||
* | special handling for directories | friendica | 2014-01-06 | 1 | -2/+2 |
| | |||||
* | prepare for OS file storage, and add bbcode attachment link to ↵ | friendica | 2014-01-06 | 2 | -3/+10 |
| | | | | mod/filestorage. This isn't beautiful, but it's a start. | ||||
* | add "self" to access control lists with special marking to indicate it's ↵ | friendica | 2014-01-06 | 1 | -4/+4 |
| | | | | special (for instance you can't really deny access to yourself). But this lets us make something private to our eyes only; whatever it may be. | ||||
* | provide ability to change attachment/file permissions | friendica | 2014-01-06 | 1 | -1/+73 |
| | |||||
* | cleanup mod/filestorage before embarking on further changes to it | friendica | 2014-01-06 | 1 | -42/+45 |
| | |||||
* | fix photos/upload album selector | friendica | 2014-01-06 | 1 | -2/+11 |
| | |||||
* | disable web browser post inputs if no storage write permission | friendica | 2014-01-05 | 1 | -78/+6 |
| | |||||
* | reddav - basic mkdir support - needs more work to be robust | friendica | 2014-01-05 | 1 | -0/+2 |
| | |||||
* | the web browser interface for DAV has now got zot | friendica | 2014-01-05 | 1 | -1/+23 |
| | |||||
* | a few fixes to webpage editing | friendica | 2014-01-04 | 4 | -30/+8 |
| |