Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-21 | 1 | -96/+90 |
|\ | |||||
| * | Merge pull request #600 from dawnbreak/master | RedMatrix | 2014-09-22 | 1 | -96/+90 |
| |\ | | | | | | | Don't link unknown likes. | ||||
| | * | Don't link unknown likes. | Klaus Weidenbach | 2014-09-21 | 1 | -96/+90 |
| | | | | | | | | | | | | | | | 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 | 2 | -1/+2 |
|/ | | | | 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 | 2 | -1/+2 |
| | | | | there's nothing. Until we know for sure, display "Loading...". | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-20 | 4 | -7/+35 |
|\ | |||||
| * | 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 |
| | | |||||
* | | fix empty likes | friendica | 2014-09-20 | 1 | -2/+9 |
|/ | |||||
* | closing tag | friendica | 2014-09-19 | 1 | -1/+1 |
| | |||||
* | try to sort out walltowall translation for diaspora recipients | friendica | 2014-09-19 | 3 | -15/+7 |
| | |||||
* | 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 ↵ | friendica | 2014-09-17 | 1 | -0/+245 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | and adjustment. social social_restricted social_private forum forum_restricted forum_private feed feed_restricted soapbox | ||||
| * | implement permission roles - the backend should be done except for maybe a ↵ | friendica | 2014-09-17 | 3 | -12/+73 |
| | | | | | | | | 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. | ||||
| * | 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. | ||||
| * | 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 | ||||
| * | use the more portable encoded_item format for exported items - but with ↵ | friendica | 2014-09-16 | 2 | -15/+31 |
| | | | | | | | | 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. | ||||
| * | channel export with items | friendica | 2014-09-15 | 2 | -6/+40 |
| | | |||||
| * | honour service class restrictions for total_identities, total_channels ↵ | friendica | 2014-09-15 | 2 | -4/+59 |
| | | | | | | | | ("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. | ||||
| * | 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 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 |
| | | | | | | | | they're also an administrator. | ||||
* | | Bugger, revert - not only a dodgy cut and paste between terminals, but | Thomas Willingham | 2014-09-15 | 1 | -14/+0 |
| | | | | | | | | also pushed to the wrong repo | ||||
* | | Very, very cautiously, let a developer switch to the sys chan, if | Thomas Willingham | 2014-09-15 | 1 | -0/+14 |
|/ | | | | they're also an admin. | ||||
* | 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 ↵ | friendica | 2014-09-14 | 1 | -168/+12 |
| | | | | | | now been split off into its own function. Cross fingers because this is core functionality which was tried and true, well tested; and now it's a bit different. Please revert this if the matrix breaks in the next few hours. | ||||
* | 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 ↵ | Jeroen | 2014-09-14 | 1 | -1/+1 |
| | | | | | | | | linked to source. If enabled. | ||||
| * | Made link post titles to source optional in display settings. Hopefully I ↵ | Jeroen | 2014-09-14 | 1 | -0/+1 |
| | | | | | | | | did a right. | ||||
* | | privacy issue - restrictive stream permission setting with a non-targetted ↵ | friendica | 2014-09-14 | 1 | -2/+20 |
|/ | | | | post cannot be enforced on remote networks. Restrict these posts to zot network. | ||||
* | more heavy lifting on the hubloc management and revocation infrastructure; ↵ | friendica | 2014-09-14 | 1 | -10/+51 |
| | | | | don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration. | ||||
* | some backend work for the remaining missing bits of mod_hubman - this is ↵ | friendica | 2014-09-13 | 2 | -3/+255 |
| | | | | still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries. | ||||
* | 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 |
| | | | | author import) | ||||
* | 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 |
| | | | | issues we'll just make it '-'. | ||||
* | 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 ↵ | friendica | 2014-09-11 | 1 | -0/+1 |
| | | | | widget | ||||
* | disabling ability for diaspora to plustag redmatrix forums. See the notes. | friendica | 2014-09-10 | 1 | -1/+5 |
| |