Commit Graph

30 Commits

Author SHA1 Message Date
jebsolutions 8761304449 show git branch + commit. +link to preview git changes (#2186)
* show git branch + commit.  +link to preview git changes

new feature
- bottom of upgrade screen shows git branch + commit you are on
- provides a link to github showing changes since then on your current branch

More eyes reviewing the code is always a plus.  The github link helps make it easier.

* Update index.php

Add translations and pretty it up a little.
2016-11-26 00:21:31 -07:00
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
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
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
Matthew Vale 796674e815 Changed upgrade to use PROJECT_ROOT instead 2016-01-12 13:55:45 +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 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
markjcrane 35752445c3 Remove the old reference to install class and replaced with install_switch. 2015-11-25 21:55:17 -07: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
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
Mark Crane d5731c9172 Use the new multi-lingual code on fusionpbx/core sub directories. 2015-01-18 09:22:07 +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 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
Nate Jones ca55e33891 Upgrade: Completed Data Type check option and multilinguified everything. 2014-07-10 09:20:11 +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