| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge from upstream | tuscanhobbit | 2014-09-22 | 156 | -3017/+10141 |
| |\ | |||||
| | * | private mail from d* to r# seems to work with these edits. - Now have to go ↵ | friendica | 2014-09-22 | 2 | -11/+8 |
| | | | | | | | | | back the other way. | ||||
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-21 | 2 | -96/+96 |
| | |\ | |||||
| | | * | Merge pull request #600 from dawnbreak/master | RedMatrix | 2014-09-22 | 2 | -96/+96 |
| | | |\ | | | | | | | | | Don't link unknown likes. | ||||
| | | | * | Don't link unknown likes. | Klaus Weidenbach | 2014-09-21 | 2 | -96/+96 |
| | | | | | | | | | | | | | | | | | | | | | Likes/Dislikes of unknown channels have disabled links now. Fixed intention a bit, romved a unused variable. | ||||
| | * | | | we don't always set HUBLOC_FLAGS_DELETED but we often set hubloc_status = ↵ | friendica | 2014-09-21 | 1 | -2/+3 |
| | |/ / | | | | | | | | | | HUBLOC_OFFLINE instead. Filter this as well from deliveries. | ||||
| | * / | feeds with '@' in the URL were being handled as webfinger addresses and ↵ | friendica | 2014-09-21 | 3 | -2/+3 |
| | |/ | | | | | | | didn't fall through to RSS discovery. Issue #599 | ||||
| | * | Navbar notifications: don't show "nothing new here" unless we've checked and ↵ | friendica | 2014-09-20 | 4 | -2/+4 |
| | | | | | | | | | there's nothing. Until we know for sure, display "Loading...". | ||||
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-20 | 10 | -613/+709 |
| | |\ | |||||
| | | * | Merge pull request #598 from cvogeley/master | cvogeley | 2014-09-20 | 1 | -1/+3 |
| | | |\ | | | | | | | | | Allow ordering by created | ||||
| | | | * | Allow ordering by created | Christian Vogeley | 2014-09-20 | 1 | -1/+3 |
| | | |/ | |||||
| | | * | oups... | marijus | 2014-09-20 | 1 | -1/+1 |
| | | | | |||||
| | | * | aalso change the way we check for number of chatrooms | marijus | 2014-09-20 | 3 | -4/+15 |
| | | | | |||||
| | | * | show bookmarks menu only if we have any bookmarks already | marijus | 2014-09-20 | 3 | -3/+20 |
| | | | | |||||
| | | * | update jg to latest preview release and try once more to really justify the ↵ | marijus | 2014-09-20 | 5 | -605/+671 |
| | | | | | | | | | | | | | whole gallery | ||||
| | * | | fix empty likes | friendica | 2014-09-20 | 2 | -3/+10 |
| | |/ | |||||
| | * | Repeat after me - we always refer to our clientelle as 'members'. If your ↵ | friendica | 2014-09-19 | 2 | -4/+11 |
| | | | | | | | | | software calls you a "user" - get rid of it. | ||||
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-19 | 5 | -762/+881 |
| | |\ | |||||
| | | * | Bit tweaking | Jeroen | 2014-09-19 | 1 | -3/+3 |
| | | | | |||||
| | | * | Another piece that didn't fit well in the dark schema. Hopefully this is the ↵ | Jeroen | 2014-09-19 | 3 | -15/+42 |
| | | | | | | | | | | | | | last. | ||||
| | | * | update nl.2 | Jeroen | 2014-09-19 | 2 | -13/+13 |
| | | | | |||||
| | | * | update nl | Jeroen | 2014-09-19 | 2 | -745/+837 |
| | | | | |||||
| | * | | closing tag | friendica | 2014-09-19 | 3 | -20/+20 |
| | |/ | |||||
| | * | try to sort out walltowall translation for diaspora recipients | friendica | 2014-09-19 | 7 | -18/+133 |
| | | | |||||
| | * | doc updates | friendica | 2014-09-19 | 70 | -693/+1063 |
| | | | |||||
| | * | add stylish_select to new_channel page - but comment out until we can theme ↵ | friendica | 2014-09-18 | 2 | -0/+2 |
| | | | | | | | | | it. It needs a bit of theming to even work correctly. | ||||
| | * | add stylish_select library to provide a way to clean up and theme all the ↵ | friendica | 2014-09-18 | 4 | -0/+927 |
| | | | | | | | | | ugly select boxes | ||||
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-18 | 4 | -4/+17 |
| | |\ | |||||
| | | * | Merge pull request #596 from beardy-unixer/master | RedMatrix | 2014-09-19 | 3 | -3/+16 |
| | | |\ | | | | | | | | | Allow syschan use and extend ping | ||||
| | | | * | Catch the settings too | Thomas Willingham | 2014-09-18 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | If a short ping causes lots of issues, and anyone who has been here | Thomas Willingham | 2014-09-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | a while tends to have a longer ping, we should probably have a longer ping | ||||
| | | | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-09-18 | 40 | -198/+5619 |
| | | | |\ | | | |/ | | |/| | |||||
| | | * | | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-09-18 | 8 | -11/+71 |
| | | |\ \ | |||||
| | | * | | | Doco - permissions needs some work, but this is a relative whopper. | Thomas Willingham | 2014-09-18 | 1 | -1/+1 |
| | | | | | | |||||
| | | | | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-09-15 | 10 | -25/+103 |
| | | | | |\ | |||||
| | | | | * | | Very, very cautiously let a developer switch to the sys chan if | Thomas Willingham | 2014-09-15 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | they're also an administrator. | ||||
| | * | | | | | repeated content collapse on update from display page under rare conditions ↵ | friendica | 2014-09-18 | 4 | -2/+9 |
| | | |/ / / | |/| | | | | | | | | | | | | | (when the conversation hasn't changed) | ||||
| | * | | | | keep the language consistent | friendica | 2014-09-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | typo | friendica | 2014-09-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | use 24-hour clock for non-American dates | friendica | 2014-09-17 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | forgot this one... | friendica | 2014-09-17 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | usability tweaks | friendica | 2014-09-17 | 2 | -2/+15 |
| | | | | | | |||||
| | * | | | | add a spinner or two to the new channel page so folks have a clue that we're ↵ | friendica | 2014-09-17 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | doing something in the background - trying to complete the nick field for them (and then check it before they submit). | ||||
| | * | | | | channel permission roles | friendica | 2014-09-17 | 5 | -9/+46 |
| | |/ / / | |||||
| | * | | | defined several permission roles - these will probably require some review ↵ | friendica | 2014-09-17 | 1 | -0/+245 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and adjustment. social social_restricted social_private forum forum_restricted forum_private feed feed_restricted soapbox | ||||
| | * | | | make the output a bit more readable | friendica | 2014-09-17 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | let the xchan diagnostic accept a webbie | friendica | 2014-09-17 | 1 | -14/+14 |
| | | | | | |||||
| | * | | | implement permission roles - the backend should be done except for maybe a ↵ | friendica | 2014-09-17 | 7 | -16/+122 |
| | | | | | | | | | | | | | | | | | couple of small tweaks. Now we just need to define the rest of the roles and create a chooser for them. Adam started on this some time back but I don't know where that has gone. | ||||
| | * | | | no sense maintaining 2 to-do files. I think the one I'm removing is ↵ | friendica | 2014-09-16 | 2 | -83/+0 |
| | | | | | | | | | | | | | | | | | referenced online somewhere - which is why it wasn't done earlier. Can't find it, so just note that somebody will complain and we'll have to edit the pointer someday. | ||||
| | * | | | Merge pull request #595 from solstag/master | RedMatrix | 2014-09-17 | 2 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | Fix name attribute of button elements so jquery '.submit()' doesn't brea... | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |