aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update nljeroenpraat2014-06-292-566/+641
|
* Merge pull request #518 from tluther/masterRedMatrix2014-06-3040-45/+239
|\ | | | | Doco work
| * delete my original doc working backup folderTobias Luther2014-06-291272-143663/+0
| |
| * Tidied the folder from old backupsTobias Luther2014-06-298-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 ↵root2014-06-291306-40/+143807
| | | | | | | | began planning new entries for user orientated documentation.
| * 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
|\ \ \ | | | | | | | | Some german translations
| * | | German translation for channels.mdDaniel Frank2014-06-291-0/+28
| | | |
| * | | Update Profile.mdDaniel Frank2014-06-291-1/+1
| | |/ | |/| | | | added missing word
* | | Merge pull request #516 from dawnbreak/masterRedMatrix2014-06-304-90/+172
|\ \ \ | | | | | | | | Fixed a wrong timestamp update when adding a file.
| * | | Add rename support for DAV directories.Klaus Weidenbach2014-06-302-15/+63
| | | | | | | | | | | | | | | | This works only over DAV right now, no GUI yet.
| * | | Return a correct timestamp when a folder is empty.Klaus Weidenbach2014-06-292-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 Weidenbach2014-06-293-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 Weidenbach2014-06-292-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/masterRedMatrix2014-06-303-5/+7
|\ \ \ | |/ / |/| | Remove Remove Account link from account settings
| * | Remove Remove Account link from account settingsChristian Vogeley2014-06-293-5/+7
|/ / | | | | | | | | because it doesn’t remove the account. Move channel removal link to channel page
* | Merge pull request #515 from tuscanhobbit/masterPaolo T2014-06-292-488/+563
|\ \ | | | | | | IT:updated strings
| * | IT:updated stringstuscanhobbit2014-06-292-488/+563
| | |
* | | Doco - update dav2fs instructions. That should never have worked,Thomas Willingham2014-06-292-63/+5
| | | | | | | | | | | | but now it actually doesn't work.
* | | Merge pull request #513 from dawnbreak/masterRedMatrix2014-06-29241-115912/+2119
|\ \ \ | | | | | | | | Some documentation for include/reddav.php and a new tpl-file.
| * | | 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
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/masterRedMatrix2014-06-294-37/+27
|\ \ \ | | |/ | |/| Checkboxes were not aligned in connedit, added a table and removed orphaned filestorage.tpl
| * | 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 ↵friendica2014-06-281-1/+1
| | | | | | | | | | | | it happen
* | | rule of snakes #1, kill the snake.friendica2014-06-2811-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 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 ↵friendica2014-06-261-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_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 apps
| | * | 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
| | | | | | | | | | | | | | | | | | 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 pagefriendica2014-06-252-3/+1
|/ /
* | sql errorfriendica2014-06-251-1/+1
| |
* | fix bad translation of blockquote in wordpress ("post_to_red") pluginfriendica2014-06-252-5/+5
| |
* | Merge pull request #508 from dawnbreak/masterRedMatrix2014-06-262-190/+218
|\ \ | | | | | | Templified cloud's directory listing.
| * | Templified cloud's directory listing.Klaus Weidenbach2014-06-262-190/+218
|/ / | | | | | | | | | | Moved HTML for the directory listing from include/reddav.php to it's own template file. Still need to clean it up bit more, but should be useable already.
* | Merge pull request #507 from tuscanhobbit/masterRedMatrix2014-06-252-37/+67
|\| | | | | | | | | Filestorage: display quota, friendly file size, translatable strings (You're on a roll... :-)
| * Delete confirmation is translatablePaolo Tacconi2014-06-251-1/+1
| |
| * Merge branch 'master' of https://github.com/tuscanhobbit/redPaolo Tacconi2014-06-2514-5548/+6518
| |\
| | * Merge pull request #1 from friendica/masterPaolo T2014-06-2514-5548/+6518
| | |\ | |_|/ |/| | Updated fork
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 23:18:39 +0000