Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #271 from cvogeley/master | cvogeley | 2014-01-13 | 1 | -3/+8 |
|\ | | | | | Confirm box: fall back to standard js confirm dialog if bootstrap isn't ... | ||||
| * | Confirm box: fall back to standard js confirm dialog if bootstrap isn't ↵ | Christian Vogeley | 2014-01-13 | 1 | -3/+8 |
| | | | | | | | | available | ||||
* | | Merge pull request #269 from tobiasd/de20140113 | tobiasd | 2014-01-12 | 2 | -2239/+2388 |
|\ \ | | | | | | | DE update to the strings | ||||
| * | | DE: update to the strings | Tobias Diekershoff | 2014-01-13 | 2 | -2239/+2388 |
|/ / | |||||
* | | Merge pull request #268 from cvogeley/master | cvogeley | 2014-01-11 | 3 | -5/+7 |
|\| | | | | | delete confirmation popup for blocks and layouts | ||||
| * | delete confirmation popup for blocks and layouts | Christian Vogeley | 2014-01-12 | 3 | -5/+7 |
| | | |||||
* | | 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 | ||||
| * | remove debug loggers | Christian Vogeley | 2014-01-12 | 1 | -3/+0 |
| | | |||||
| * | Fix page layout selector | Christian Vogeley | 2014-01-12 | 2 | -2/+5 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-11 | 2 | -874/+947 |
|\ \ | |||||
| * \ | Merge pull request #264 from tuscanhobbit/master | Paolo T | 2014-01-11 | 2 | -874/+947 |
| |\ \ | | | | | | | | | Italian translation of reddav | ||||
| | * | | Italian translation of reddav | tuscanhobbit | 2014-01-11 | 2 | -874/+947 |
| | | | | |||||
* | | | | mod_attach: output stream wasn't working | friendica | 2014-01-11 | 5 | -6/+14 |
|/ / / | |||||
* | | | DAV put() issues | friendica | 2014-01-10 | 1 | -1/+6 |
| | | | |||||
* | | | preserve mid on edits | friendica | 2014-01-10 | 1 | -2/+9 |
| | | | |||||
* | | | fix cloud path in filestorage edit page | friendica | 2014-01-10 | 1 | -1/+1 |
| |/ |/| | |||||
* | | other reddav issues, but probably won't fix the empty file | friendica | 2014-01-10 | 1 | -4/+5 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-10 | 1 | -3/+1 |
|\ \ | |||||
| * | | Prevent whitespace breaking copy-paste of reset passwords. | Thomas Willingham | 2014-01-10 | 1 | -3/+1 |
| | | | |||||
* | | | this may fix filesize 0 issues | friendica | 2014-01-10 | 1 | -3/+3 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-10 | 2 | -5/+8 |
|\| | | |||||
| * | | Merge pull request #263 from git-marijus/master | Thomas Willingham | 2014-01-10 | 1 | -2/+2 |
| |\ \ | | | | | | | | | make goaway link work | ||||
| | * | | make goaway link work | marijus | 2014-01-10 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #262 from zzottel/master | zzottel | 2014-01-10 | 1 | -3/+0 |
| |\ \ | | | | | | | | | and don't send duplicate notices <sigh> | ||||
| | * | | and don't send duplicate notices <sigh> | zottel | 2014-01-10 | 1 | -3/+0 |
| | | | | |||||
| * | | | Merge pull request #261 from zzottel/master | zzottel | 2014-01-10 | 1 | -3/+9 |
| |\| | | | | | | | | | | add security fix to load case, too | ||||
| | * | | add security fix to load case, too | zottel | 2014-01-10 | 1 | -3/+9 |
| |/ / | |||||
* / / | break delivery loop if an item is deleted twice | friendica | 2014-01-10 | 2 | -2/+9 |
|/ / | |||||
* | | Merge pull request #260 from zzottel/master | friendica | 2014-01-10 | 1 | -2/+3 |
|\ \ | | | | | | | Small fix | ||||
| * | | fix the fix (can't work on query if it hasn't been added to $dest yet) | zottel | 2014-01-10 | 1 | -2/+3 |
| | | | |||||
* | | | security fix for channel?mid= per zottel | friendica | 2014-01-10 | 1 | -2/+4 |
| | | | |||||
* | | | doc updates | friendica | 2014-01-10 | 4 | -0/+374 |
| | | | |||||
* | | | directory creation error, display localtimes on cloud webpage, doc updates | friendica | 2014-01-10 | 115 | -1134/+1838 |
|/ / | |||||
* | | mod_filestorage: provide a URL for linking to webpages and other websites | friendica | 2014-01-09 | 4 | -7/+56 |
| | | |||||
* | | only let visitors remove their own files. | friendica | 2014-01-09 | 5 | -12/+35 |
| | | |||||
* | | add cloud link to profile_tabs and Comanchify the sucker | friendica | 2014-01-09 | 3 | -0/+27 |
| | | |||||
* | | add link from DAV web ui to filestorage to set properties or delete or whatever | friendica | 2014-01-09 | 1 | -0/+8 |
| | | |||||
* | | wrap the web interface to DAV in a Red page. This is before we make the ↵ | friendica | 2014-01-09 | 1 | -0/+181 |
| | | | | | | | | strings translateable and put it in a template. | ||||
* | | simplify permalink selection logic | friendica | 2014-01-09 | 4 | -5/+7 |
| | | |||||
* | | some minor cleanup on plinks for some very subtle permissions issues | friendica | 2014-01-09 | 9 | -31/+43 |
| | | |||||
* | | process str_replace before urlencoding | friendica | 2014-01-09 | 1 | -1/+1 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-09 | 4 | -11/+36 |
|\ \ | |||||
| * \ | Merge pull request #259 from zzottel/master | friendica | 2014-01-09 | 4 | -11/+36 |
| |\ \ | | | | | | | | | Finish up channel/ plinks | ||||
| | * | | use display/ plinks for comments | zottel | 2014-01-09 | 1 | -3/+2 |
| | | | | |||||
| | * | | 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 |
| | | | |