maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Merge branch 'develop' of https://github.com/alextselegidis/easyappointments into develop

Browse source
This commit is contained in:
Alex Tselegidis 2015-12-13 22:10:26 +01:00
commit 4697b030d1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rsc/db/sample-data.sql
View file

@ -22,8 +22,8 @@ INSERT INTO `ea_settings` (`id`, `name`, `value`) VALUES
(3, 'company_name', 'ABC Company'), (3, 'company_name', 'ABC Company'),
(4, 'company_email', 'info@abc-company.ea'), (4, 'company_email', 'info@abc-company.ea'),
(5, 'company_link', 'http://www.abc-company.ea'), (5, 'company_link', 'http://www.abc-company.ea'),
(6, 'google_analytics_code', ''); (6, 'google_analytics_code', ''),
(7, 'customer_notifications', '1'); (7, 'customer_notifications', '1'),
(8, 'date_format', 'DMY'); (8, 'date_format', 'DMY');
-- --

2
src/application/views/backend/calendar.php
View file

@ -79,7 +79,7 @@
<button id="insert-unavailable" class="btn btn-default" <button id="insert-unavailable" class="btn btn-default"
title="<?php echo $this->lang->line('unavailable_periods_hint'); ?>"> title="<?php echo $this->lang->line('unavailable_periods_hint'); ?>">
<span class="glyphicon glyphicon-plus"></i> <span class="glyphicon glyphicon-plus"></span>
<?php echo $this->lang->line('unavailable'); ?> <?php echo $this->lang->line('unavailable'); ?>
</button> </button>
</div> </div>