aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | one more...friendica2014-06-302-2/+3
* | | minor changesfriendica2014-06-292-3/+9
* | | very minor, we don't like the word "user" - it's downgrading. Everybody here ...friendica2014-06-291-2/+2
* | | log the offending dir serverfriendica2014-06-291-0/+2
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-292-566/+641
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-06-292-2/+3
| |\ \ \
| * | | | update nljeroenpraat2014-06-292-566/+641
* | | | | limit updates from new dir servers to avoid exhausting memory.friendica2014-06-292-2/+7
* | | | | keep dirsync from exhausting memoryfriendica2014-06-291-1/+1
| |/ / / |/| | |
* | | | add zottel dir serverfriendica2014-06-292-2/+3
|/ / /
* | | Merge pull request #518 from tluther/masterRedMatrix2014-06-3040-45/+239
|\ \ \
| * | | delete my original doc working backup folderTobias Luther2014-06-291272-143663/+0
| * | | Tidied the folder from old backupsTobias Luther2014-06-298-9/+99
| * | | Some doco work. Changed main.bb and added a return link to all .bb files and ...root2014-06-291306-40/+143807
| * | | Merge remote-tracking branch 'upstream/master'root2014-06-29342-117060/+3939
| |\ \ \
| * | | | Corrected minor typoroot2014-06-271-1/+1
* | | | | Merge pull request #517 from tokudan/masterRedMatrix2014-06-302-1/+29
|\ \ \ \ \
| * | | | | German translation for channels.mdDaniel Frank2014-06-291-0/+28
| * | | | | Update Profile.mdDaniel Frank2014-06-291-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #516 from dawnbreak/masterRedMatrix2014-06-304-90/+172
|\ \ \ \ \
| * | | | | Add rename support for DAV directories.Klaus Weidenbach2014-06-302-15/+63
| * | | | | Return a correct timestamp when a folder is empty.Klaus Weidenbach2014-06-292-36/+50
| * | | | | Fixed some more timestamp bugs in RedDAV.Klaus Weidenbach2014-06-293-32/+46
| * | | | | Fixed a wrong timestamp update when adding a file.Klaus Weidenbach2014-06-292-7/+13
| |/ / / /
* | | | | Merge pull request #519 from cvogeley/masterRedMatrix2014-06-303-5/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove Remove Account link from account settingsChristian Vogeley2014-06-293-5/+7
|/ / / /
* | | | Merge pull request #515 from tuscanhobbit/masterPaolo T2014-06-292-488/+563
|\ \ \ \ | | |/ / | |/| |
| * | | IT:updated stringstuscanhobbit2014-06-292-488/+563
* | | | Doco - update dav2fs instructions. That should never have worked,Thomas Willingham2014-06-292-63/+5
* | | | Merge pull request #513 from dawnbreak/masterRedMatrix2014-06-29241-115912/+2119
|\ \ \ \
| * | | | Update SabreDAV from 1.8.9 to 1.8.10.Klaus Weidenbach2014-06-29239-115479/+1510
| * | | | Some documentation for include/reddav.php and a new tpl-file.Klaus Weidenbach2014-06-292-433/+609
| | |/ / | |/| |
* | | | Merge pull request #514 from tuscanhobbit/masterRedMatrix2014-06-294-37/+27
|\ \ \ \ | | |/ / | |/| |
| * | | Checkboxes were not aligned in connedit, added a tabletuscanhobbit2014-06-284-37/+27
* | | | Doco - yeah, it really took four bloody checkins to finally get this right.Thomas Willingham2014-06-281-1/+1
* | | | remove the feature setting until the community decides what to do and makes i...friendica2014-06-281-1/+1
* | | | rule of snakes #1, kill the snake.friendica2014-06-2811-465/+528
* | | | doc updatefriendica2014-06-2881-94/+696
| |/ / |/| |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-262-1947/+1939
|\ \ \
| * | | update nljeroenpraat2014-06-272-1947/+1939
* | | | still trying to sort out the liveupdate issues. This was getting overly compl...friendica2014-06-261-31/+20
|/ / /
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-265-5/+15
|\ \ \
| * | | Invite appThomas Willingham2014-06-262-0/+4
| * | | also change to div for the with brackets option which we dont actually use...marijus2014-06-261-1/+1
| * | | make it a div to prevent extra borders in some browsers after clickmarijus2014-06-262-4/+8
| * | | Merge pull request #509 from solstag/masterRedMatrix2014-06-261-0/+2
| |\ \ \
| | * | | Let's have a global default startpage before falling back to appsAlexandre Hannud Abdo2014-06-261-0/+2
| |/ / /
* / / / notification being sent for comments from blocked connections on same site.friendica2014-06-263-2/+7
|/ / /
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-252-43/+1
|\ \ \
| * | | Doco - update the right index this time, and only maintain one.Thomas Willingham2014-06-262-43/+1