Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | very minor, we don't like the word "user" - it's downgrading. Everybody here ↵ | friendica | 2014-06-29 | 1 | -2/+2 |
| | | | | is a "member". | ||||
* | log the offending dir server | friendica | 2014-06-29 | 1 | -0/+2 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-29 | 2 | -566/+641 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | jeroenpraat | 2014-06-29 | 2 | -2/+3 |
| |\ | |||||
| * | | update nl | jeroenpraat | 2014-06-29 | 2 | -566/+641 |
| | | | |||||
* | | | limit updates from new dir servers to avoid exhausting memory. | friendica | 2014-06-29 | 2 | -2/+7 |
| | | | |||||
* | | | keep dirsync from exhausting memory | friendica | 2014-06-29 | 1 | -1/+1 |
| |/ |/| | |||||
* | | add zottel dir server | friendica | 2014-06-29 | 2 | -2/+3 |
|/ | |||||
* | Merge pull request #518 from tluther/master | RedMatrix | 2014-06-30 | 40 | -45/+239 |
|\ | | | | | Doco work | ||||
| * | delete my original doc working backup folder | Tobias Luther | 2014-06-29 | 1272 | -143663/+0 |
| | | |||||
| * | Tidied the folder from old backups | Tobias Luther | 2014-06-29 | 8 | -9/+99 |
| | | | | | | | | | | | | | | | | created new files for a quick explanation of the use of accounts, profiles, channels added FAQ for users, admins and developers (the last one might not be exactly necessary?) created a file to explain posting for new users created new file to explain nomadic identities for users modified main.bb | ||||
| * | Some doco work. Changed main.bb and added a return link to all .bb files and ↵ | root | 2014-06-29 | 1306 | -40/+143807 |
| | | | | | | | | began planning new entries for user orientated documentation. | ||||
| * | Merge remote-tracking branch 'upstream/master' | root | 2014-06-29 | 342 | -117060/+3939 |
| |\ | |||||
| * | | Corrected minor typo | root | 2014-06-27 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #517 from tokudan/master | RedMatrix | 2014-06-30 | 2 | -1/+29 |
|\ \ \ | | | | | | | | | Some german translations | ||||
| * | | | German translation for channels.md | Daniel Frank | 2014-06-29 | 1 | -0/+28 |
| | | | | |||||
| * | | | Update Profile.md | Daniel Frank | 2014-06-29 | 1 | -1/+1 |
| | |/ | |/| | | | | added missing word | ||||
* | | | Merge pull request #516 from dawnbreak/master | RedMatrix | 2014-06-30 | 4 | -90/+172 |
|\ \ \ | | | | | | | | | Fixed a wrong timestamp update when adding a file. | ||||
| * | | | Add rename support for DAV directories. | Klaus Weidenbach | 2014-06-30 | 2 | -15/+63 |
| | | | | | | | | | | | | | | | | This works only over DAV right now, no GUI yet. | ||||
| * | | | Return a correct timestamp when a folder is empty. | Klaus Weidenbach | 2014-06-29 | 2 | -36/+50 |
| | | | | | | | | | | | | | | | | | | | | If a folder was empty a zero timestamp was returned. Now it will return the timestamp of the folder itself. | ||||
| * | | | Fixed some more timestamp bugs in RedDAV. | Klaus Weidenbach | 2014-06-29 | 3 | -32/+46 |
| | | | | | | | | | | | | | | | | Fixed an SQL-query in RedFile::put(), where parameters where in wrong order. | ||||
| * | | | Fixed a wrong timestamp update when adding a file. | Klaus Weidenbach | 2014-06-29 | 2 | -7/+13 |
| |/ / | | | | | | | | | | | | | | | | | | | When a file was uploaded the timestamp of the containing folder should get updated, but the timestamp of the first file in the folder was mistakenly updated. There are some more wrong timestamps, but still looking for the bug. | ||||
* | | | Merge pull request #519 from cvogeley/master | RedMatrix | 2014-06-30 | 3 | -5/+7 |
|\ \ \ | |/ / |/| | | Remove Remove Account link from account settings | ||||
| * | | Remove Remove Account link from account settings | Christian Vogeley | 2014-06-29 | 3 | -5/+7 |
|/ / | | | | | | | | | because it doesn’t remove the account. Move channel removal link to channel page | ||||
* | | Merge pull request #515 from tuscanhobbit/master | Paolo T | 2014-06-29 | 2 | -488/+563 |
|\ \ | | | | | | | IT:updated strings | ||||
| * | | IT:updated strings | tuscanhobbit | 2014-06-29 | 2 | -488/+563 |
| | | | |||||
* | | | Doco - update dav2fs instructions. That should never have worked, | Thomas Willingham | 2014-06-29 | 2 | -63/+5 |
| | | | | | | | | | | | | but now it actually doesn't work. | ||||
* | | | Merge pull request #513 from dawnbreak/master | RedMatrix | 2014-06-29 | 241 | -115912/+2119 |
|\ \ \ | | | | | | | | | Some documentation for include/reddav.php and a new tpl-file. | ||||
| * | | | Update SabreDAV from 1.8.9 to 1.8.10. | Klaus Weidenbach | 2014-06-29 | 239 | -115479/+1510 |
| | | | | |||||
| * | | | Some documentation for include/reddav.php and a new tpl-file. | Klaus Weidenbach | 2014-06-29 | 2 | -433/+609 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documented include/reddav.php a bit more to understand what it is about to try to clean up some parts. Still a lot to be done here. I put serveral @todo markers that need to be checked. Moved some more HTML to template file. Changed getETag() return format according to documentation. (ETag MUST be surrounded by double-quotes) | ||||
* | | | Merge pull request #514 from tuscanhobbit/master | RedMatrix | 2014-06-29 | 4 | -37/+27 |
|\ \ \ | | |/ | |/| | Checkboxes were not aligned in connedit, added a table and removed orphaned filestorage.tpl | ||||
| * | | Checkboxes were not aligned in connedit, added a table | tuscanhobbit | 2014-06-28 | 4 | -37/+27 |
| | | | |||||
* | | | Doco - yeah, it really took four bloody checkins to finally get this right. | Thomas Willingham | 2014-06-28 | 1 | -1/+1 |
| | | | |||||
* | | | remove the feature setting until the community decides what to do and makes ↵ | friendica | 2014-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | it happen | ||||
* | | | rule of snakes #1, kill the snake. | friendica | 2014-06-28 | 11 | -465/+528 |
| | | | | | | | | | | | | | | | | | | tinymce is gone. if you want a visual editor, figure out what you want and make it happen. If you don't want a visual editor, do nothing. This is in the community's hands. I don't need a visual editor. | ||||
* | | | doc update | friendica | 2014-06-28 | 81 | -94/+696 |
| |/ |/| | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-26 | 2 | -1947/+1939 |
|\ \ | |||||
| * | | update nl | jeroenpraat | 2014-06-27 | 2 | -1947/+1939 |
| | | | |||||
* | | | still trying to sort out the liveupdate issues. This was getting overly ↵ | friendica | 2014-06-26 | 1 | -31/+20 |
|/ / | | | | | | | complicated with all the different ways we've tried to fix this issue so let's step back and simplify it a bit. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-26 | 5 | -5/+15 |
|\ \ | |||||
| * | | Invite app | Thomas Willingham | 2014-06-26 | 2 | -0/+4 |
| | | | |||||
| * | | also change to div for the with brackets option which we dont actually use... | marijus | 2014-06-26 | 1 | -1/+1 |
| | | | |||||
| * | | make it a div to prevent extra borders in some browsers after click | marijus | 2014-06-26 | 2 | -4/+8 |
| | | | |||||
| * | | Merge pull request #509 from solstag/master | RedMatrix | 2014-06-26 | 1 | -0/+2 |
| |\ \ | | | | | | | | | Let's have a global default startpage before falling back to apps | ||||
| | * | | Let's have a global default startpage before falling back to apps | Alexandre Hannud Abdo | 2014-06-26 | 1 | -0/+2 |
| |/ / | |||||
* / / | notification being sent for comments from blocked connections on same site. | friendica | 2014-06-26 | 3 | -2/+7 |
|/ / | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-25 | 2 | -43/+1 |
|\ \ | |||||
| * | | Doco - update the right index this time, and only maintain one. | Thomas Willingham | 2014-06-26 | 2 | -43/+1 |
| | | | | | | | | | | | | | | | | | | The doco needs cleaning up as we go along, We should keep the bbcode despite the failed experiment because identity tags are just too useful to be without. | ||||
* | | | bring back profile_tabs for unauthenticated visitors to /cloud page | friendica | 2014-06-25 | 2 | -3/+1 |
|/ / | |||||
* | | sql error | friendica | 2014-06-25 | 1 | -1/+1 |
| | |