aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/ /
* | | ability to like thingsfriendica2014-06-239-12/+62
| | |
* | | language selector appfriendica2014-06-232-0/+3
| | |
* | | process profile like removals with normal low_level drop_itemfriendica2014-06-232-1/+10
|/ /
* | profile likesfriendica2014-06-226-61/+229
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-224-1718/+1665
|\ \
| * \ Merge pull request #500 from tuscanhobbit/masterPaolo T2014-06-222-1669/+1661
| |\ \ | | | | | | | | IT: strings updated
| | * | IT: strings updatedtuscanhobbit2014-06-222-1669/+1661
| | | |
| * | | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-06-2281-4074/+4430
| |\ \ \
| * | | | Minor docoThomas Willingham2014-06-222-49/+4
| | | | |
* | | | | give the admin a link to view channels from the channel admin pagefriendica2014-06-221-1/+1
| | | | |
* | | | | when an admin censors a channel, we only need to notify the directory and ↵friendica2014-06-222-6/+14
| | | | | | | | | | | | | | | | | | | | not all the connections.
* | | | | honour the admin censored flag in the directory, and some slow progress on ↵friendica2014-06-225-61/+141
| |/ / / |/| | | | | | | | | | | extended likes
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-222-14/+27
|\ \ \ \
| * \ \ \ Merge pull request #499 from dawnbreak/masterRedMatrix2014-06-222-14/+27
| |\ \ \ \ | | | | | | | | | | | | Add HTML5 datalist to edit photo album field.
| | * | | | Add HTML5 datalist to edit photo album field.Klaus Weidenbach2014-06-222-14/+27
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch provides a datalist for the edit photo album field. This makes it easier to move a picture to another existing folder in the way that it provides a list of all available albums as values for the album field.
* / / / / likes table for liking things besides posts and commentsfriendica2014-06-224-3/+41
|/ / / /
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-06-211-3/+1
|\ \ \ \
| * | | | correct a tiny syntax errorKlaus2014-06-221-3/+1
| | | | | | | | | | | | | | | there was a space missing between two values
* | | | | moods not working in other languages + doc updatesfriendica2014-06-2151-3789/+4098
| | | | |
* | | | | limited progress in providing a POST option to shredder, back to auth ↵friendica2014-06-192-26/+42
|/ / / / | | | | | | | | | | | | signature mismatches again, likely a quoting issue