aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
* | | prevent mis-configured servers from leaking cookiesfriendica2014-06-241-2/+10
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-2419-5616/+6651
|\ \ \
| * \ \ Merge pull request #506 from dawnbreak/masterRedMatrix2014-06-252-1/+3
| |\ \ \ | | | | | | | | | | Set backlink to the parent folder, not cloud's root.
| | * | | Set backlink to the parent folder, not cloud's root.Klaus Weidenbach2014-06-242-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you edit a file and click on the backlink you always returned to the root folder of your cloud. This patch sets the correct parent folder as backlink. Bit messy, but looks like it works.
| * | | | Merge pull request #504 from HaakonME/masterRedMatrix2014-06-259-5540/+6500
| |\ \ \ \ | | |/ / / | |/| | | Updated Norwegian bokmål translation
| | * | | Removed docs that were not translatedHaakon Meland Eriksen2014-06-2469-4544/+0
| | | | |
| | * | | Updated Norwegian bokmål translationHaakon Meland Eriksen2014-06-242-5540/+5748
| | | | |
| | * | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2014-06-243692-84893/+535272
| | |\ \ \
| | * | | | API functions translated into Norwegian bokmål - typoHaakon Meland Eriksen2014-03-121-1/+1
| | | | | |
| | * | | | API functions translated into Norwegian bokmålHaakon Meland Eriksen2014-03-121-16/+16
| | | | | |
| | * | | | Norwegian splash and main.bb docHaakon Meland Eriksen2014-03-1182-0/+5910
| | | | | |
| * | | | | Merge pull request #505 from tuscanhobbit/masterPaolo T2014-06-243-11/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | IT: updated strings & fixed readme img link
| * | | | Merge pull request #503 from tuscanhobbit/masterRedMatrix2014-06-244-64/+74
| |\ \ \ \ | | | | | | | | | | | | Fixes to links and forward URLs in filestorage
* | | | | | Events show up as notifications about a week in advance so you know they're ↵friendica2014-06-242-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | coming. But let's put an indicator next to the notification count when there's an event that is actually happening today -- so you don't have to look at the calendar or notification detail every day for a week to figure out if the day has finally arrived yet.
| | | | | * Display quota and translatable stringsPaolo Tacconi2014-06-252-37/+67
| | | | |/ | | | |/|
| | | * | IT: updated strings & fixed readme img linktuscanhobbit2014-06-243-11/+11
| | |/ /
| | * | Oops I left some debug stuff aroundtuscanhobbit2014-06-242-6/+11
| | | |
| | * | Fixes to links and forward URLs in filestoragetuscanhobbit2014-06-244-64/+69
| |/ /
| * | Doco - oops, forgot the indexThomas Willingham2014-06-241-1/+1
| | |
| * | Doco - gnusocial doco from RandalThomas Willingham2014-06-242-0/+63
|/ /
* | another one ticked offfriendica2014-06-232-4/+0
| |
* | Merge pull request #501 from pixelroot/masterRedMatrix2014-06-242-1723/+1714
|\ \ | | | | | | modified: view/ru/messages.po
| * | modified: view/ru/messages.popixelroot2014-06-232-1723/+1714
| | | | | | | | | | | | modified: view/ru/strings.php
* | | clean up the awful descriptive text on thing inputfriendica2014-06-232-4/+7
| | |
* | | move the reset of "in_progress" to after the page and structures have ↵friendica2014-06-231-1/+2
| | | | | | | | | | | | completed updating
* | | block edit/delete ability for everybody but the ownerfriendica2014-06-231-7/+16
| | |
* | | Merge branch 'master' of https://github.com/tuscanhobbit/red into ↵friendica2014-06-231-27/+78
|\ \ \ | | | | | | | | | | | | tuscanhobbit-master
| * | | Dav file browser on a single pagetuscanhobbit2014-06-241-27/+78
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 13:25:09 +0000