aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | |/ | | | |/|
| | | * | 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.popixelroot2014-06-232-1723/+1714
* | | 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 complet...friendica2014-06-231-1/+2
* | | block edit/delete ability for everybody but the ownerfriendica2014-06-231-7/+16
* | | Merge branch 'master' of https://github.com/tuscanhobbit/red into tuscanhobbi...friendica2014-06-231-27/+78
|\ \ \
| * | | Dav file browser on a single pagetuscanhobbit2014-06-241-27/+78
| |/ /
* | | ability to like thingsfriendica2014-06-239-12/+62