aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'root2014-06-29342-117060/+3939
|\
| * 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
| | |/ | |/|
* / | Corrected minor typoroot2014-06-271-1/+1
|/ /
* | 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
* | | 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.Klaus Weidenbach2014-06-262-190/+218
|/ /
* | Merge pull request #507 from tuscanhobbit/masterRedMatrix2014-06-252-37/+67
|\|
| * 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
| | |\ | |_|/ |/| |
* | | 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.Klaus Weidenbach2014-06-242-1/+3
| * | | | Merge pull request #504 from HaakonME/masterRedMatrix2014-06-259-5540/+6500
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
| * | | | Merge pull request #503 from tuscanhobbit/masterRedMatrix2014-06-244-64/+74
| |\ \ \ \
* | | | | | Events show up as notifications about a week in advance so you know they're c...friendica2014-06-242-5/+5
| | | | | * Display quota and translatable stringsPaolo Tacconi2014-06-252-37/+67
| | | | |/ | | | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:32:50 +0000