aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tweak "typical" perms macroThomas Willingham2014-01-161-3/+3
|
* Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-masterfriendica2014-01-152-4537/+5082
|\ | | | | | | | | Conflicts: view/ru/strings.php
| * modified: view/ru/messages.popixelroot2014-01-132-1922/+1599
| | | | | | | | modified: view/ru/strings.php
| * modified: view/ru/messages.popixelroot2014-01-131-3661/+4094
| |
* | Merge pull request #272 from beardy-unixer/masterfriendica2014-01-152-4/+17
|\ \ | | | | | | Probably shouldn't list REGISTER_CLOSED sites on a list of open hubs.
| * \ Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-01-1510-31/+81
| |\ \ | |/ / |/| |
* | | allow menus to have special rolesfriendica2014-01-153-4/+19
| | |
* | | fix folder timestamps and change them when a child DAV file is written tofriendica2014-01-151-5/+31
| | |
* | | Merge https://github.com/friendica/red into zpullfriendica2014-01-156-2252/+2418
|\ \ \
* | | | dav: throw exception if channel for requested DAV directory is deletedfriendica2014-01-157-22/+31
| | | |
| | * | Log failed auth to it's own file so fail2ban doesn't have to parse MB of textThomas Willingham2014-01-151-2/+15
| | | |
| | * | Probably shouldn't list REGISTER_CLOSED sites on a list of open hubs.Thomas Willingham2014-01-141-2/+2
| |/ /
| * | Merge pull request #271 from cvogeley/mastercvogeley2014-01-131-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 Vogeley2014-01-131-3/+8
| | | | | | | | | | | | | | | | available
| * | | Merge pull request #269 from tobiasd/de20140113tobiasd2014-01-122-2239/+2388
| |\ \ \ | | | | | | | | | | DE update to the strings
| | * | | DE: update to the stringsTobias Diekershoff2014-01-132-2239/+2388
| |/ / /
| * | | Merge pull request #268 from cvogeley/mastercvogeley2014-01-113-5/+7
| |\| | | | | | | | | | delete confirmation popup for blocks and layouts
| | * | delete confirmation popup for blocks and layoutsChristian Vogeley2014-01-123-5/+7
| | | |
| * | | Merge pull request #267 from cvogeley/mastercvogeley2014-01-111-1/+6
| |\| | | | | | | | | | Do the same thang for webpage blocks
| | * | Do the same thang for webpage blocksChristian Vogeley2014-01-121-1/+6
| | | |
| * | | Merge pull request #266 from cvogeley/mastercvogeley2014-01-111-2/+7
| |\| | | | | | | | | | Fix webpage layout title editing
| | * | Fix webpage layout title editingChristian Vogeley2014-01-121-2/+7
| | | |
| * | | Merge pull request #265 from cvogeley/mastercvogeley2014-01-111-2/+2
|/| | | | |/ / | | | Fix page layout selector
| * | remove debug loggersChristian Vogeley2014-01-121-3/+0
| | |
| * | Fix page layout selectorChristian Vogeley2014-01-122-2/+5
| | |
* | | Merge https://github.com/friendica/red into zpullfriendica2014-01-112-874/+947
|\ \ \
| * \ \ Merge pull request #264 from tuscanhobbit/masterPaolo T2014-01-112-874/+947
| |\ \ \ | | | | | | | | | | Italian translation of reddav
| | * | | Italian translation of reddavtuscanhobbit2014-01-112-874/+947
| | | | |
* | | | | mod_attach: output stream wasn't workingfriendica2014-01-115-6/+14
|/ / / /
* | | | DAV put() issuesfriendica2014-01-101-1/+6
| | | |
* | | | preserve mid on editsfriendica2014-01-101-2/+9
| | | |
* | | | fix cloud path in filestorage edit pagefriendica2014-01-101-1/+1
| |/ / |/| |
* | | other reddav issues, but probably won't fix the empty filefriendica2014-01-101-4/+5
| | |
* | | Merge https://github.com/friendica/red into zpullfriendica2014-01-101-3/+1
|\ \ \
| * | | Prevent whitespace breaking copy-paste of reset passwords.Thomas Willingham2014-01-101-3/+1
| | | |
* | | | this may fix filesize 0 issuesfriendica2014-01-101-3/+3
| | | |
* | | | Merge https://github.com/friendica/red into zpullfriendica2014-01-102-5/+8
|\| | |
| * | | Merge pull request #263 from git-marijus/masterThomas Willingham2014-01-101-2/+2
| |\ \ \ | | | | | | | | | | make goaway link work
| | * | | make goaway link workmarijus2014-01-101-2/+2
| |/ / /
| * | | Merge pull request #262 from zzottel/masterzzottel2014-01-101-3/+0
| |\ \ \ | | | | | | | | | | and don't send duplicate notices <sigh>
| | * | | and don't send duplicate notices <sigh>zottel2014-01-101-3/+0
| | | | |
| * | | | Merge pull request #261 from zzottel/masterzzottel2014-01-101-3/+9
| |\| | | | | | | | | | | | | add security fix to load case, too
| | * | | add security fix to load case, toozottel2014-01-101-3/+9
| |/ / /
* / / / break delivery loop if an item is deleted twicefriendica2014-01-102-2/+9
|/ / /
* | | Merge pull request #260 from zzottel/masterfriendica2014-01-101-2/+3
|\ \ \ | | | | | | | | Small fix
| * | | fix the fix (can't work on query if it hasn't been added to $dest yet)zottel2014-01-101-2/+3
| | | |
* | | | security fix for channel?mid= per zottelfriendica2014-01-101-2/+4
| | | |
* | | | doc updatesfriendica2014-01-104-0/+374
| | | |
* | | | directory creation error, display localtimes on cloud webpage, doc updatesfriendica2014-01-10115-1134/+1838
|/ / /
* | | mod_filestorage: provide a URL for linking to webpages and other websitesfriendica2014-01-094-7/+56
| | |