Commit Graph

  • 56c1c5cd88 couple of edits to make this more current friendica 2014-09-15 17:43:40 -07:00
  • e25a273100 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-15 17:32:48 -07:00
  • bbc9e4427e honour service class restrictions for total_identities, total_channels ("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. friendica 2014-09-15 17:17:00 -07:00
  • d2a4b34c98 Trivial typo - concatenated string that should be. Doesn't really deserve it's own commit, but if I don't fix it now, nobody will notice for another18 months. Thomas Willingham 2014-09-16 00:55:41 +01:00
  • c841714ba5 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-15 13:39:41 -07:00
  • 5ea6f27792 final piece of the mrjive delivery puzzle, and now we've got most all the tools to implement mod_hubman friendica 2014-09-15 13:37:57 -07:00
  • 68ecc673b1 Merge remote-tracking branch 'upstream/master' Thomas Willingham 2014-09-15 17:10:11 +01:00
  • eaf3bd3326 See comments on commit 5ab85b0. Also fixed some bb typo's in docu index. Jeroen 2014-09-15 15:35:40 +00:00
  • 007ba9a805 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-15 01:56:22 -07:00
  • 5188e19997 rev update friendica 2014-09-15 01:40:22 -07:00
  • 5ab85b076b heading font-size should not be tied to font-size for posts and comments marijus 2014-09-15 10:39:38 +02:00
  • 4f793069bf Merge branch 'master' of https://github.com/friendica/red Paolo Tacconi 2014-09-15 10:01:25 +02:00
  • 58aad83e5c this is probably better in most cases marijus 2014-09-15 09:56:30 +02:00
  • 8fc0be9bb3 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-14 22:46:23 -07:00
  • ea8a01791e allow the site to designate an admin channel that's visible to the outside world (via siteinfo/json). Otherwise we'll use the default channel of any accounts that have the account admin role. friendica 2014-09-14 22:43:56 -07:00
  • 0dc33900b6 provide a way to sync locations and get rid of bogus hublocs, now implemented friendica 2014-09-14 22:19:19 -07:00
  • e3b967f475 Very, very cautiously let a developer switch to the sys chan if they're also an administrator. Thomas Willingham 2014-09-15 03:59:04 +01:00
  • b6612693b6 Bugger, revert - not only a dodgy cut and paste between terminals, but also pushed to the wrong repo Thomas Willingham 2014-09-15 03:55:49 +01:00
  • e3783dfdd4 Very, very cautiously, let a developer switch to the sys chan, if they're also an admin. Thomas Willingham 2014-09-15 03:51:41 +01:00
  • f2b0311f9d that won't work... friendica 2014-09-14 19:20:16 -07:00
  • b2fe2b067a bb2diaspora_itemwallwall not finding author elements - inserting empty bbcode friendica 2014-09-14 19:17:05 -07:00
  • 5042847334 fix diaspora_retraction friendica 2014-09-14 19:04:36 -07:00
  • bcc9057d8c pull the plug on the old location sync section of import_xchan - this has 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. friendica 2014-09-14 18:09:16 -07:00
  • b019cbb88a Merge branch 'master' of https://github.com/friendica/red Thomas Willingham 2014-09-15 01:41:04 +01:00
  • 6416a61c41 A bit of mod/home refactoring. This is a transient state, so it's still messy, but it'll be much nicer after the move is finished. Thomas Willingham 2014-09-15 01:38:55 +01:00
  • 0a5f0fe10b Merge https://github.com/friendica/red into pending_merge friendica 2014-09-14 17:11:50 -07:00
  • 6be6b41a42 privacy issue - restrictive stream permission setting with a non-targetted post cannot be enforced on remote networks. Restrict these posts to zot network. friendica 2014-09-14 17:07:39 -07:00
  • b5241c610f Deprecate site channel. The sys channel should be doing this. Will fix shortly. Thomas Willingham 2014-09-15 00:06:51 +01:00
  • 72bce40a9f tryout - some more adjustments marijus 2014-09-14 22:37:03 +02:00
  • 9b80667326 Thanks to Thomas other people see now your posts on your channel page also linked to source. If enabled. Jeroen 2014-09-14 13:59:27 +00:00
  • 254dc0ec98 Made link post titles to source optional in display settings. Hopefully I did a right. Jeroen 2014-09-14 12:39:11 +00:00
  • 2728f5a104 tryout - fetch larger thumbnail if image gets streched over its size marijus 2014-09-14 11:57:01 +02:00
  • c27b60d981 more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration. friendica 2014-09-14 01:48:54 -07:00
  • 5f4bcc4ef2 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-13 16:09:07 -07:00
  • 0350b76d85 some backend work for the remaining missing bits of mod_hubman - this is 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. friendica 2014-09-13 16:00:09 -07:00
  • 969f2530cc Doco - kill dupe Thomas Willingham 2014-09-13 19:56:30 +01:00
  • d84eb8c79a Bring DB doco up to date Thomas Willingham 2014-09-13 19:27:24 +01:00
  • f85aba3a1e Doco - some links that got stripped at some point Thomas Willingham 2014-09-13 18:51:51 +01:00
  • e8901b2ffe remove this hub from fallback servers marijus 2014-09-13 19:45:26 +02:00
  • 5819c442ab Merge branch 'master' of https://github.com/friendica/red marijus 2014-09-13 16:34:07 +02:00
  • dfc8430c8a cleanup after recent changes in mod photos marijus 2014-09-13 16:33:20 +02:00
  • a5a501c90f Here, have a semi-colon Thomas Willingham 2014-09-13 15:25:05 +01:00
  • c8508a310f Only use one install file Thomas Willingham 2014-09-13 15:23:40 +01:00
  • 415be29261 Merge pull request #592 from jeroenpraat/master RedMatrix 2014-09-13 19:24:01 +10:00
  • b1809f5f0c log why this doesn't get executed friendica 2014-09-12 15:10:53 -07:00
  • 7fc1a66121 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-12 14:24:45 -07:00
  • 5fd0d6f7d5 make the xchan diagnostic tool useful friendica 2014-09-12 14:23:42 -07:00
  • 61ce524a33 define justifiedGalleryActive in head.tpl to not break other pages autoload marijus 2014-09-12 21:32:53 +02:00
  • d4e7a71d1e Issue #590: Linked conversation titles to source. jeroenpraat 2014-09-12 21:21:16 +02:00
  • 72c30ea444 Merge branch 'master' of https://github.com/friendica/red marijus 2014-09-12 21:07:28 +02:00
  • 12900129bb reset testing values back to default marijus 2014-09-12 21:06:37 +02:00
  • bd2139d16a do not load next page if justifiedGallery() is not ready yet marijus 2014-09-12 21:04:43 +02:00
  • 11d3ef6176 This is even better. Adapts better to Red user settings. Jeroen 2014-09-12 18:55:53 +00:00
  • 59c537b06d H1-H6 simplified (less font sizes), rem Jeroen 2014-09-12 18:41:35 +00:00
  • e1cb4b2833 expert_mode > expert Jeroen 2014-09-12 18:18:46 +00:00
  • e004744696 Fixed. Thanks to Thomas. Jeroen 2014-09-12 14:31:02 +00:00
  • ed7f3001c1 Merge pull request #2 from friendica/master Paolo T 2014-09-12 15:15:06 +02:00
  • c576689897 Merge pull request #591 from tuscanhobbit/dev Paolo T 2014-09-12 15:06:37 +02:00
  • 2e8feaa919 IT localization updated tuscanhobbit 2014-09-12 14:26:05 +02:00
  • c3f74b5609 Addon count on addon settings page (featured) doesnt work (always 0). Commented out. Jeroen 2014-09-12 12:09:32 +00:00
  • 701ae2981d doc updates friendica 2014-09-12 01:59:31 -07:00
  • ab7f2db4d7 doc updates and a couple of issues spotted in the logs (diaspora likes, feed author import) friendica 2014-09-12 00:59:23 -07:00
  • 20be358ec2 bad redirects friendica 2014-09-11 23:01:58 -07:00
  • cd7d845568 sort the plugins to make it easier to compare lists friendica 2014-09-11 22:56:01 -07:00
  • dd10a77488 and then make it even more useful friendica 2014-09-11 22:52:32 -07:00
  • ad8416b4c3 make siteinfo/json useful again friendica 2014-09-11 22:41:45 -07:00
  • 6ec12c66c3 red group/collection query calls for api friendica 2014-09-11 21:41:45 -07:00
  • 3e97f71b33 allow bbcode in register_text friendica 2014-09-11 20:03:36 -07:00
  • e00e55af57 keep the docs updated on what's happening. friendica 2014-09-11 18:21:31 -07:00
  • e68185fc05 don't allow an xchan to be imported with an empty name. To avoid translation issues we'll just make it '-'. friendica 2014-09-11 18:11:07 -07:00
  • 3a10956b20 correct item author for feeds with multiple or different authors friendica 2014-09-11 17:27:49 -07:00
  • 653ed27fc9 new module - service_limits - print service class limits for logged in account. It is a debugging tool and not meant to be pretty. friendica 2014-09-11 16:13:44 -07:00
  • d2ce5f3b80 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-11 15:51:10 -07:00
  • 5547222da2 add gif to supported image types (if it's supported) friendica 2014-09-11 15:50:35 -07:00
  • 1f16bad9d9 set items/page back to 60 marijus 2014-09-11 13:07:08 +02:00
  • 5e54f47097 content-complete must not be in photo-album-contents marijus 2014-09-11 12:42:16 +02:00
  • 15ef4fea78 typo marijus 2014-09-11 12:33:47 +02:00
  • 219b060894 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-11 02:20:25 -07:00
  • 1b3196862d issue #588 can't add feeds to collections using connedit page group sidebar widget friendica 2014-09-11 02:19:21 -07:00
  • d5a0a7d213 argh... this does not do what i thought it would... marijus 2014-09-11 11:14:12 +02:00
  • 022a69658f Merge branch 'master' of https://github.com/friendica/red marijus 2014-09-11 11:02:36 +02:00
  • df843925cf should probably still lock autoload during image processing marijus 2014-09-11 11:01:20 +02:00
  • 46fd0ef5ba Merge pull request #587 from git-marijus/master RedMatrix 2014-09-11 18:45:22 +10:00
  • 3caee72aee another day another concept - hope this works better marijus 2014-09-11 10:41:11 +02:00
  • 8835f646ae Revert "Revert "Merge pull request #583 from git-marijus/master"" marijus 2014-09-11 10:35:19 +02:00
  • 8bf4b5e776 Merge pull request #584 from tuscanhobbit/master Paolo T 2014-09-11 08:55:04 +02:00
  • 5b774e26ca make sure we add the file friendica 2014-09-10 23:09:54 -07:00
  • 4c8036f530 endless scroll on connections page friendica 2014-09-10 23:08:24 -07:00
  • 10f6f355d4 disabling ability for diaspora to plustag redmatrix forums. See the notes. friendica 2014-09-10 22:35:09 -07:00
  • f1539a65e5 possible solution to diaspora walltowall mistaken attribution friendica 2014-09-10 22:21:19 -07:00
  • 6991a3ac01 more compatibility notes friendica 2014-09-10 21:43:25 -07:00
  • de89bdc45f encrypt diaspora_meta since it may contain private message contents friendica 2014-09-10 19:02:00 -07:00
  • 6ab21b3d4f make verify_email the default for new installs (at least English installs), and provide a setting on the admin page for it. friendica 2014-09-10 17:42:13 -07:00
  • 79bd451631 fix the like signatures to the "new ordering" - inbound and outbound friendica 2014-09-10 16:32:19 -07:00
  • 08638f3ec8 Revert "Merge pull request #583 from git-marijus/master" autoload broken - even after clearing cache and retrying. friendica 2014-09-10 16:09:01 -07:00
  • eae146d85d Revert "Revert "update nl - attempt 2"" friendica 2014-09-10 16:04:12 -07:00
  • 8e179aa734 Revert "update nl - attempt 2" friendica 2014-09-10 16:02:25 -07:00
  • 13e7a8f123 Merge pull request #583 from git-marijus/master RedMatrix 2014-09-11 08:46:58 +10:00
  • d825adf423 without this check we kill the directory autoload marijus 2014-09-10 17:40:50 +02:00
  • c1c2214b47 photo justification marijus 2014-09-10 17:10:39 +02:00