harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,488 Commits 6 Branches 36 Tags
ca8d252ad75306e6d3cd066d5c593e94de1dfbdd
Commit Graph

24488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 760427fc43 fix aconfig 2016-08-28 16:18:31 -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 47bd97b55d doc search broken 2016-08-27 15:31:26 -07: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 de1e39add9 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge 2016-08-27 05:07:23 -07:00
redmatrix ebd3b965fc vsprintf error on sql query 2016-08-27 05:07:07 -07: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
git-marijus 1d455c21d4 Merge pull request #499 from mjfriaza/master 
Add new page 'connedit' to Spanish context help & fixed a string in Spanish translation
 2016-08-26 19:58:00 +02:00
Mario Vavti 8f631d0693 contact-block needs a class clear div at the end to not mess with following widgets and whitespace 2016-08-26 19:52:21 +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
Manuel Jiménez Friaza 0381102c27 Fixed a string in the Spanish translation 2016-08-25 12:20:53 +02:00
Manuel Jiménez Friaza e81dccb14e Fixed a string in the Spanish translation 2016-08-25 12:20:22 +02:00
Manuel Jiménez Friaza 5c3e6307b4 Add new page connedit to Spanish context help 2016-08-25 12:14:10 +02:00
redmatrix 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). 2016-08-24 22:41:54 -07:00
redmatrix 35d12b9e59 provide context help for the connedit page 2016-08-24 21:16:58 -07:00
redmatrix a81da0ec34 off by one pixel 2016-08-24 20:06:44 -07:00
redmatrix f1fbcd7c02 some more complex test scenarios for comanche conditionals: equals x, not equals x, in_array, and array_key_exists 2016-08-24 17:42:59 -07:00
Mario Vavti 5c32f42fe9 do not return false since it could prevent clicking also when not appropriate. 2016-08-24 22:58:02 +02:00
Mario Vavti a780252552 remove the onclick action 2016-08-24 22:47:33 +02:00