Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | |
| | | | ||||||
* | | | language selector app | friendica | 2014-06-23 | 2 | -0/+3 | |
| | | | ||||||
* | | | process profile like removals with normal low_level drop_item | friendica | 2014-06-23 | 2 | -1/+10 | |
|/ / | ||||||
* | | profile likes | friendica | 2014-06-22 | 6 | -61/+229 | |
| | | ||||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-22 | 4 | -1718/+1665 | |
|\ \ | ||||||
| * \ | Merge pull request #500 from tuscanhobbit/master | Paolo T | 2014-06-22 | 2 | -1669/+1661 | |
| |\ \ | | | | | | | | | IT: strings updated | |||||
| | * | | IT: strings updated | tuscanhobbit | 2014-06-22 | 2 | -1669/+1661 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-06-22 | 81 | -4074/+4430 | |
| |\ \ \ | ||||||
| * | | | | Minor doco | Thomas Willingham | 2014-06-22 | 2 | -49/+4 | |
| | | | | | ||||||
* | | | | | give the admin a link to view channels from the channel admin page | friendica | 2014-06-22 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | when an admin censors a channel, we only need to notify the directory and ↵ | friendica | 2014-06-22 | 2 | -6/+14 | |
| | | | | | | | | | | | | | | | | | | | | not all the connections. | |||||
* | | | | | honour the admin censored flag in the directory, and some slow progress on ↵ | friendica | 2014-06-22 | 5 | -61/+141 | |
| |/ / / |/| | | | | | | | | | | | extended likes | |||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-22 | 2 | -14/+27 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #499 from dawnbreak/master | RedMatrix | 2014-06-22 | 2 | -14/+27 | |
| |\ \ \ \ | | | | | | | | | | | | | Add HTML5 datalist to edit photo album field. | |||||
| | * | | | | Add HTML5 datalist to edit photo album field. | Klaus Weidenbach | 2014-06-22 | 2 | -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 comments | friendica | 2014-06-22 | 4 | -3/+41 | |
|/ / / / | ||||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-06-21 | 1 | -3/+1 | |
|\ \ \ \ | ||||||
| * | | | | correct a tiny syntax error | Klaus | 2014-06-22 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | there was a space missing between two values | |||||
* | | | | | moods not working in other languages + doc updates | friendica | 2014-06-21 | 51 | -3789/+4098 | |
| | | | | | ||||||
* | | | | | limited progress in providing a POST option to shredder, back to auth ↵ | friendica | 2014-06-19 | 2 | -26/+42 | |
|/ / / / | | | | | | | | | | | | | signature mismatches again, likely a quoting issue | |||||
* | | | | fix space around brackets changing. | friendica | 2014-06-19 | 2 | -6/+14 | |
| | | | | ||||||
* | | | | cleanup | friendica | 2014-06-19 | 4 | -19/+4 | |
| | | | | ||||||
* | | | | Merge pull request #498 from solstag/perms_pending | RedMatrix | 2014-06-20 | 7 | -115/+132 | |
|\ \ \ \ | | | | | | | | | | | Implements a new permission level PERMS_PENDING |