Commit Graph

151 Commits

Author SHA1 Message Date
jebsolutions dd8385f63b [master] include stderr in git pull results and check for error (#2105)
* [master] include stderr in git pull results and check for error

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.

* tab fixes
2016-11-20 13:54:57 -07:00
reliberate 4a0f4615e9 Users: Revamp and consolidate code, integrate ORM. 2016-10-05 10:29:30 -06:00
FusionPBX 74b8de3922 Update index.php
Advanced -> Upgrade -Remove label tag as it broke the checkbox and description vertical alignment.
2016-09-10 17:26:14 -06:00
markjcrane c3b12c217d Cleanup the indentation ... tabs and whitespace after the last pull request. 2016-04-28 16:56:44 -06:00
Harry G. Coin f02028629a fixes so cli installs/upgrades work.
Also another step along the way allowing freeswitch to run -u -g freeswitch and fusionpbx to run -u -g www-data
2016-04-25 21:26:26 -05:00
Harry G. Coin bda6861f88 \r\n --> \n
Cause all the .php files containing lines ending with \r\n to instead end with \n.

DYI with:

find fusionpbx -type f -name '*.php' -exec dos2unix '{}' \;
2016-04-25 20:30:23 -05:00
markjcrane 5799ce6497 Work on the install. 2016-04-14 21:14:40 -06:00
reliberate aeabb4a072 Misc: Fix datetimepicker on Time Conditions, CDR, Contact Times, etc.
Misc: Fix textarea height.
Theme: CSS adjustments to correct misc bugs.
2016-04-13 13:23:07 -06:00
markjcrane af18c963c0 Rename .project.ROOT to project_root.php this conforms better with current file naming standards. 2016-02-22 14:01:18 -07:00
mafoo 9066858701 only offer the source upgrade if it is writeable
this check will prevent the source upgrade rendering if the .git folder
is not writeable
2016-02-04 11:14:26 +00:00
Mafoo 56b34c34ca changed throw Exception to die
nothing ever eval runs the root.php so changed to die to cause a immediate report of error and stop code processing.
2016-01-20 11:30:31 +00:00
Mafoo 87dbd6b428 Added check for if .project.ROOT is missing
If a installation is missing the .project.ROOT previously it would just use the last search path as the project root (wrong) this will cause a Exception should it be unable to find it
2016-01-18 09:38:16 +00:00
Matthew Vale 6999198492 added logic in cli mode to chdir to the correct directory first
the webserver would normally do this for us, but we need to do it
2016-01-14 16:25:05 +00:00
Matthew Vale a41e89af76 Added full logic to support cli as well 2016-01-13 17:38:54 +00:00
Matthew Vale 0176d30312 change to use '/' instead of DIRECTOR_SEPERATOR 2016-01-12 14:47:50 +00:00
Matthew Vale 796674e815 Changed upgrade to use PROJECT_ROOT instead 2016-01-12 13:55:45 +00:00
Matthew Vale e6ad46cfbf Rollout of root.php 2016-01-12 13:55:39 +00:00
markjcrane 98b77a12c6 Remove a few more line from upgrade/index.php. 2015-12-20 23:04:12 -07:00
markjcrane 0c21af8f2b Remove upgrade switch from advanced -> upgrade page. The work it did is handled by app/scripts/resources/classes/scripts.php and app_defaults.php calls it. So when running Advanced -> Upgrade -> App Defaults the scripts app_defaults.php will copy the scripts and rewrite the config.lua. 2015-12-20 23:01:28 -07:00
Matthew Vale 742db50120 First pass on core/* 2015-12-10 10:09:07 +00:00
Matthew Vale 36652ff231 use DOCUMENT_ROOT rather than assume path 2015-12-04 12:24:22 +00:00
Matthew Vale d0d3240fc4 Added Switch upgrade as a separate option 2015-12-01 14:32:58 +00:00
Matthew Vale 14b873f5db corrected spelling mistake 2015-11-26 18:25:46 +00:00
Matthew Vale f45881ec4b moved upgrade function from app_defaults
moved upgrade function out to upgrade.php otherwise during initial
install all app_defaults get run twice
2015-11-26 18:24:09 +00:00
Matthew Vale ca6bd18b64 Corrected incorrect merge 2015-11-26 17:53:02 +00:00
markjcrane 5dfbc2e183 Improve code to update the scripts directory. 2015-07-20 15:32:52 -06:00
reliberate 60e9f57035 Upgrade: Better handle Git response. 2015-07-02 21:25:45 -06:00
reliberate e24526fb92 Upgrade: Converted Advanced > Upgrade to use Git instead of SVN (untested).
Misc: Added provisions elsewhere to account for .git/* files, as currently done with .svn/* files.
2015-07-02 17:25:41 -06:00
Mark Crane f57cf46674 Add latest translations 2015-06-30 13:30:02 +00:00
Mark Crane 4c71476922 Add latest translations 2015-06-29 22:30:02 +00:00
Mark Crane 96c10412f7 Add latest translations 2015-06-15 19:30:00 +00:00
Mark Crane 4699d4c8e8 Synchronize the translations. 2015-06-06 02:37:26 +00:00
Mark Crane dd9ade256f Update release to fix big for systems where GLOB_BRACE is not available. 2015-05-13 04:37:36 +00:00
Nate Jones e265cca378 Upgrade: Using Advanced > Upgrade > Source Code now automatically updates switch /scripts/ folder contents (on by default), keeping switch scripts up to date with each system upgrade. Option to opt out of auto script updates is available via a Default Setting (switch > scripts_update > boolean > false). 2015-05-12 22:42:20 +00:00
Nate Jones 63cd5bb78e Language file merge from translation server. 2015-05-01 11:13:39 +00:00
Mark Crane 3b8b7ad0ca Update the translations from the translation server. Includes the following new languages Brazilian Portuguese, Polish, and Swedish Sweden. Thanks to those that put in the effort to add these languages additional translator volunteers are welcome. 2015-04-08 13:38:58 +00:00
luis daniel lucio quiroz 606d8eb595 missing text class include 2015-02-28 01:31:24 +00:00
Nate Jones c900edb768 Emails: Initial build of failed email log. Still under construction. 2015-02-26 04:18:16 +00:00
luis daniel lucio quiroz 632dbec005 upgrade.php missing class php 2015-01-26 18:32:08 +00:00
Mark Crane d5731c9172 Use the new multi-lingual code on fusionpbx/core sub directories. 2015-01-18 09:22:07 +00:00
Mark Crane 875e36276e Remove a trailing line feed. 2014-12-27 17:52:06 +00:00
Mark Crane 9369fd8d0d Move the menu array to app_menu.php 2014-12-26 03:27:54 +00:00
Mark Crane bbf2a3badc Add app_menu.php files for the menu. 2014-12-25 19:32:57 +00:00
Nate Jones 8e4120ba8c Upgrade: Handle SVN Update response better. 2014-12-08 17:23:24 +00:00
Richard Neese 49840b33da fixing /usr/share/fusionpbx to be /usr/share/examples/fusionpbx 2014-10-23 18:03:33 +00:00
Richard Neese a866c04b22 working on upgrade page svn issue wiht pkgs 2014-10-23 17:22:49 +00:00
Richard Neese 9296f66977 fixing upgrade for pkgs not to display svn 2014-10-23 16:59:48 +00:00
Mark Crane 5e0d82c06d Unset the prepared statements used in the app_defaults.php files. 2014-07-23 22:00:03 +00:00
Mark Crane 0e219bf040 Hide svn on the upgrade page when the FusionPBX package is installed 2014-07-18 21:21:29 +00:00
Mark Crane 181e2881c0 Make the domain and schema work with the PHP classes 2014-07-16 04:30:49 +00:00
Mark Crane 2147b08033 Make upgrade.php use the schema and domain upgrade classes 2014-07-15 17:11:13 +00:00
Mark Crane 7b228d849d Update schema dn domains 2014-07-15 10:30:31 +00:00
Nate Jones d5050a207f Notifications: Update link path in login message. 2014-07-12 01:41:02 +00:00
Nate Jones ca55e33891 Upgrade: Completed Data Type check option and multilinguified everything. 2014-07-10 09:20:11 +00:00
Nate Jones 1ff7bcc67e Upgrade: Forgot a couple files for the last revision submission. 2014-07-10 07:16:58 +00:00
Nate Jones a72e124ce0 Upgrade: Added SVN Update, handle Upgrade Data Types differently (still under construction...) 2014-07-10 07:15:51 +00:00
Nate Jones 93515a0153 Upgrade: Response message mod - show specific if only one action performed, general message if more than one. 2014-07-10 06:14:59 +00:00
Nate Jones 8e13a078e4 Upgrade: Minor modification. 2014-07-10 06:07:13 +00:00
Nate Jones 8bd5b7112b Upgrade: Divides Upgrade Schema into separate processes. Complete translation forthcoming. (Still under construction...) 2014-07-10 06:05:22 +00:00
Nate Jones dc2196dd6f Document (Window) Title: Update variable name to avoid conflict when paging is used. 2014-07-10 00:32:50 +00:00
Nate Jones b2051ca910 Voicemail-to-Email: Backup email to database if sending fails, better detection of ContentType. 2014-07-08 06:38:23 +00:00
Nate Jones e2872a2e06 Login Message: Prevent re-enable message post Upgrade Schema. 2014-07-06 04:50:56 +00:00
Nate Jones 25a6dc3b17 Implemented Login Message feature for superadmin only, advertising new Notifications section 2014-07-06 03:50:18 +00:00
Mark Crane bf68a4bf0c Fix the software_uuid issue for upgrade schema 2014-07-06 01:22:33 +00:00
Mark Crane ddae49081b Remove an extra line 2014-07-02 22:29:30 +00:00
Mark Crane c8502ddb9a Add the software name, version and url 2014-07-02 22:21:16 +00:00
Mark Crane 4e40284d88 Move the software table into core/upgrade/app_config.php 2014-07-02 21:41:41 +00:00
Mark Crane 955e290dc6 move the copy scripts to app_defaults.php. 2014-05-25 06:45:30 +00:00
Mark Crane c149b94d7d Limit the file copy used on the upgrade 2014-05-08 10:10:00 +00:00
Nate Jones f9348d9caf Replaced session variable with local variable instead, on previous Upgrade Schema fix. 2014-04-27 01:04:03 +00:00
Nate Jones fe73f030e0 Fixed issue with menu layout/style and domain select box after running Upgrade Schema. 2014-04-27 01:00:07 +00:00
Mark Crane 3153315da2 Add code to change switch gateways dir to switch sip_profiles dir. Update the domain settings. 2014-03-22 01:00:46 +00:00
Nuno Miguel Reis f063ead227 fixed some translations 2014-02-25 22:49:35 +00:00
Mark Crane d36773251e Add a new Spanish translation donated by José Manuel Calquin Heinsohn. 'es-cl' for Spanish from Chile he says he tried to translate in a way that would be generic enough to work for most Spanish dialects. This commit covers just fusionpbx/core still need to integrate the translations for all features in fusionpbx/app directory. 2014-02-13 18:09:45 +00:00
Mark Crane 485b40fc4f Add spacing between the translations. 2014-01-16 20:14:33 +00:00
Nuno Miguel Reis c405bfa745 language translations for pt-pt and some other minor fixes and updates 2013-10-17 22:06:53 +00:00
Nuno Miguel Reis 0fa9d61ee1 language translations for pt-pt and some other minor fixes and updates 2013-10-17 22:06:01 +00:00
Mark Crane 8cee3bbe44 Fix a few things in app_config.php leaving fr-ca and changing some of the single quotes to double quotes. 2013-09-30 16:16:32 +00:00
Philippe Rioual 92dde8ac9b repaired previous errors inserted in r4614 : reinserted 'de-de' instead 'de' and correct files. keeps fr-ca to report in app_config.php files 2013-09-30 15:22:35 +00:00
Philippe Rioual 84b11a971c added missing french translations and changed fr to fr-fr in all app_languages.php and app_config.php files. 2013-09-30 13:19:40 +00:00
Mark Crane 6cb84a39c7 Convert all remaining app_config.php files to UTF-8 without BOM. 2013-09-21 16:00:28 +00:00
Mark Crane c130a8cae5 Change fr to fr-fr and de to de-de. 2013-09-17 20:02:19 +00:00
Mark Crane f61de19169 Move the French translations into the development branch.
Translation work done thanks to by bhouba for his work on the translations.
2013-09-13 21:04:53 +00:00
Mark Crane 3798b9a782 Update a few more references to files that have been move to the resources directory. 2013-07-06 07:01:14 +00:00
Mark Crane e9aa47069c Update the references for header.php and footer.php files to point the resources directory. 2013-07-06 06:29:50 +00:00
Mark Crane c44d39dcf9 Change the path for includes/require.php to the resources directory. 2013-07-06 06:03:27 +00:00
Mark Crane 6a70d8db41 Change includes/checkauth.php to resources/check_auth.php. 2013-07-06 05:50:55 +00:00
Mark Crane a308535e4b Change the path in the php files from includes/install to resources/install dir. 2013-06-09 02:52:13 +00:00
Nate Jones 720b53eb1e Multilinguified Upgrade Schema 2013-06-06 23:09:07 +00:00
Mark Crane e06ee7896e Remove a redundant v_meeting_users from the app_config.php file. Remove a few trailing spaces on upgrade_domains.php. 2013-01-04 22:02:31 +00:00
Mark Crane 1b82029fc9 Add an elseif. 2013-01-04 21:21:45 +00:00
Mark Crane 196c987f74 Thanks Gerritv for finding this one. Should fix a bug during install and upgrade for single tenant systems. 2012-10-18 19:25:40 +00:00
Mark Crane be979dbc3a House cleaning on the recent app_config.php commits. Cleanup trailing white spaces, multiple spaces replaced with tabs and a few extra line feeds. 2012-10-11 01:28:18 +00:00
Nuno Miguel Reis 2e74a0c238 menu translation work 2012-10-11 00:07:03 +00:00
Mark Crane 4dc438caf9 Still cleaning. 2012-09-29 07:11:48 +00:00
Mark Crane 17af99d5e5 Efficiency enhancement for upgrade and upgrade_schema by running global tasks one time rather than for each domain. 2012-08-14 21:59:45 +00:00
Mark Crane 8e8816ffdb Improve the upgrade efficiency. 2012-08-11 22:50:12 +00:00
Mark Crane c344400c82 Add database driver to along with type it helps distinguish which type of database is being used when using odbc. Added app_defaults to core/databases so that the script config.lua can be created when the database is saved and upgraded. Previously it only saved a new config.lua when running upgrade or upgrade schema which was not intuitive. 2012-07-17 15:56:32 +00:00
Mark Crane f2db211c44 If the extension or dialplan xml directories are disabled or don't exist don't add sub directories. 2012-07-08 11:26:37 +00:00
Mark Crane e44426ee1a Remove tab at the end of several lines. 2012-07-08 11:14:48 +00:00