Changeset 12167

Timestamp:

05/16/11 20:29:39 (1 year ago)

Author:

p_lindheimer

Message:

Merged revisions 11124-11125,11128-11133,11135,11137,11145-11147,11149,11166,11168,11216,11228-11229,11240-11241,11243-11244,11255,11263-11264,11272,11278,11280,11282,11285,11291-11293,11300,11302,11321,11334,11339-11343,11352,11363-11364,11366,11368,11382-11384,11388-11390,11399,11405-11406,11421,11449,11453-11460,11462-11464,11471,11482,11485-11487,11493-11494,11498,11502,11504,11528,11530,11535,11543,11555,11558,11574-11576,11579,11581,11583,11585-11587,11589,11591-11592,11599,11622,11629,11631,11633,11637-11639,11641,11652,11662-11663,11666,11668,11671-11672,11675-11676,11704,11711,11714,11719,11721,11723,11725-11726,11732,11755,11760,11762-11764,11767,11769-11770,11772-11774,11796,11799-11800,11805,11807,11810,11812,11818,11822,11826,11828,11830,11841-11842,11853-11855,11891-11892,11900,11928,11931,11937-11940,11944,11954,11960,11968,11971-11974,11986-11987,12016,12021-12022,12024,12036-12037,12044-12046,12056,12061,12066,12068,12073,12076,12154-12156 via svnmerge from

Merged 2.9 branch to trunk.

Files:

• freepbx/trunk (modified) (view diffs)
• freepbx/trunk/CHANGES (modified) (view diffs)
• freepbx/trunk/CONTRIB.txt (modified) (view diffs)
• freepbx/trunk/SQL/newinstall.sql (modified) (view diffs)
• freepbx/trunk/SQL/newinstall.sqlite3.sql (modified) (view diffs)
• freepbx/trunk/amp_conf/astetc/logger.conf (deleted)
• freepbx/trunk/amp_conf/bin/archive_recordings (modified) (view diffs)
• freepbx/trunk/amp_conf/bin/freepbx_engine (modified) (view diffs)
• freepbx/trunk/amp_conf/bin/freepbx_setting (copied) (copied from freepbx/branches/2.9/amp_conf/bin/freepbx_setting) (view diffs)
• freepbx/trunk/amp_conf/bin/generate_hints.php (modified) (view diffs)
• freepbx/trunk/amp_conf/bin/module_admin (modified) (view diffs)
• freepbx/trunk/amp_conf/bin/retrieve_conf (modified) (view diffs)
• freepbx/trunk/amp_conf/bin/retrieve_op_conf_from_mysql.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/assets/js/script.legacy.js (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/bootstrap.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/cdr/call-log.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/cdr/lib/defines.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/cdr/lib/fpdf.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/common/db_connect.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/common/libfreepbx.javascripts.js (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/common/mainstyle.css (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/config.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/helpers (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/helpers) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/helpers/Table.php (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/helpers/Table.php) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/helpers/freepbx_helpers.php (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/helpers/freepbx_helpers.php) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/helpers/html_helper.php (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/helpers/html_helper.php) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/amp.pot (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/bg_BG/LC_MESSAGES/amp.mo (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/bg_BG/LC_MESSAGES/amp.po (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/de_DE/LC_MESSAGES/amp.mo (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/de_DE/LC_MESSAGES/amp.po (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/es_ES/LC_MESSAGES/amp.mo (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/es_ES/LC_MESSAGES/amp.po (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/fr_FR/LC_MESSAGES/amp.mo (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/fr_FR/LC_MESSAGES/amp.po (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/he_IL/LC_MESSAGES/amp.mo (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/he_IL/LC_MESSAGES/amp.po (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/hu_HU/LC_MESSAGES/amp.mo (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/hu_HU/LC_MESSAGES/amp.po (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/it_IT/LC_MESSAGES/amp.mo (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/it_IT/LC_MESSAGES/amp.po (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/pt_BR/LC_MESSAGES/amp.mo (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/pt_BR/LC_MESSAGES/amp.po (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/pt_PT/LC_MESSAGES/amp.mo (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/pt_PT/LC_MESSAGES/amp.po (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/ro_RO (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/i18n/ro_RO) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/ro_RO/LC_MESSAGES (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/i18n/ro_RO/LC_MESSAGES) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/ro_RO/LC_MESSAGES/amp.mo (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/i18n/ro_RO/LC_MESSAGES/amp.mo) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/ro_RO/LC_MESSAGES/amp.po (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/i18n/ro_RO/LC_MESSAGES/amp.po) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/ru_RU/LC_MESSAGES/amp.mo (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/ru_RU/LC_MESSAGES/amp.po (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/zh_CN/LC_MESSAGES/amp.mo (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/i18n/zh_CN/LC_MESSAGES/amp.po (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/bootstrap-utility.functions.php (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/bootstrap-utility.functions.php) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/components.class.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/cronmanager.class.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/extensions.class.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/framework_view.functions.php (deleted)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/gui_auth.php (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/gui_auth.php) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/module.functions.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/notifications.class.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/php-asmanager.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/usage_registry.functions.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/utility.functions.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/view.functions.php (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/view.functions.php) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/voicemail.function.php (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/voicemail.function.php) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/page.modules.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/panel.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/reports.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/bad_refferer.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/freepbx.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/freepbx_admin.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/freepbx_footer.php (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/admin/views/freepbx_footer.php) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/loggedout.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/noaccess.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/panel.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/reports.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/unauthorized.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/bootstrap.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/callme.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/common.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/database.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/lang.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/includes/login.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/index.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/locale/nl_NL (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/recordings/locale/nl_NL) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/locale/nl_NL/LC_MESSAGES (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/recordings/locale/nl_NL/LC_MESSAGES) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/locale/nl_NL/LC_MESSAGES/ari.mo (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/recordings/locale/nl_NL/LC_MESSAGES/ari.mo) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/locale/nl_NL/LC_MESSAGES/ari.po (copied) (copied from freepbx/branches/2.9/amp_conf/htdocs/recordings/locale/nl_NL/LC_MESSAGES/ari.po) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/misc/audio.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs/recordings/modules/settings.module (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs_panel/dhtml/index.php (modified) (view diffs)
• freepbx/trunk/amp_conf/htdocs_panel/dhtml/variables.php (modified) (view diffs)
• freepbx/trunk/amp_conf/moh/QuajiroPromo.sln (deleted)
• freepbx/trunk/amp_conf/moh/TristeAlegriaPromo.sln (deleted)
• freepbx/trunk/amp_conf/moh/macroform-cold_day.wav (copied) (copied from freepbx/branches/2.9/amp_conf/moh/macroform-cold_day.wav) (view diffs)
• freepbx/trunk/amp_conf/moh/macroform-robot_dity.wav (copied) (copied from freepbx/branches/2.9/amp_conf/moh/macroform-robot_dity.wav) (view diffs)
• freepbx/trunk/amp_conf/moh/macroform-the_simplicity.wav (copied) (copied from freepbx/branches/2.9/amp_conf/moh/macroform-the_simplicity.wav) (view diffs)
• freepbx/trunk/amp_conf/moh/manolo_camp-morning_coffee.wav (copied) (copied from freepbx/branches/2.9/amp_conf/moh/manolo_camp-morning_coffee.wav) (view diffs)
• freepbx/trunk/amp_conf/moh/reno_project-system.wav (copied) (copied from freepbx/branches/2.9/amp_conf/moh/reno_project-system.wav) (view diffs)
• freepbx/trunk/amp_conf/sbin/amportal (modified) (view diffs)
• freepbx/trunk/amportal.conf (modified) (view diffs)
• freepbx/trunk/buildtools/README.directory (modified) (view diffs)
• freepbx/trunk/buildtools/jsmin.rb (deleted)
• freepbx/trunk/buildtools/pack_javascripts.php (modified) (view diffs)
• freepbx/trunk/install_amp (modified) (view diffs)
• freepbx/trunk/libfreepbx.install.php (modified) (view diffs)
• freepbx/trunk/update_i18n.sh (modified) (view diffs)
• freepbx/trunk/upgrades/2.6.0beta1/tables.php (modified) (view diffs)
• freepbx/trunk/upgrades/2.8.0/custom-context.php (modified) (view diffs)
• freepbx/trunk/upgrades/2.8.1 (copied) (copied from freepbx/branches/2.9/upgrades/2.8.1) (view diffs)
• freepbx/trunk/upgrades/2.8.1.md5 (copied) (copied from freepbx/branches/2.9/upgrades/2.8.1.md5) (view diffs)
• freepbx/trunk/upgrades/2.9.0 (copied) (copied from freepbx/branches/2.9/upgrades/2.9.0) (view diffs)
• freepbx/trunk/upgrades/2.9.0.md5 (copied) (copied from freepbx/branches/2.9/upgrades/2.9.0.md5) (view diffs)
• freepbx/trunk/upgrades/2.9.0/removefiles.php (copied) (copied from freepbx/branches/2.9/upgrades/2.9.0/removefiles.php) (view diffs)
• freepbx/trunk/upgrades/2.9.0alpha1.md5 (copied) (copied from freepbx/branches/2.9/upgrades/2.9.0alpha1.md5) (view diffs)
• freepbx/trunk/upgrades/2.9.0alpha1/migrate_ampconf.php (modified) (view diffs)
• freepbx/trunk/upgrades/2.9.0alpha1/tables.php (modified) (view diffs)
• freepbx/trunk/upgrades/2.9.0beta1 (copied) (copied from freepbx/branches/2.9/upgrades/2.9.0beta1) (view diffs)
• freepbx/trunk/upgrades/2.9.0beta1.md5 (copied) (copied from freepbx/branches/2.9/upgrades/2.9.0beta1.md5) (view diffs)
• freepbx/trunk/upgrades/2.9.0beta1/tables.php (copied) (copied from freepbx/branches/2.9/upgrades/2.9.0beta1/tables.php) (view diffs)
• freepbx/trunk/upgrades/2.9.0beta2 (copied) (copied from freepbx/branches/2.9/upgrades/2.9.0beta2) (view diffs)
• freepbx/trunk/upgrades/2.9.0beta2.md5 (copied) (copied from freepbx/branches/2.9/upgrades/2.9.0beta2.md5) (view diffs)
• freepbx/trunk/upgrades/2.9.0beta2/logger_migrate.php (copied) (copied from freepbx/branches/2.9/upgrades/2.9.0beta2/logger_migrate.php) (view diffs)
• freepbx/trunk/upgrades/2.9.0rc1 (copied) (copied from freepbx/branches/2.9/upgrades/2.9.0rc1) (view diffs)