Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-26 | 2 | -1947/+1939 |
|\ | |||||
| * | update nl | jeroenpraat | 2014-06-27 | 2 | -1947/+1939 |
| | | |||||
* | | still trying to sort out the liveupdate issues. This was getting overly ↵ | friendica | 2014-06-26 | 1 | -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_merge | friendica | 2014-06-26 | 5 | -5/+15 |
|\ | |||||
| * | Invite app | Thomas Willingham | 2014-06-26 | 2 | -0/+4 |
| | | |||||
| * | also change to div for the with brackets option which we dont actually use... | marijus | 2014-06-26 | 1 | -1/+1 |
| | | |||||
| * | make it a div to prevent extra borders in some browsers after click | marijus | 2014-06-26 | 2 | -4/+8 |
| | | |||||
| * | Merge pull request #509 from solstag/master | RedMatrix | 2014-06-26 | 1 | -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 apps | Alexandre Hannud Abdo | 2014-06-26 | 1 | -0/+2 |
| |/ | |||||
* / | notification being sent for comments from blocked connections on same site. | friendica | 2014-06-26 | 3 | -2/+7 |
|/ | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-25 | 2 | -43/+1 |
|\ | |||||
| * | Doco - update the right index this time, and only maintain one. | Thomas Willingham | 2014-06-26 | 2 | -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 page | friendica | 2014-06-25 | 2 | -3/+1 |
|/ | |||||
* | sql error | friendica | 2014-06-25 | 1 | -1/+1 |
| | |||||
* | fix bad translation of blockquote in wordpress ("post_to_red") plugin | friendica | 2014-06-25 | 2 | -5/+5 |
| | |||||
* | Merge pull request #508 from dawnbreak/master | RedMatrix | 2014-06-26 | 2 | -190/+218 |
|\ | | | | | Templified cloud's directory listing. | ||||
| * | Templified cloud's directory listing. | Klaus Weidenbach | 2014-06-26 | 2 | -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/master | RedMatrix | 2014-06-25 | 2 | -37/+67 |
|\ | | | | | | | | | Filestorage: display quota, friendly file size, translatable strings (You're on a roll... :-) | ||||
| * | Delete confirmation is translatable | Paolo Tacconi | 2014-06-25 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of https://github.com/tuscanhobbit/red | Paolo Tacconi | 2014-06-25 | 14 | -5548/+6518 |
| |\ | |||||
| | * | Merge pull request #1 from friendica/master | Paolo T | 2014-06-25 | 14 | -5548/+6518 |
| | |\ | |_|/ |/| | | Updated fork | ||||
* | | | prevent mis-configured servers from leaking cookies | friendica | 2014-06-24 | 1 | -2/+10 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-24 | 19 | -5616/+6651 |
|\ \ \ | |||||
| * \ \ | Merge pull request #506 from dawnbreak/master | RedMatrix | 2014-06-25 | 2 | -1/+3 |
| |\ \ \ | | | | | | | | | | | Set backlink to the parent folder, not cloud's root. | ||||
| | * | | | Set backlink to the parent folder, not cloud's root. | Klaus Weidenbach | 2014-06-24 | 2 | -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/master | RedMatrix | 2014-06-25 | 9 | -5540/+6500 |
| |\ \ \ \ | | |/ / / | |/| | | | Updated Norwegian bokmål translation | ||||
| | * | | | Removed docs that were not translated | Haakon Meland Eriksen | 2014-06-24 | 69 | -4544/+0 |
| | | | | | |||||
| | * | | | Updated Norwegian bokmål translation | Haakon Meland Eriksen | 2014-06-24 | 2 | -5540/+5748 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'upstream/master' | Haakon Meland Eriksen | 2014-06-24 | 3692 | -84893/+535272 |
| | |\ \ \ | |||||
| | * | | | | API functions translated into Norwegian bokmål - typo | Haakon Meland Eriksen | 2014-03-12 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | API functions translated into Norwegian bokmål | Haakon Meland Eriksen | 2014-03-12 | 1 | -16/+16 |
| | | | | | | |||||
| | * | | | | Norwegian splash and main.bb doc | Haakon Meland Eriksen | 2014-03-11 | 82 | -0/+5910 |
| | | | | | | |||||
| * | | | | | Merge pull request #505 from tuscanhobbit/master | Paolo T | 2014-06-24 | 3 | -11/+11 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | IT: updated strings & fixed readme img link | ||||
| * | | | | Merge pull request #503 from tuscanhobbit/master | RedMatrix | 2014-06-24 | 4 | -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 ↵ | friendica | 2014-06-24 | 2 | -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 strings | Paolo Tacconi | 2014-06-25 | 2 | -37/+67 |
| | | | |/ | | | |/| | |||||
| | | * | | IT: updated strings & fixed readme img link | tuscanhobbit | 2014-06-24 | 3 | -11/+11 |
| | |/ / | |||||
| | * | | Oops I left some debug stuff around | tuscanhobbit | 2014-06-24 | 2 | -6/+11 |
| | | | | |||||
| | * | | Fixes to links and forward URLs in filestorage | tuscanhobbit | 2014-06-24 | 4 | -64/+69 |
| |/ / | |||||
| * | | Doco - oops, forgot the index | Thomas Willingham | 2014-06-24 | 1 | -1/+1 |
| | | | |||||
| * | | Doco - gnusocial doco from Randal | Thomas Willingham | 2014-06-24 | 2 | -0/+63 |
|/ / | |||||
* | | another one ticked off | friendica | 2014-06-23 | 2 | -4/+0 |
| | | |||||
* | | Merge pull request #501 from pixelroot/master | RedMatrix | 2014-06-24 | 2 | -1723/+1714 |
|\ \ | | | | | | | modified: view/ru/messages.po | ||||
| * | | modified: view/ru/messages.po | pixelroot | 2014-06-23 | 2 | -1723/+1714 |
| | | | | | | | | | | | | modified: view/ru/strings.php | ||||
* | | | clean up the awful descriptive text on thing input | friendica | 2014-06-23 | 2 | -4/+7 |
| | | | |||||
* | | | move the reset of "in_progress" to after the page and structures have ↵ | friendica | 2014-06-23 | 1 | -1/+2 |
| | | | | | | | | | | | | completed updating | ||||
* | | | block edit/delete ability for everybody but the owner | friendica | 2014-06-23 | 1 | -7/+16 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/tuscanhobbit/red into ↵ | friendica | 2014-06-23 | 1 | -27/+78 |
|\ \ \ | | | | | | | | | | | | | tuscanhobbit-master | ||||
| * | | | Dav file browser on a single page | tuscanhobbit | 2014-06-24 | 1 | -27/+78 |
| |/ / | |||||
* | | | ability to like things | friendica | 2014-06-23 | 9 | -12/+62 |
| | | |