| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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... | ||||
| | * | | | Fix name attribute of button elements so jquery '.submit()' doesn't break | Alexandre Hannud Abdo | 2014-09-16 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to "Additional notes" in: http://api.jquery.com/submit/ Not fixing buttons created with 'input' tags. | ||||
| * | | | | that's why bb2diaspora_itemwallwall() wasn't doing its thang. | friendica | 2014-09-16 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | still some old Friendica database queries in diaspora_signed_retraction | friendica | 2014-09-16 | 1 | -17/+15 |
| | | | | | |||||
| * | | | | z_post_url_json() added to easily deal with JSON post APIs; without getting ↵ | friendica | 2014-09-16 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | content-type unknown warnings/errors. Also added a debug option to z_get|post_url so you could track and log some of these nasty little buggers. | ||||
| * | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-16 | 1 | -2/+2 |
| |\| | | | |||||
| | * | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-09-16 | 1 | -9/+4 |
| | |\ \ \ | |||||
| | * | | | | this still has less issues | marijus | 2014-09-16 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | just mark dead hubloc deleted - don't remove them. This could cause ↵ | friendica | 2014-09-16 | 3 | -13/+9 |
| | |/ / / |/| | | | | | | | | | | | problems. Also clean up fetch_url/post_url header option | ||||
| * | | | | when importing channels - use the new location notification message to tell ↵ | friendica | 2014-09-16 | 1 | -9/+4 |
| |/ / / | | | | | | | | | | your original site where it sits in terms of primary. | ||||
| * | | | use the more portable encoded_item format for exported items - but with ↵ | friendica | 2014-09-16 | 3 | -16/+32 |
| | | | | | | | | | | | | | added attributes so we can use it as a reasonably complete item backup. The encoded_item format gives us extended author and owner information in case we need to probe them to bring the entry back. It also contains taxonomy entries. Importing and/or recovering will best be accomplished in chunks. It could take some time and some memory to chew through this. | ||||
| * | | | push individual block to directory | friendica | 2014-09-15 | 1 | -0/+1 |
| | | | | |||||
| * | | | fat finger - must have been here a while | friendica | 2014-09-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | change platform name to redmatrix (lowercase, one word) for use in meta tags ↵ | friendica | 2014-09-15 | 6 | -1/+4949 |
| | | | | | | | | | | | | | and stuff, move yet another oauth1 library to library instead of having it in plugins where we'll end up with a white screen if we re-use it in another plugin; which I plan to do. | ||||
| * | | | channel export with items | friendica | 2014-09-15 | 4 | -7/+47 |
| | | | | |||||
| * | | | additions and edits to the faq | friendica | 2014-09-15 | 1 | -5/+8 |
| | | | | |||||
| * | | | couple of edits to make this more current | friendica | 2014-09-15 | 1 | -7/+1 |
| | | | | |||||
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-15 | 2 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Trivial typo - concatenated string that should be. Doesn't really | Thomas Willingham | 2014-09-16 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | deserve it's own commit, but if I don't fix it now, nobody will notice for another18 months. | ||||
| * | | | | honour service class restrictions for total_identities, total_channels ↵ | friendica | 2014-09-15 | 3 | -5/+87 |
| |/ / / | | | | | | | | | | ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped. | ||||
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-15 | 2 | -8/+20 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | See comments on commit 5ab85b0. Also fixed some bb typo's in docu index. | Jeroen | 2014-09-15 | 2 | -8/+20 |
| | | | | |||||
| * | | | final piece of the mrjive delivery puzzle, and now we've got most all the ↵ | friendica | 2014-09-15 | 1 | -3/+6 |
| | | | | | | | | | | | | | tools to implement mod_hubman | ||||
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-15 | 1 | -2/+2 |
| |\| | | |||||
| | * | | heading font-size should not be tied to font-size for posts and comments | marijus | 2014-09-15 | 1 | -2/+2 |
| | | | | |||||
| * | | | rev update | friendica | 2014-09-15 | 1 | -1/+1 |
| |/ / | |||||
| * | | this is probably better in most cases | marijus | 2014-09-15 | 1 | -1/+1 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-14 | 0 | -0/+0 |
| |\| | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |