aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update asterisk_log.phpnagyrobi2013-09-231-11/+20
| | | Log path restored to default, on every architecture; trim and clear should return an infobox now.
* Fix newlines. Please use autocrlfjim-p2013-09-211-378/+378
|
* Merge pull request #503 from nagyrobi/patch-13Renato Botelho2013-09-211-2/+7
|\ | | | | Update asterisk.inc
| * Update asterisk.incnagyrobi2013-09-211-2/+7
|/ | | Add config move routine for non-pbi install; prepare a backup file to restore Asterisk's settings to factory defaults later.
* Merge pull request #502 from nagyrobi/patch-12Marcello Coutinho2013-09-201-1/+1
|\ | | | | Update asterisk.xml
| * Update asterisk.xmlnagyrobi2013-09-201-1/+1
| | | | | | Function sync_package_asterisk(); is called twice when installing (also from asterisk_install();) this makes several edits in the startup and config files twice. Commented it out for now here.
* | Merge pull request #501 from nagyrobi/patch-11Marcello Coutinho2013-09-201-367/+373
|\ \ | |/ |/| Update asterisk.inc
| * Update asterisk.incnagyrobi2013-09-201-367/+373
|/ | | Updated configuration mover, a couple of new modules not loaded by default, SIP bindig to LAN interface by default to have correctly running system after first installation .
* sarg - remove unset_gd from compile options and add missing ldap option on ↵Marcello Coutinho2013-09-203-4/+5
| | | | usertab field
* Fix newlinesjim-p2013-09-201-367/+367
|
* Merge pull request #500 from nagyrobi/patch-10Renato Botelho2013-09-191-24/+22
|\ | | | | Update asterisk.inc
| * Update asterisk.incnagyrobi2013-09-191-24/+22
|/ | | Gosh I found some dumb syntax errors. Plus optimized a bit more.
* sarg - fix squidguard conf dirMarcello Coutinho2013-09-194-6/+8
|
* Merge pull request #499 from nagyrobi/patch-9Marcello Coutinho2013-09-191-1/+19
|\ | | | | Update asterisk.inc
| * Update asterisk.incnagyrobi2013-09-191-1/+19
|/ | | for NanoBSD compatibility, move the /etc/asterisk configuration directory to /conf, and symlink it back. /conf/asterisk is also required by asterisk_edit_file.php.
* Merge pull request #498 from nagyrobi/patch-8Marcello Coutinho2013-09-191-1/+1
|\ | | | | Update pkg_config.8.xml.amd64
| * Update pkg_config.8.xml.amd64nagyrobi2013-09-191-1/+1
| | | | | | Bump Asterisk package version number accordingly.
* | Merge pull request #497 from nagyrobi/patch-7Marcello Coutinho2013-09-191-1/+1
|\ \ | | | | | | Update pkg_config.8.xml
| * | Update pkg_config.8.xmlnagyrobi2013-09-191-1/+1
| |/ | | | | Bump Asterisk package version number accordingly.
* | Merge pull request #496 from nagyrobi/patch-6Marcello Coutinho2013-09-191-2/+2
|\ \ | | | | | | Update asterisk.xml
| * | Update asterisk.xmlnagyrobi2013-09-191-2/+2
| |/ | | | | Bump the version number.
* | Merge pull request #490 from nagyrobi/patch-1Marcello Coutinho2013-09-191-8/+136
|\ \ | | | | | | Update asterisk_edit_file.php
| * | Update asterisk_edit_file.phpnagyrobi2013-09-191-8/+136
| |/ | | | | | | Update to be compatible with 2.1-RELEASE, NanoBSD. Added complete Asterisk config backup and restore options.
* | Merge pull request #491 from nagyrobi/patch-2Marcello Coutinho2013-09-191-20/+23
|\ \ | | | | | | Update asterisk_calls.php
| * | Update asterisk_calls.phpnagyrobi2013-09-191-20/+23
| |/ | | | | Added utf8_decode to the cells of the From column of the table, as Asterisk saves these names in UTF-8 encoding.
* | Merge pull request #492 from nagyrobi/patch-3Marcello Coutinho2013-09-191-5/+11
|\ \ | | | | | | Update asterisk_log.php
| * | Update asterisk_log.phpnagyrobi2013-09-191-5/+11
| |/
* | Merge pull request #493 from nagyrobi/patch-4Marcello Coutinho2013-09-191-13/+20
|\ \ | | | | | | Update asterisk_cmd.php
| * | Update asterisk_cmd.phpnagyrobi2013-09-191-13/+20
| |/ | | | | Added more Asterisk status options, rearranged menu buttons.
* | Merge pull request #495 from nagyrobi/patch-5Marcello Coutinho2013-09-191-93/+351
|\ \ | |/ |/| Update asterisk.inc
| * Update asterisk.incnagyrobi2013-09-191-93/+351
|/ | | Setup to make the Asterisk installation work straight out of the box, without generating any errors. A SIP configuration example is included.
* Merge pull request #489 from voyagertm/patch-5Renato Botelho2013-09-181-0/+1
|\ | | | | Update lcdproc.xml
| * Update lcdproc.xmlTony2013-09-181-0/+1
|/ | | - Small bug (forgot <option>)
* Merge pull request #474 from timdufrane/masterRenato Botelho2013-09-181-3/+3
|\ | | | | Fix Incorrect Directory Replacement
| * Contentscanners preg_replacetimdufrane2013-08-161-1/+1
| | | | | | This condition also applies to the contentscanner section, and there is no variable substitution going on. Does not affect installs that use /usr/local, and allows the correct behavior on installs in /usr/pbi/dansguardian/... or wherever else (as long as DANSGUARDIAN_DIR is the correct directory).
| * Fix Incorrect Directory Replacementtimdufrane2013-08-131-2/+2
| | | | | | | | On some installs, the directory ends up being /usr/pbi/dansguardian-xxx/... This results in include lines not being written correctly and broken config files. DANSGUARDIAN_DIR should be present on every system.
* | Merge pull request #488 from voyagertm/patch-4Renato Botelho2013-09-181-1/+1
|\ \ | | | | | | Update pkg_config.8.xml.amd64
| * | Update pkg_config.8.xml.amd64voyagertm2013-09-161-1/+1
| | | | | | | | | - Changed the version of LCDproc to be the same as my changes to the package
* | | Merge pull request #487 from voyagertm/patch-3Renato Botelho2013-09-181-1/+1
|\ \ \ | | | | | | | | Update pkg_config.8.xml
| * | | Update pkg_config.8.xmlvoyagertm2013-09-161-1/+1
| |/ / | | | | | | - Changed version to be the same with my changes in the LCDproc package
* | | Merge pull request #486 from voyagertm/patch-2Renato Botelho2013-09-181-3/+19
|\ \ \ | | | | | | | | Update lcdproc.inc
| * | | Update lcdproc.incvoyagertm2013-09-161-3/+19
| |/ / | | | | | | | | | - Added the extra USB COM port from lcdproc.xml - Changed the HD44780 part to fit the lcdproc.xml and other changes
* | | Merge pull request #485 from voyagertm/patch-1Renato Botelho2013-09-181-3/+87
|\ \ \ | | | | | | | | Update lcdproc.xml
| * | | Update lcdproc.xmlvoyagertm2013-09-161-3/+87
| |/ / | | | | | | | | | | | | - Changed the version - Added an extra USB COM port someone needed - Added option for the HD44780 driver
* / / squid3-dev - external acl helper for captive portal authentication integration.Marcello Coutinho2013-09-181-0/+85
|/ /
* | Merge pull request #484 from phil-davis/masterRenato Botelho2013-09-152-29/+29
|\ \ | | | | | | bandwidthd - whitespace formatting
| * | bandwidthd - whitespace formattingPhil Davis2013-09-141-24/+24
| | |
| * | bandwidthd - whitespace formattingPhil Davis2013-09-141-5/+5
|/ /
* | Merge pull request #483 from phil-davis/masterJim P2013-09-121-1/+1
|\ \ | | | | | | bandwidthd - specify explicitly the graph location index.html
| * | bandwidthd - specify explicitly the graph location index.htmlPhil Davis2013-09-121-1/+1
|/ / | | | | | | This helps some people whose browser does not find index.html automagically, and does not harm anything for others. http://forum.pfsense.org/index.php/topic,49165.msg362705.html#msg362705