Skip to content

Re-merge older branches + add CentOS dev environment + clean .gitignore #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
amiramix wants to merge 46 commits into
base: release-17.08
Choose a base branch
from
Open

Re-merge older branches + add CentOS dev environment + clean .gitignore #87

amiramix wants to merge 46 commits into from

Conversation

@amiramix
Copy link

@amiramix amiramix commented Mar 20, 2017

  • Re-merged older branches to ensure all changes ever added to those branches are present in this branch.
  • Removed homer dependency which no longer exists upstream
  • Added a config option which allows to compile sipxecs from sources on CentOS (in addition to Fedora which is already supported)
  • Clean-up .gitignore - with this change "git status" returns clean output even if some private modules are present in the main folder (this is achieved by ignoring everything and un-ignoring all folders known to sipxecs)

Please review and let me know if any additional changes are necessary.

George Niculae and others added 30 commits August 17, 2016 16:24
Update README
a3a90c1 
trigger build process
Update README
6a59b48
Update README
79a09f2
Update README
afa076c
Update README
6d85607
@mharcar
UW-338 UC-4216 UW-371 UW-231 unitelite 16.08
dd0c282
@mharcar
UW-338 UC-4216 UW-371 UW-231 unitelite 16.08 fixed previous commit
5c29a86
@mharcar
UW-338 unitelite, changed warning message
c7d9b9c
UC-4189: barge in functionality broken
1d44023
UC-4193: zen 6013 : StateQueueClient 100ms hard coded timeout
2863e72 
-added tcp-timeout setting into etc/sipxpbx/sipxsqa-config
default is 100 ms
UC-4193: zen 6013 : StateQueueClient 100ms hard coded timeout
b0d62b4 
-replicate tcp timeout in sipxsqa-client.ini too
UC-4193 StateQueueClient 100ms hard coded timeout
ad8363b 
- refactoring before actual fix:
- BlockingTcpClient moved to separate source/include files
- friendship of StateQueueClient and BlockingTcpClient removed to avoid interface confusion
- some of the BlockingTcpClient methods made private
UC-4193 StateQueueClient 100ms hard coded timeout
c081856 
- magic numbers removed
- clean unused code from BlockingClient
- read of "tcp-timeout" option added
UC-4193 StateQueueClient 100ms hard coded timeout
a51ebc9 
- magic numbers removed
- clean unused code from BlockingClient
- read of "tcp-timeout" option added
UC-4193 StateQueueClient 100ms hard coded timeout
e4924b2 
- magic numbers removed
- clean unused code from BlockingClient
- read of "tcp-timeout" option added
UC-4193 StateQueueClient 100ms hard coded timeout
2043f43 
 - BlockingTcpClient.cpp merged back to BlockingTcpClient.h to avoid compiltaion issues
UC-4044 uniteme setup to bind network interface of choice
ab7ee5d 
- preparation for IP moval script development.
@bmachens
SIPX-524 Backport from 16.12
53dbeb1
Merge pull request sipXcom#63 from bmachens/release-16.08
1ed3397 
SIPX-524 Backport from 16.12
UC-4267 - Config generation fails with external Line on Phone
2bad515
@bmachens
SIPX-529 Allow to self should only override name check for BLF, not B…
e774da9 
…LF/Speed dial check
@dizzy
Merge pull request sipXcom#64 from bmachens/release-16.08
f5bbe70 
SIPX-529
@amiramix
Update gitignore + add development Apache config for Centos
ad0c982
SIPX-533: AA auto attendant not restricted by locations (again)
ed6bbe1 
- generate mongo entires always (not only on live attendant), use expiration of 0 to direct to AA when live attendant not enabled
@amiramix
Try to improve .gitignore, check-in untracked files, changes to allow…
0960d4e 
… development on CentOS
@amiramix
Merge branch 'release-16.08' of git://github.com/sipxcom/sipxecs into…
6634128 
… release-16.08-greg
@amiramix
Merge branch 'release-16.08-greg' into release-16.12
c6ef91c 
Conflicts:
	freeswitch
	sipXconfig/web/unitelite/index.html
	sipXconfig/web/unitelite/scripts/136f5540ba8b86199d328694.scripts.js
	sipXconfig/web/unitelite/scripts/668494ad528c8b5f63df46c4.scripts.js
	sipXconfig/web/unitelite/scripts/ccee0dece6918f197cfb59a9.scripts.js
	sipXconfig/web/unitelite/views/settings.html
@amiramix
Merge branch 'release-16.12' into release-16.12-greg
1ea059c 
Conflicts:
	.gitignore
@amiramix
Merge branch 'release-16.12' of git://github.com/sipxcom/sipxecs into…
7a142ac 
… release-16.12-greg
@mharcar
UW-388 unitelite 16.12 stage
057730a
amiramix and others added 16 commits February 28, 2017 18:58
@amiramix
Merge branch 'release-16.12-greg' into release-17.04-greg
1b105cb
UC-4376: Disable MWI subscription if Voicemail permissions are disabled
9a414a5
@cbeyersdorf
- Fix for SIPX-600
468362e 
- added ability to add custom configs for yealink phone provisioning
@cbeyersdorf
- added custom settings option for v7x firmwares (see SIPX-600)
fbc4b0b
Revert FS T38 commit
0f802eb
@dizzy
Merge pull request sipXcom#83 from iant-gmbh/SIPX-600
eecd248 
SIPX-600: Custom settings enhancement for Yealink provisioning
@bmachens
SIPX-585 Check Phone Speed dials to select RL-URI for Lines (FW 7.x)
adbb0aa
@dizzy
Merge pull request sipXcom#85 from bmachens/release-17.04
88d941e 
SIPX-585 Check Phone Speed dials to select RL-URI for Lines (FW 7.x)
@cbeyersdorf @bmachens
- added default value for display name in jitsi provisioning
01d0421
@cbeyersdorf @bmachens
- m_line.getDisplayLabel() resolves to userid so switched to m_user.g…
984edf8 
…etDisplayName() as default this works like required
@dizzy
Merge pull request sipXcom#86 from bmachens/release-17.04
f71b496 
UC-4363 Backport 17.04
@amiramix
Merge branch 'release-16.12' of git://github.com/sipxcom/sipxecs into…
04e670d 
… release-17.04-greg
@amiramix
Merge branch 'release-17.04' of git://github.com/sipxcom/sipxecs into…
c285978 
… release-17.04-greg
@amiramix
Merge branch 'release-17.04-greg' into release-17.08
510d2fb 
Conflicts:
	.gitignore
	freeswitch
@amiramix
Merge branch 'release-17.08' of git://github.com/sipxcom/sipxecs into…
19918cc 
… release-17.08
@amiramix
Merge branch 'release-17.08' of git://github.com/sipxcom/sipxecs into…
63b43ab 
… release-17.08

Conflicts:
	sipXyealink/etc/yealink/config_v7x.vm
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@amiramix @mharcar @bmachens @dizzy @cbeyersdorf