| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-09-18 | 12 | -64/+527 |
|\ |
|
| * | usability tweaks | friendica | 2014-09-17 | 2 | -2/+15 |
| * | channel permission roles | friendica | 2014-09-17 | 2 | -6/+31 |
| * | defined several permission roles - these will probably require some review an... | friendica | 2014-09-17 | 1 | -0/+245 |
| * | implement permission roles - the backend should be done except for maybe a co... | friendica | 2014-09-17 | 3 | -12/+73 |
| * | 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 c... | friendica | 2014-09-16 | 1 | -0/+17 |
| * | just mark dead hubloc deleted - don't remove them. This could cause problems.... | friendica | 2014-09-16 | 3 | -13/+9 |
| * | use the more portable encoded_item format for exported items - but with added... | friendica | 2014-09-16 | 2 | -15/+31 |
| * | channel export with items | friendica | 2014-09-15 | 2 | -6/+40 |
| * | honour service class restrictions for total_identities, total_channels ("frie... | friendica | 2014-09-15 | 2 | -4/+59 |
| * | final piece of the mrjive delivery puzzle, and now we've got most all the too... | friendica | 2014-09-15 | 1 | -3/+6 |
* | | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-09-15 | 5 | -14/+73 |
|\| |
|
| * | provide a way to sync locations and get rid of bogus hublocs, now implemented | friendica | 2014-09-14 | 5 | -14/+73 |
* | | Very, very cautiously let a developer switch to the sys chan if | Thomas Willingham | 2014-09-15 | 1 | -0/+13 |
* | | Bugger, revert - not only a dodgy cut and paste between terminals, but | Thomas Willingham | 2014-09-15 | 1 | -14/+0 |
* | | Very, very cautiously, let a developer switch to the sys chan, if | Thomas Willingham | 2014-09-15 | 1 | -0/+14 |
|/ |
|
* | that won't work... | friendica | 2014-09-14 | 1 | -1/+2 |
* | bb2diaspora_itemwallwall not finding author elements - inserting empty bbcode | friendica | 2014-09-14 | 1 | -0/+4 |
* | fix diaspora_retraction | friendica | 2014-09-14 | 1 | -7/+4 |
* | pull the plug on the old location sync section of import_xchan - this has now... | friendica | 2014-09-14 | 1 | -168/+12 |
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-14 | 1 | -0/+1 |
|\ |
|
| * | Thanks to Thomas other people see now your posts on your channel page also li... | Jeroen | 2014-09-14 | 1 | -1/+1 |
| * | Made link post titles to source optional in display settings. Hopefully I did... | Jeroen | 2014-09-14 | 1 | -0/+1 |
* | | privacy issue - restrictive stream permission setting with a non-targetted po... | friendica | 2014-09-14 | 1 | -2/+20 |
|/ |
|
* | more heavy lifting on the hubloc management and revocation infrastructure; do... | friendica | 2014-09-14 | 1 | -10/+51 |
* | some backend work for the remaining missing bits of mod_hubman - this is stil... | friendica | 2014-09-13 | 2 | -3/+255 |
* | log why this doesn't get executed | friendica | 2014-09-12 | 1 | -0/+2 |
* | doc updates and a couple of issues spotted in the logs (diaspora likes, feed ... | friendica | 2014-09-12 | 2 | -2/+2 |
* | bad redirects | friendica | 2014-09-11 | 1 | -0/+6 |
* | red group/collection query calls for api | friendica | 2014-09-11 | 1 | -0/+33 |
* | don't allow an xchan to be imported with an empty name. To avoid translation ... | friendica | 2014-09-11 | 1 | -2/+2 |
* | correct item author for feeds with multiple or different authors | friendica | 2014-09-11 | 1 | -8/+90 |
* | add gif to supported image types (if it's supported) | friendica | 2014-09-11 | 1 | -1/+1 |
* | issue #588 can't add feeds to collections using connedit page group sidebar w... | friendica | 2014-09-11 | 1 | -0/+1 |
* | disabling ability for diaspora to plustag redmatrix forums. See the notes. | friendica | 2014-09-10 | 1 | -1/+5 |
* | possible solution to diaspora walltowall mistaken attribution | friendica | 2014-09-10 | 2 | -9/+22 |
* | encrypt diaspora_meta since it may contain private message contents | friendica | 2014-09-10 | 3 | -19/+47 |
* | fix the like signatures to the "new ordering" - inbound and outbound | friendica | 2014-09-10 | 1 | -20/+12 |
* | don't include plus-sign in the stored term for imported mentions | friendica | 2014-09-10 | 1 | -1/+3 |
* | this should be the final piece of the puzzle | friendica | 2014-09-09 | 1 | -0/+14 |
* | cross-network mention issues | friendica | 2014-09-09 | 1 | -2/+5 |
* | Did I ever mention how much I HATE hacking crypto? If you've got a protocol d... | friendica | 2014-09-09 | 1 | -1/+12 |
* | go through the entire discovery sequence for mentions to make sure we have th... | friendica | 2014-09-09 | 1 | -1/+9 |
* | diaspora connections being marked orphan on directory servers | friendica | 2014-09-09 | 1 | -1/+1 |
* | some fixes for auto-perms across networks | friendica | 2014-09-09 | 1 | -9/+9 |
* | reduce log level of inbound d* posts until we get through some of the more se... | friendica | 2014-09-09 | 1 | -1/+1 |
* | and provide a strong hint by showing the errant account_flags | friendica | 2014-09-09 | 1 | -5/+5 |
* | in case somebody has problems and does an update to try and fix it, put somet... | friendica | 2014-09-09 | 1 | -0/+13 |