Commit Graph

6486 Commits

Author SHA1 Message Date
markjcrane c11459fae8 Get the domain_name from the array. 2016-03-11 14:21:08 -07:00
FusionPBX c21de89d51 Merge pull request #1459 from moteus/operator_panel_short_number
Fix. Use operator panel with short extension.
2016-03-11 13:38:18 -07:00
FusionPBX 6c8aa675a2 Merge pull request #1468 from mafoo/WhitespaceClean-app/batch_1
WhitespaceClean-app/batch_1
2016-03-11 13:35:41 -07:00
FusionPBX 45704a7707 Merge pull request #1469 from mafoo/WhitespaceClean-app/batch_2
WhitespaceClean-app/batch_2
2016-03-11 13:35:24 -07:00
FusionPBX bf5a45dc08 Merge pull request #1471 from mafoo/WhitespaceClean-core/batch
WhitespaceClean-core/batch
2016-03-11 13:35:06 -07:00
FusionPBX 8a8629404a Merge pull request #1475 from mafoo/WhitespaceClean-resources/provision/polycom
WhitespaceClean-resources/provision/polycom
2016-03-11 13:34:49 -07:00
FusionPBX 3c85bc5999 Merge pull request #1476 from mafoo/WhitespaceClean-resources/provision/yealink
WhitespaceClean-resources/provision/yealink
2016-03-11 13:34:22 -07:00
FusionPBX 55993a1db7 Merge pull request #1474 from mafoo/WhitespaceClean-resources/provision/grandstream
WhitespaceClean-resources/provision/grandstream
2016-03-11 13:32:31 -07:00
FusionPBX bd6efe903c Merge pull request #1477 from mafoo/WhitespaceClean-resources/provision/mitel
WhitespaceClean-resources/provision/mitel
2016-03-11 13:32:01 -07:00
FusionPBX 489f1ef95f Merge pull request #1478 from mafoo/WhitespaceClean-resources/provision/others
WhitespaceClean-resources/provision/others
2016-03-11 13:31:33 -07:00
FusionPBX ad3ea2d1a9 Merge pull request #1466 from mafoo/WhitespaceClean-app/sip_profiles
WhitespaceClean-app/sip_profiles
2016-03-11 13:27:38 -07:00
FusionPBX a22660bbff Merge pull request #1481 from mafoo/WhitespaceClean-resources/jquery
WhitespaceClean-resources/jquery
2016-03-11 13:27:02 -07:00
FusionPBX 1aa56e7bfa Merge pull request #1467 from mafoo/WhitespaceClean-app/xml_cdr
WhitespaceClean-app/xml_cdr
2016-03-11 13:25:49 -07:00
FusionPBX ee0df44e0d Merge pull request #1461 from mafoo/BugFix-ring_groups
corrected function definition
2016-03-11 13:25:20 -07:00
FusionPBX 17d433f12e Merge pull request #1460 from mafoo/Enhance-Add_mod_translate
added mod_translate to the modules list
2016-03-11 13:24:43 -07:00
FusionPBX ab3aaf51cb Merge pull request #1462 from mafoo/BugFix-Translation-True_False
BugFix-Translation-True_False
2016-03-11 13:24:13 -07:00
FusionPBX 54c1dcfdf1 Merge pull request #1472 from mafoo/WhitespaceClean-resources/classes
WhitespaceClean-resources/classes
2016-03-11 13:22:57 -07:00
FusionPBX 9a136d3b8f Merge pull request #1470 from mafoo/WhitespaceClean-core/install
WhitespaceClean-core/install
2016-03-11 13:22:30 -07:00
FusionPBX d312084d21 Merge pull request #1465 from mafoo/WhitespaceClean-app/dialplan
WhitespaceClean-app/dialplan
2016-03-11 13:22:02 -07:00
FusionPBX f92cbd235f Merge pull request #1463 from mafoo/WhitespaceClean-root
WhitespaceClean-root
2016-03-11 13:21:22 -07:00
FusionPBX c1dfbae3ce Merge pull request #1464 from mafoo/WhitespaceClean-app/access_controls
WhitespaceClean-app/access_controls
2016-03-11 13:21:00 -07:00
FusionPBX 260bf24100 Merge pull request #1479 from mafoo/WhitespaceClean-resources/install/scripts
WhitespaceClean-resources/install/scripts
2016-03-11 13:20:17 -07:00
FusionPBX 55a8bb2686 Merge pull request #1473 from mafoo/WhitespaceClean-resources/provision/cisco
WhitespaceClean-resources/provision/cisco
2016-03-11 13:19:13 -07:00
FusionPBX 919eacb2a7 Merge pull request #1480 from mafoo/WhitespaceClean-resources/templates/conf
WhitespaceClean-resources/templates/conf
2016-03-11 13:18:21 -07:00
FusionPBX 88fe82308f Merge pull request #1482 from mafoo/WhitespaceClean-resources/edit_area
WhitespaceClean-resources/edit_area
2016-03-11 13:16:31 -07:00
FusionPBX 41dfdcef23 Merge pull request #1483 from mafoo/WhitespaceClean-resources/templates/engine/smarty
WhitespaceClean-resources/templates/smarty
2016-03-11 13:16:14 -07:00
FusionPBX 2be9c13080 Merge pull request #1484 from mafoo/WhitespaceClean-resources/others
WhitespaceClean-resources/others
2016-03-11 13:15:09 -07:00
FusionPBX 3297375271 Merge pull request #1485 from mafoo/WhitespaceClean-others
WhitespaceClean-others
2016-03-11 13:12:41 -07:00
markjcrane 961e527abb Change device_provision_enable to device_enabled to make it consistent with the rest of the fields that are used for to enable and disable something. 2016-03-11 11:46:02 -07:00
markjcrane f5c2222f97 Prevent custom sip port from breaking provision.lua and add prevent nil concatenation errors. 2016-03-11 10:31:11 -07:00
mafoo 2119c7ee8d WhitespaceClean-others
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:58:35 +00:00
mafoo 5e97c0df2c WhitespaceClean-resources/others
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:57:01 +00:00
mafoo 3f5d003c71 WhitespaceClean-resources/templates/smarty
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:45:32 +00:00
mafoo aca80b09c0 WhitespaceClean-resources/edit_area
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:29:29 +00:00
mafoo b0f383479a WhitespaceClean-resources/jquery
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:26:36 +00:00
mafoo 893216a2d2 WhitespaceClean-resources/templates/conf
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:24:27 +00:00
mafoo 0eb7d5ddac WhitespaceClean-resources/install/scripts
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:21:52 +00:00
mafoo d68833f588 WhitespaceClean-resources/provision/others
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:22:24 +00:00
mafoo 5cae1fef28 WhitespaceClean-resources/provision/mitel
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:20:37 +00:00
mafoo d018f74ed3 WhitespaceClean-resources/provision/yealink
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:18:50 +00:00
mafoo 1f8f01cabb WhitespaceClean-resources/provision/polycom
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:16:24 +00:00
mafoo 713b29998b WhitespaceClean-resources/provision/grandstream
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:12:47 +00:00
mafoo 9a6cf80f06 WhitespaceClean-resources/provision/cisco
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:10:46 +00:00
mafoo 1726744f4e WhitespaceClean-resources/classes
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:08:26 +00:00
mafoo ffc6bfcb2b WhitespaceClean-core/batch
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:06:20 +00:00
mafoo f803f03496 WhitespaceClean-core/install
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:03:29 +00:00
mafoo 6eed9935d4 WhitespaceClean-app/batch_2
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:01:24 +00:00
mafoo 3b438926b6 WhitespaceClean-app/batch_1
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 11:56:29 +00:00
mafoo 4131926b86 WhitespaceClean-app/xml_cdr
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 11:54:18 +00:00
mafoo 4b51565e9f WhitespaceClean-app/sip_profiles
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 11:51:17 +00:00