Commit Graph

  • c3fdd00aa4 allow public comments (sort of - see the notes) redmatrix 2016-08-31 18:39:50 -07:00
  • 13c7fe46cd Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-08-31 17:51:23 -07:00
  • ea0be8ea1a provide techlevels in the pro server role. Should have no visible effect on other roles. redmatrix 2016-08-31 17:49:22 -07:00
  • 38ea71c6c9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev jeroenpraat 2016-08-31 13:17:34 +02:00
  • 37ad734cea Dutch and Spanish string update jeroenpraat 2016-08-31 13:17:23 +02:00
  • e9462ba145 resolve merge conflict Mario Vavti 2016-08-31 09:41:07 +02:00
  • 2b9322fc7d provide a possibility to create checklists in bbcode [x] creates a checked checkbox, [] creates an unchecked checkbox Mario Vavti 2016-08-31 09:38:47 +02:00
  • b775a1aa0e The 'save to folder' modal dialog looked like crap. Now it only looks like dung. redmatrix 2016-08-30 21:43:33 -07:00
  • bf3a409569 only check permissions on normal photos and force cover photos as well as profile photos to be public. As a side effect 'thing' photos will also be considered public. redmatrix 2016-08-30 20:54:54 -07:00
  • 68f6baf938 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-08-30 20:22:33 -07:00
  • 5994fadebb version and release policy guide redmatrix 2016-08-30 20:22:05 -07:00
  • c6c4c53c8b Merge pull request #507 from anaqreon/export zotlabs 2016-08-31 12:22:46 +10:00
  • 16b7df3717 Imported webpage elements update existing elements properly. AllowCode permission is checked correctly and issues error on import if denied. Andrew Manning 2016-08-30 22:11:14 -04:00
  • 9bd8384a57 first cut at project governance doc redmatrix 2016-08-30 18:40:37 -07:00
  • 85d8300421 increase timeout on oembed remote fetches. This is a balancing act. Too short and many sites won't show up. Too long and you could be watching a spinner anxiously waiting for the page to load even if your own site is blindingly fast. redmatrix 2016-08-30 17:23:14 -07:00
  • d03c66c924 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-08-30 13:36:01 -07:00
  • b485d09847 Merge pull request #506 from anaqreon/website-export zotlabs 2016-08-31 06:32:54 +10:00
  • ad5c93d673 Merge remote-tracking branch 'upstream/dev' into website-export Andrew Manning 2016-08-30 06:14:22 -04:00
  • 202b757bc4 Merge pull request #505 from wave72/dev Wave 2016-08-30 10:32:52 +02:00
  • 603e64154d Updated Italian strings Wave72 2016-08-30 10:29:59 +02:00
  • 52b80711f6 remove duplicated include redmatrix 2016-08-29 21:21:09 -07:00
  • aec67e6be2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-08-29 19:15:22 -07:00
  • 8b6230726f add authors to post distribution; case insensitive sort apps redmatrix 2016-08-29 18:06:39 -07:00
  • 4050ff7c1f make lock switching actually work with multiple acl forms Mario Vavti 2016-08-29 12:48:16 +02:00
  • 6b4cfe4f18 Before throwing a 'smarty3 dir does not exist' fatal error, try and create it. We did try and create it during install, but the template processor is initalised long before we get to that code (and throws that ugly error). redmatrix 2016-08-28 22:24:27 -07:00
  • 810d9fefd9 create smarty dir before any templates can be initialised redmatrix 2016-08-28 22:18:51 -07:00
  • fb13e69b8e supercedes pull request #503 redmatrix 2016-08-28 21:48:17 -07:00
  • 689f232243 move allowed email domains to admin->security page redmatrix 2016-08-28 19:36:14 -07:00
  • f16b6406eb Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-08-28 16:19:10 -07:00
  • 760427fc43 fix aconfig redmatrix 2016-08-28 16:17:58 -07:00
  • 8931adc048 fix aconfig redmatrix 2016-08-28 16:17:58 -07:00
  • b752acdeef Merge pull request #502 from anaqreon/docfix Andrew Manning 2016-08-28 08:01:37 -04:00
  • ba224f382d Remove definite article before $Projectname in docs Andrew Manning 2016-08-28 06:59:26 -04:00
  • f2ff6f394b minor (non-technical) corrections in the plugin doc redmatrix 2016-08-27 19:43:55 -07:00
  • 391d7fed52 Merge pull request #501 from anaqreon/doc-search zotlabs 2016-08-28 12:32:32 +10:00
  • 07e28a9757 Display text around the searched query in documentation search Andrew Manning 2016-08-27 21:26:16 -04:00
  • b05474fc30 Merge remote-tracking branch 'upstream/dev' into website-export Andrew Manning 2016-08-27 18:58:10 -04:00
  • 47bd97b55d doc search broken redmatrix 2016-08-27 15:30:46 -07:00
  • 381b1a066d doc search broken redmatrix 2016-08-27 15:30:46 -07:00
  • 69ca279101 Merge remote-tracking branch 'upstream/dev' into website-export Andrew Manning 2016-08-27 14:14:28 -04:00
  • de1e39add9 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge redmatrix 2016-08-27 05:07:23 -07:00
  • ebd3b965fc vsprintf error on sql query redmatrix 2016-08-27 05:06:12 -07:00
  • 40b2e24c6d vsprintf error on sql query redmatrix 2016-08-27 05:06:12 -07:00
  • ddfc5209d3 Merge remote-tracking branch 'upstream/dev' into website-export. Added attach_move() to include/attach.php. Andrew Manning 2016-08-27 06:52:01 -04:00
  • aea2fa1629 issue #186 ...different check for pubforum with expert permissions redmatrix 2016-08-26 16:01:33 -07:00
  • 8e243edd20 add a couple of useful observer constructs to support identity aware pages redmatrix 2016-08-26 14:43:58 -07:00
  • a8b42fc21e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-08-26 14:00:45 -07:00
  • 86dd67f57d comanche: generalise the conditional variable usage and add $observer as a test. Update comanche doco to reflect recent changes. redmatrix 2016-08-26 13:58:37 -07:00
  • 97d7a523a0 Add new page connedit to Spanish context help Manuel Jiménez Friaza 2016-08-25 12:14:10 +02:00
  • 1d455c21d4 Merge pull request #499 from mjfriaza/master git-marijus 2016-08-26 19:58:00 +02:00
  • 8f631d0693 contact-block needs a class clear div at the end to not mess with following widgets and whitespace Mario Vavti 2016-08-26 19:51:39 +02:00
  • 002c203913 contact-block needs a class clear div at the end to not mess with following widgets and whitespace Mario Vavti 2016-08-26 19:51:39 +02:00
  • 8a2b96c2f9 - implemented but untested: duplicate detection for photo 'move to another folder' - weekly string update redmatrix 2016-08-26 01:37:46 -07:00
  • c6b9eb7855 update doco redmatrix 2016-08-25 18:49:45 -07:00
  • 38ea8bee93 ratings are gone. They can be enabled, but there is no UI for doing so at this time; and will likely only be available in a 'pro' configuration once the new implementation details have been hashed out. This appears to require a mechanism for rebuttal before it can again be opened to the public. There are also some synchronisation issues to contend with; as ratings are currently only distributed to active directory servers. There is no reliable mechanism for a new directory server to fetch existing ratings. redmatrix 2016-08-25 17:43:07 -07:00
  • a969f18137 move premium channel to 'pro' since that's the only configuration where it works reliably. redmatrix 2016-08-25 17:09:19 -07:00
  • 0381102c27 Fixed a string in the Spanish translation Manuel Jiménez Friaza 2016-08-25 12:20:53 +02:00
  • e81dccb14e Fixed a string in the Spanish translation Manuel Jiménez Friaza 2016-08-25 12:20:22 +02:00
  • 5c3e6307b4 Add new page connedit to Spanish context help Manuel Jiménez Friaza 2016-08-25 12:14:10 +02:00
  • 8d94402d25 attach_move() function created to relocate files or photos to different directories in the cloud area and photo albums without deleting and recreating (which would create a new resource_id and invalidate any existing links). redmatrix 2016-08-24 22:41:54 -07:00
  • 35d12b9e59 provide context help for the connedit page redmatrix 2016-08-24 21:16:58 -07:00
  • a81da0ec34 off by one pixel redmatrix 2016-08-24 20:06:44 -07:00
  • f1fbcd7c02 some more complex test scenarios for comanche conditionals: equals x, not equals x, in_array, and array_key_exists redmatrix 2016-08-24 17:42:59 -07:00
  • 5c32f42fe9 do not return false since it could prevent clicking also when not appropriate. Mario Vavti 2016-08-24 22:58:02 +02:00
  • a780252552 remove the onclick action Mario Vavti 2016-08-24 22:47:33 +02:00
  • 798b80e486 do not remove cover photo after scrolling it up. mimik an scroll edge if scrolling up again before scrolling into the cover photo again. Mario Vavti 2016-08-24 22:40:15 +02:00
  • aa0384bcec Revert "revert cover photo changes" Mario Vavti 2016-08-24 22:39:30 +02:00
  • dd654b9766 provide a mechanism for global template values (macro replacements that are available to all templates). There's a strong likelihood this list will increase but we may wish to actively prevent it from mushrooming out of control. redmatrix 2016-08-24 13:11:01 -07:00
  • 4c840d70a4 revert cover photo changes redmatrix 2016-08-24 12:56:45 -07:00
  • 238621ee92 allow changing the server role - as well as configuring any of the three options during installation redmatrix 2016-08-23 23:00:24 -07:00
  • 206054678b cover photo: adjustments to display the entire photo on manual scrollback (padding added for nav height) redmatrix 2016-08-23 20:10:56 -07:00
  • a5035dee74 several cover photo widget enhancements: - allow a click anywhere on the page to cause the photo to autoscroll - provide a logic flag to autoscroll only once - allow manual scroll back to see the cover photo afterward (tricky to handle the nav menu here) - on scroll back, the nav remains fixed at the top and the top pixels of the cover photo are covered (this was an acceptable tradeoff to gain the ability to see the photo again without causing unpredictable behaviour of the nav) - some positioning details in small screen width mode caused jot to be off screen due to insufficient top padding; a manual padding was also added as something still wasn't right even after adding the nav height - very minor nit: if screen size is reduced below 755 and then upsized again, the cover photo will not be redisplayed redmatrix 2016-08-23 19:13:46 -07:00
  • d3369384d1 include port in pdo url when host is 'localhost' redmatrix 2016-08-23 18:18:05 -07:00
  • 420aa4bc44 Merge remote-tracking branch 'upstream/dev' into website-export Andrew Manning 2016-08-23 06:57:10 -04:00
  • 305e0538d2 Website export to cloud files works. Created new recursive copy function in attach.php. Andrew Manning 2016-08-23 06:55:26 -04:00
  • 8aee932525 version 1.12 redmatrix 2016-08-23 00:46:22 -07:00
  • 8b737e9610 Merge branch 'master' into 1.12RC redmatrix 2016-08-22 23:02:38 -07:00
  • 0b16a5531a Revert "Merge branch '1.12RC'" redmatrix 2016-08-22 20:31:31 -07:00
  • b7fbd0ee50 Revert "missing release file" redmatrix 2016-08-22 20:30:39 -07:00
  • 2afdb7854b Revert "more missing files from merge" redmatrix 2016-08-22 20:30:17 -07:00
  • 1bd784cf12 more missing files from merge redmatrix 2016-08-22 20:19:31 -07:00
  • 17fa2d8801 missing release file redmatrix 2016-08-22 20:17:37 -07:00
  • b89c869e7c Merge branch '1.12RC' redmatrix 2016-08-22 20:05:25 -07:00
  • 1e6a491400 change default server role redmatrix 2016-08-22 19:45:21 -07:00
  • 38ca3bac40 optional server role compatibility checks for plugins redmatrix 2016-08-22 17:41:41 -07:00
  • 1a506ad49c Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge redmatrix 2016-08-22 17:06:56 -07:00
  • b0d3c17f19 public forum fallback checking (when custom/expert permissions are applied) was looking at owner rather than observer perms redmatrix 2016-08-22 17:04:13 -07:00
  • e967bc9c45 public forum fallback checking (when custom/expert permissions are applied) was looking at owner rather than observer perms redmatrix 2016-08-22 17:04:13 -07:00
  • d6d21cb5f6 doco updates redmatrix 2016-08-22 16:46:44 -07:00
  • d177cf94da server role management, part 1 redmatrix 2016-08-22 16:21:07 -07:00
  • f4507d878d Spanish and Dutch strings jeroenpraat 2016-08-22 19:45:46 +02:00
  • a3e0e67953 remove references to tinymce which were causing console errors redmatrix 2016-08-21 19:40:11 -07:00
  • 7045b920ef make zid() do the right things when confronted with url fragments redmatrix 2016-08-21 17:38:36 -07:00
  • 9a057623d6 Merge branch 'git-marijus-dev' into dev redmatrix 2016-08-21 16:34:42 -07:00
  • b6a545b4a2 Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev redmatrix 2016-08-21 16:33:59 -07:00
  • d4ef3c183c Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge redmatrix 2016-08-21 16:29:41 -07:00
  • 5c3b06b8a9 issue #496 redmatrix 2016-08-21 16:26:30 -07:00
  • 4d34d9c032 issue #496 redmatrix 2016-08-21 16:26:30 -07:00
  • 4f62d7a78f move jotnets to jot and some cleanup (mostly whitespace) Mario Vavti 2016-08-21 15:43:03 +02:00
  • d39cf23b2f Visual improvements to the export element table Andrew Manning 2016-08-21 06:53:19 -04:00