Commit Graph

17611 Commits

Author SHA1 Message Date
redmatrix c3fdd00aa4 allow public comments (sort of - see the notes) 2016-08-31 18:39:50 -07:00
redmatrix 13c7fe46cd Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-08-31 17:51:23 -07:00
redmatrix ea0be8ea1a provide techlevels in the pro server role. Should have no visible effect on other roles. 2016-08-31 17:49:22 -07:00
jeroenpraat 38ea71c6c9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2016-08-31 13:17:34 +02:00
jeroenpraat 37ad734cea Dutch and Spanish string update 2016-08-31 13:17:23 +02:00
Mario Vavti e9462ba145 resolve merge conflict 2016-08-31 09:41:07 +02:00
Mario Vavti 2b9322fc7d provide a possibility to create checklists in bbcode [x] creates a checked checkbox, [] creates an unchecked checkbox 2016-08-31 09:38:47 +02:00
redmatrix b775a1aa0e The 'save to folder' modal dialog looked like crap. Now it only looks like dung. 2016-08-30 21:43:33 -07:00
redmatrix 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. 2016-08-30 20:54:54 -07:00
redmatrix 68f6baf938 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-08-30 20:22:33 -07:00
redmatrix 5994fadebb version and release policy guide 2016-08-30 20:22:05 -07:00
zotlabs c6c4c53c8b Merge pull request #507 from anaqreon/export
Imported webpage elements update existing elements properly. AllowCode…
2016-08-31 12:22:46 +10:00
Andrew Manning 16b7df3717 Imported webpage elements update existing elements properly. AllowCode permission is checked correctly and issues error on import if denied. 2016-08-30 22:11:14 -04:00
redmatrix 9bd8384a57 first cut at project governance doc 2016-08-30 18:40:37 -07:00
redmatrix 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. 2016-08-30 17:23:14 -07:00
redmatrix d03c66c924 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-08-30 13:36:01 -07:00
zotlabs b485d09847 Merge pull request #506 from anaqreon/website-export
Website export
2016-08-31 06:32:54 +10:00
Andrew Manning ad5c93d673 Merge remote-tracking branch 'upstream/dev' into website-export 2016-08-30 06:14:22 -04:00
Wave 202b757bc4 Merge pull request #505 from wave72/dev
Updated Italian strings
2016-08-30 10:32:52 +02:00
Wave72 603e64154d Updated Italian strings 2016-08-30 10:29:59 +02:00
redmatrix 52b80711f6 remove duplicated include 2016-08-29 21:21:09 -07:00
redmatrix aec67e6be2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-08-29 19:15:22 -07:00
redmatrix 8b6230726f add authors to post distribution; case insensitive sort apps 2016-08-29 18:06:39 -07:00
Mario Vavti 4050ff7c1f make lock switching actually work with multiple acl forms 2016-08-29 12:48:16 +02:00
redmatrix 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). 2016-08-28 22:24:27 -07:00
redmatrix 810d9fefd9 create smarty dir before any templates can be initialised 2016-08-28 22:18:51 -07:00
redmatrix fb13e69b8e supercedes pull request #503 2016-08-28 21:48:17 -07:00
redmatrix 689f232243 move allowed email domains to admin->security page 2016-08-28 19:36:14 -07:00
redmatrix f16b6406eb Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-08-28 16:19:10 -07:00
redmatrix 8931adc048 fix aconfig 2016-08-28 16:17:58 -07:00
Andrew Manning b752acdeef Merge pull request #502 from anaqreon/docfix
Remove definite article before $Projectname in docs
2016-08-28 08:01:37 -04:00
Andrew Manning ba224f382d Remove definite article before $Projectname in docs 2016-08-28 06:59:26 -04:00
redmatrix f2ff6f394b minor (non-technical) corrections in the plugin doc 2016-08-27 19:43:55 -07:00
zotlabs 391d7fed52 Merge pull request #501 from anaqreon/doc-search
Display text around the searched query in documentation search
2016-08-28 12:32:32 +10:00
Andrew Manning 07e28a9757 Display text around the searched query in documentation search 2016-08-27 21:26:16 -04:00
Andrew Manning b05474fc30 Merge remote-tracking branch 'upstream/dev' into website-export 2016-08-27 18:58:10 -04:00
redmatrix 381b1a066d doc search broken 2016-08-27 15:30:46 -07:00
Andrew Manning 69ca279101 Merge remote-tracking branch 'upstream/dev' into website-export 2016-08-27 14:14:28 -04:00
redmatrix 40b2e24c6d vsprintf error on sql query 2016-08-27 05:06:12 -07:00
Andrew Manning ddfc5209d3 Merge remote-tracking branch 'upstream/dev' into website-export. Added attach_move() to include/attach.php. 2016-08-27 06:52:01 -04:00
redmatrix aea2fa1629 issue #186 ...different check for pubforum with expert permissions 2016-08-26 16:02:04 -07:00
redmatrix 8e243edd20 add a couple of useful observer constructs to support identity aware pages 2016-08-26 14:43:58 -07:00
redmatrix a8b42fc21e Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2016-08-26 14:00:45 -07:00
redmatrix 86dd67f57d comanche: generalise the conditional variable usage and add $observer as a test. Update comanche doco to reflect recent changes. 2016-08-26 13:58:37 -07:00
Manuel Jiménez Friaza 97d7a523a0 Add new page connedit to Spanish context help 2016-08-26 20:45:11 +02:00
Mario Vavti 002c203913 contact-block needs a class clear div at the end to not mess with following widgets and whitespace 2016-08-26 19:51:39 +02:00
redmatrix 8a2b96c2f9 - implemented but untested: duplicate detection for photo 'move to another folder'
- weekly string update
2016-08-26 01:37:46 -07:00
redmatrix c6b9eb7855 update doco 2016-08-25 18:49:45 -07:00
redmatrix 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. 2016-08-25 17:43:07 -07:00
redmatrix a969f18137 move premium channel to 'pro' since that's the only configuration where it works reliably. 2016-08-25 17:09:19 -07:00