ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,324 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

54 Commits

Author SHA1 Message Date
Isaac Connor f9139f2d98 Use the word skipped instead of aborted 2018-11-30 10:48:20 -05:00
Andrew Bauer 8f0fb0843a Add Privacy Statement (#2194) 
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* create and load default.php

* fix typos

* fix erroneous copy/paste
 2018-08-30 13:25:02 -04:00
Isaac Connor 15a6eb7e78
Revert "Add Privacy Statement (#2176)" (#2179) 
This reverts commit 56f4d768c2.
 2018-08-13 15:33:43 -04:00
Andrew Bauer 56f4d768c2 Add Privacy Statement (#2176) 
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* push privacy text to all language files
 2018-08-13 15:23:44 -04:00
Isaac Connor d63594b5fa don't do updates in a transaction so we don't hold locks 2018-01-22 14:06:52 -05:00
Isaac Connor 2682686063 Must disconnect and reconnect before calling update script 2018-01-19 16:32:26 -05:00
Isaac Connor 796ba0d899 revert to using the mysql client to do updates. We need it for delemiter changes when adding triggers 2018-01-04 17:16:43 -05:00
Isaac Connor 085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Andrew Bauer df304b417a Update zmupdate.pl.in 2017-06-13 11:08:58 -05:00
Andrew Bauer bacf65ae9a Migrate values from Options -> Paths to zm.conf (#1908) 
* initial commit to migrate contents of Options->Paths to zm.conf

* remove paths items from configdata.pm

* remove paths tab from options

* update deb packaging scripts with new cmake vars

* remove extraneous file

* save custom paths variables to config file before dB is freshened

* don't check configs if the dB version is >= 1.31.0
 2017-06-12 21:39:37 -04:00
Isaac Connor f4224bb88e Merge branch 'master' into storageareas 2017-05-17 17:47:39 -04:00
Isaac Connor a933d4ae12 fix spacing and braces 2017-05-17 11:40:54 -04:00
Joshua Ruehlig 3e35fc24a3 Add Socket Support to zmupdate (#1867) 
* Update zmupdate.pl.in

* Fix spacing

* Update zmupdate.pl.in
 2017-05-17 11:31:13 -04:00
Isaac Connor 052807aaf5 remove extra my 2017-01-15 10:57:39 -05:00
Isaac Connor d24d151f53 Slurp db update file in and do() it instead of calling mysql 2017-01-15 10:54:23 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor fbc0086fcc get the other dbPass use and quote it. Slight visual code style cleanup. 2016-08-08 16:52:09 -04:00
Isaac Connor 25d58f5192 quote the password 2016-08-02 13:22:44 -04:00
Isaac Connor 1069b301a0 functions have been moved from ConfigAdmin to Config 2016-06-12 15:38:59 -04:00
Isaac Connor 182fa9a5cd revert the bulk of the merge_db_connects changes. 2016-05-20 08:53:53 -04:00
Isaac Connor b53a0a564d Don't need the extra use ZoneMinder::Config 2016-05-16 10:07:24 -04:00
Isaac Connor dd24c35afa revert bogus optimisation 2016-05-16 10:05:12 -04:00
Isaac Connor 5df85770cd zmupdate.pl.in 2016-05-13 13:52:34 -04:00
Brandon Odegard 9c72579c2e Corrected typo in function info 2016-01-22 12:12:39 -06:00
SteveGilvarry 5390605797 Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version 2015-12-03 10:23:19 +11:00
Kyle Johnson 1cce60f6ec Update version check URL 2015-10-23 11:45:32 -06:00
Pliable Pixels e0e048fe7e fixed version compare logic 2015-10-04 09:10:05 -04:00
Isaac Connor 31ad75dea9 only add -h hostname to mysql command if it is defined. This helps support local unix-socket mysql access 2015-09-10 13:04:52 -04:00
Dmitry Smirnov b0909a4c57 autouse Data::Dumper 2015-04-16 15:48:51 +10:00
Dmitry Smirnov 078c5aa14b Briefly document "--migrate-events" option in zmupdate.pl (#783). 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-04-06 18:38:14 +10:00
Dmitry Smirnov 5f6c559476 POD: zmupdate.pl converted to "pod2usage" 
Best practice for POD documentation is to (re-)use it for displaying usage
 info. Now `perldoc zmupdate.pl` shows expected information and we can even
 generate man page automatically with `pod2man zmupdate.pl`.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-03-31 02:47:16 +11:00
Isaac Connor cc989dbe19 fix putting the mode back. I merged it to the wrong place 2014-11-19 13:54:10 -05:00
Isaac Connor 793998484c Merge branch 'master' into zmupdatefixes 
Conflicts:
	scripts/zmupdate.pl.in
 2014-11-19 12:47:31 -05:00
Isaac Connor d5a7a1849a make zmupdate re-run the most recent update. 2014-07-29 09:47:22 -04:00
barjac fd9e808fe1 Update zmupdate.pl.in 
Fix typo 'from' version replaced with 'to' version.
 2014-03-24 13:35:53 +00:00
Andrew Bauer e5ac6e95fa Update zmupdate.pl.in 
mysql generates a warning, instead of an error, when trying to convert to InnoDB and that engine is not available.  By temporarily elevating warnings to errors, we can catch these rather than silently failing.
 2014-02-04 15:30:04 -06:00
Isaac Connor 48a6dcf5ce Change COnfig from using the subroutine symbol table to just using a global hash 2013-12-16 16:32:02 -05:00
Isaac Connor 150b3a0e7a document interactive command line option 
only do innoDB upgrade if interactive
 2013-12-06 13:47:39 -05:00
Bartek Zdanowski f6dca0f575 Fixing bug that stops installation/upgrade if DB is already at current version 2013-11-20 10:39:51 +01:00
Isaac Connor 7da2cdd159 cleanups, only connect and disconnect once. Remove unncessary require's of DBI 
cleanup MyISAM to InnoDB code
 2013-11-13 11:45:53 -05:00
Isaac Connor 29e2cdf561 split the innoDB upgrade out of the version section, so that it always checked for MyISAM tables and if found, offers to update them. 2013-11-13 09:42:10 -05:00
Kyle Johnson 03d12ef3e4 Point zmupdate to the github pages site (non-https) for version numbers 2013-10-07 10:11:09 -04:00
Knniggett 32ee0a8976 create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db 2013-10-05 18:40:54 -05:00
Isaac Connor e21a08c4b6 new code to look for update scripts instead of having distinct lines for each 2013-09-12 14:40:02 -04:00
Andy Bauer 0bf9aacab2 Update zmupdate.pl.in for 1.26.3 release 2013-09-10 12:46:33 -05:00
Kyle Johnson 6c134f9b4b Merge pull request #116 from knnniggett/zmupdate_newrelease 
Add 1.26.1 and 1.26.2 releases to zmupdate
 2013-09-07 19:07:37 -07:00
Knniggett 8f3d95fd38 modify zmupdate.pl.in 2013-09-07 15:11:57 -05:00
Chris Wiggins d6440ca70e Change repo to ZoneMinder for pull request 2013-09-05 23:50:51 +12:00
Chris Wiggins e792c8eb44 Move version check from zoneminder.com to repository 2013-09-05 23:40:03 +12:00
Andy 594a44cbbb Update zmupdate.pl.in to give option to convert to InnoDB tables 
When upgrading the zoneminder database to 1.26, this proposed change will ask the user to convert existing MyISAM tables over InnoDB.  It first scans for existing MyISAM tables and will skip over any tables that are already converted to InnoDB.

I've tested this on (a copy of) a production database server and have verified it doesn't alter existing tables from a different schema.

And I'm done messing with the zmupdate script. I promise.
I understand if this change is considered outside the scope of a current bug fix release.
 2013-08-20 19:49:02 -05:00