harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
redmatrix 2016-09-22 16:52:37 -07:00
commit be6c4019f6
10 changed files with 16305 additions and 15863 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Events.php
View File

@ -118,7 +118,7 @@ class Events extends \Zotlabs\Web\Controller {
goaway($onerror_url); goaway($onerror_url);
} }
$share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0); $share = ((intval($_POST['distr'])) ? intval($_POST['distr']) : 0);
$channel = \App::get_channel(); $channel = \App::get_channel();
@ -469,7 +469,7 @@ class Events extends \Zotlabs\Web\Controller {
'$t_orig' => $t_orig, '$t_orig' => $t_orig,
'$sh_text' => t('Share this event'), '$sh_text' => t('Share this event'),
'$sh_checked' => $sh_checked, '$sh_checked' => $sh_checked,
'$share' => array('share', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))), '$share' => array('distr', t('Share this event'), $sh_checked, '', array(t('No'),t('Yes'))),
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$perms_label' => t('Permission settings'), '$perms_label' => t('Permission settings'),
// populating the acl dialog was a permission description from view_stream because Cal.php, which // populating the acl dialog was a permission description from view_stream because Cal.php, which

1
library/bootstrap/css/bootstrap-theme.css.map Normal file
View File

File diff suppressed because one or more lines are too long

1
library/bootstrap/css/bootstrap-theme.min.css.map Normal file
View File

File diff suppressed because one or more lines are too long

1
library/bootstrap/css/bootstrap.css.map Normal file
View File

File diff suppressed because one or more lines are too long

1
library/bootstrap/css/bootstrap.min.css.map Normal file
View File

File diff suppressed because one or more lines are too long

14786
view/de/hmessages.po
View File

File diff suppressed because it is too large Load Diff

3117
view/de/hstrings.php
View File

File diff suppressed because it is too large Load Diff

12197
view/it/hmessages.po
View File

File diff suppressed because it is too large Load Diff

2042
view/it/hstrings.php
View File

File diff suppressed because it is too large Load Diff

18
view/tpl/event_head.tpl
View File

@ -1,7 +1,7 @@
<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' /> <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script> <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/moment/moment.min.js"></script>
<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script> <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/lang-all.js"></script> <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/locale-all.js"></script>
<script> <script>
function showEvent(eventid) { function showEvent(eventid) {
@ -154,9 +154,9 @@
}); });
// ACL // ACL
$('#id_share').change(function() { $('#id_distr').change(function() {
if ($('#id_share').is(':checked')) { if ($('#id_distr').is(':checked')) {
$('#dbtn-acl').show(); $('#dbtn-acl').show();
} }
else { else {
@ -164,18 +164,6 @@
} }
}).trigger('change'); }).trigger('change');
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
$('#jot-public').hide();
});
if(selstr == null) {
$('#jot-public').show();
}
}).trigger('change');
}); });
</script> </script>