Commit Graph
6 Commits
Author SHA1 Message Date
jebsolutions 04196328ef typo fix (#2200)
Ooh Noo.
2016-11-26 16:08:35 -07:00
jebsolutions 8547f2ac32 fixes for #1821 4.2 branch (#2034)
* fixes for #1822 4.2 branch

app/extensions/app_languages.php
+ add duplicate extension error prompt

app/extensions/extension_copy.php
+ add check to see if duplicate extension exists

app/extensions/resources/classes/extension.php
+ add function to check if extension exists
+ all cherry picks "AND AND" fix from master

* fix typo

* Update app_languages.php

* Update extension_copy.php

* Update extension.php
2016-11-24 01:12:21 -07:00
jebsolutions f60b25175d [4.2] fix orphan v_ring_group_users after deleting ring group (#2111)
Same as pr #2110 except for 4.2 branch

steps to test:
create a ring group with one extension and one user. This will add one user to v_ring_group_users table. Delete the ring group.

expected result:
ring group and all it's components are deleted

actual result
v_ring_group_user entry for this ring group is not deleted.

This fix: deletes v_ring_group_user when ring group is deleted.
2016-11-21 13:59:51 -07:00
jebsolutions aa12c13056 include stderr in git pull results and check for error (#2104)
Old result (seems correct but actually failed)
Updating d190f6a..d958bea

Corrected result (includes failure message):
Updating d190f6a..d958bea
error: Your local changes to the following files would be overwritten by merge:
        app/fax/fax_log_view.php
Please, commit your changes or stash them before you can merge.
2016-11-20 13:55:12 -07:00
jebsolutions 251b808558 #1987 combined fix for 4.2 (#2030)
app/fax/app_defaults.php:
+ fix: duplicate check only within same default_setting_category.  This fixes the bug where "keep_local" for fax wasn't being created because there was a "keep_local" for voicemail.  Without this fix you will get a lua error due to the field not being set and nothing shows up in the sent faxes log.

fax/fax_log_view.php:
+ fix: back button text is missing.  Copied correct localized text code from another fax page that worked.

app/fax/app_config.php
+ fix: date field is now timestamp for postgres+mysql.  This fixes the listing only showing the date, not the time as well.

Note: app->defaults doesn't change field types.  Existing installs will have to manually update the field type e.g. for postgres:

sudo -sHu postgres
\d fusionpbx
alter table v_fax_logs alter column fax_date type timestamp without time zone;
\q
2016-11-03 16:25:02 -06:00
jebsolutions 0ed5657ec6 email/fax fixes for 4.2 branch (#2022)
I updated this to latest 4.2.
2016-10-31 14:21:26 -06:00