Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | some more bookmark infrastructure plus a doc update | friendica | 2014-01-18 | 37 | -553/+690 |
| | |||||
* | kill the ummagumma effect | friendica | 2014-01-16 | 2 | -3/+5 |
| | |||||
* | Merge pull request #273 from zzottel/master | friendica | 2014-01-16 | 1 | -1/+5 |
|\ | | | | | prevent reload loop if JS is active, but no cookies accepted | ||||
| * | prevent reload loop if JS is active, but no cookies accepted | zottel | 2014-01-16 | 1 | -1/+5 |
|/ | |||||
* | Update messages.po | fabrixxm | 2014-01-16 | 1 | -1/+0 |
| | | | should make transifex happy | ||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-16 | 3 | -296/+3 |
|\ | |||||
| * | Remove deprecated CSS - there is a dark schema now, and shadows and stuff ↵ | Thomas Willingham | 2014-01-16 | 2 | -293/+0 |
| | | | | | | | | are cofigurable. | ||||
| * | Tweak "typical" perms macro | Thomas Willingham | 2014-01-16 | 1 | -3/+3 |
| | | |||||
* | | prevent zid's from reaching the DAV core code. | friendica | 2014-01-16 | 3 | -2/+5 |
|/ | |||||
* | Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master | friendica | 2014-01-15 | 2 | -4537/+5082 |
|\ | | | | | | | | | Conflicts: view/ru/strings.php | ||||
| * | modified: view/ru/messages.po | pixelroot | 2014-01-13 | 2 | -1922/+1599 |
| | | | | | | | | modified: view/ru/strings.php | ||||
| * | modified: view/ru/messages.po | pixelroot | 2014-01-13 | 1 | -3661/+4094 |
| | | |||||
* | | Merge pull request #272 from beardy-unixer/master | friendica | 2014-01-15 | 2 | -4/+17 |
|\ \ | | | | | | | Probably shouldn't list REGISTER_CLOSED sites on a list of open hubs. | ||||
| * \ | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-01-15 | 10 | -31/+81 |
| |\ \ | |/ / |/| | | |||||
* | | | allow menus to have special roles | friendica | 2014-01-15 | 3 | -4/+19 |
| | | | |||||
* | | | fix folder timestamps and change them when a child DAV file is written to | friendica | 2014-01-15 | 1 | -5/+31 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-15 | 6 | -2252/+2418 |
|\ \ \ | |||||
* | | | | dav: throw exception if channel for requested DAV directory is deleted | friendica | 2014-01-15 | 7 | -22/+31 |
| | | | | |||||
| | * | | Log failed auth to it's own file so fail2ban doesn't have to parse MB of text | Thomas Willingham | 2014-01-15 | 1 | -2/+15 |
| | | | | |||||
| | * | | Probably shouldn't list REGISTER_CLOSED sites on a list of open hubs. | Thomas Willingham | 2014-01-14 | 1 | -2/+2 |
| |/ / | |||||
| * | | 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 |