Commit Graph

15738 Commits

Author SHA1 Message Date
Peter Keresztes Schmidt 8d99725ebf CI: Remove EOL distro version from build matrix
This commit removes
  * Debian Jessie (LTS support ended June 30, 2020)
  * Ubuntu Trusty (Standard support ended Apr 2019)
  * Ubuntu Disco (Support ended Jan 23, 2020)
2020-08-24 23:41:04 +02:00
Andrew Bauer 41c1774e4a remove ftp upload folder from specfile 2020-08-24 12:33:22 -05:00
Andrew Bauer 8c32511c83 whitespace 2020-08-24 12:05:31 -05:00
Isaac Connor bce38ae2c6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-24 12:05:25 -04:00
Isaac Connor 56e2ac5baa add scale to query params because zms doesn't wupport width&height 2020-08-24 12:05:14 -04:00
Andrew Bauer e5e2c3b347 fix stats off by 1 frame, don't alert on score 0 2020-08-24 10:57:54 -05:00
Andrew Bauer c6e3107a50 make donate view a modal 2020-08-24 09:31:21 -05:00
Isaac Connor b5cdc5c32d Set width and height on image tag so browser knows how to lay them out. Fixes flickering. 2020-08-24 10:26:07 -04:00
Isaac Connor 0e9c8a35e6 fix thumbnail height style. Make thumbnail clickable. 2020-08-24 09:32:49 -04:00
Andrew Bauer 8ea806e264 eslint 2020-08-23 18:40:58 -05:00
Andrew Bauer 699b20b961 whitespace 2020-08-23 17:54:57 -05:00
Andrew Bauer 65181c84ee update frame top toolbar 2020-08-23 17:53:47 -05:00
Andrew Bauer 773557ee8a set view to stats rather than popup 2020-08-23 13:25:09 -05:00
Andrew Bauer 86f0d41d8e autoinit changeScale in frame view 2020-08-23 13:17:03 -05:00
Andrew Bauer 63fc59568f pad frames cells to account for detail view 2020-08-23 13:12:54 -05:00
Andrew Bauer 4b144dea74 whitespace 2020-08-23 13:02:35 -05:00
Andrew Bauer f06bfe7cbb use bootstrap-table on stats view 2020-08-23 12:23:58 -05:00
Andrew Bauer 69ba9e6d0e eslint 2020-08-23 12:14:09 -05:00
Isaac Connor e111edbb72 bump version to 1.35.6 to pick a db fix from 1.34.20 2020-08-23 11:53:43 -04:00
Isaac Connor 2a7ea52330 Merge branch 'release-1.34' 2020-08-23 11:51:54 -04:00
Isaac Connor 977dee29f1 bump for release 1.34.20 2020-08-23 11:48:00 -04:00
Isaac Connor cf63cc65c8 eoan is deprecated. 2020-08-23 11:42:08 -04:00
Isaac Connor 08c180b3ca Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-23 11:36:42 -04:00
Andrew Bauer 4cbac47d6d add navbar to stats view 2020-08-22 21:09:58 -05:00
Isaac Connor 0873b8a0ec Remove long-deprecated config entries 2020-08-22 18:49:20 -04:00
Andrew Bauer de1d1c2ac6 change close link to back link 2020-08-22 14:43:53 -05:00
Andrew Bauer ad67f74ba4 add formatting to stats table 2020-08-22 14:12:11 -05:00
Andrew Bauer afc3d2c548 fix horizontal scroll issues events 2020-08-22 13:00:53 -05:00
Andrew Bauer e69e767878 fix horizontal scroll nonsense 2020-08-22 12:56:31 -05:00
Andrew Bauer 61f89e3306 rough in frames detail view 2020-08-22 12:45:19 -05:00
Isaac Connor 822cb7bf1a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-22 11:37:19 -04:00
Isaac Connor 615b9f6ee6 code style cleanup. A new feature is that if ->processes == 'web' we won't include it in the c++ header defines. We can use this to shrink ram use and startup time of c++ processes a bit 2020-08-22 11:37:12 -04:00
Isaac Connor 08aee63f66 Don't need a variable can just pass the define 2020-08-22 11:36:07 -04:00
Isaac Connor 9f9b771d3f remove dead code 2020-08-22 10:58:16 -04:00
Andrew Bauer 5d09ae91ab move div tag into $imgHTML 2020-08-22 07:14:47 -05:00
Andrew Bauer 8ea7b783b5 generate thumbnails when monitor is connected 2020-08-21 21:18:55 -05:00
Andrew Bauer c8e40eb5b3 don't generate tumbnails when not running 2020-08-21 21:14:16 -05:00
Andrew Bauer 39d538d5cf add missig } 2020-08-21 20:57:05 -05:00
Andrew Bauer 73a01855f8 rough in thumbnail animation 2020-08-21 20:44:20 -05:00
Andrew Bauer 79fa257a4a rough in tumbnail animation to web console 2020-08-21 20:43:36 -05:00
Isaac Connor ac0976324f Fix case of filterQuery. Fixes #3017 2020-08-21 11:22:47 -04:00
Isaac Connor fe425302ad Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-08-21 10:46:13 -04:00
Isaac Connor 63ef15d247 spacing and quotes 2020-08-21 10:46:10 -04:00
Isaac Connor b589c3abd9 glob sorts since perl 5.6.0 2020-08-21 10:45:32 -04:00
Isaac Connor 80a6608733 Make values in conf.d files override values in db. Also handle the fact that they would already be defined in this case. 2020-08-21 10:36:49 -04:00
Andrew Bauer 9357017a39 add export fx to tables 2020-08-21 07:11:57 -05:00
Isaac Connor 46aaddeac5 Sort loading of conf.d config files. Also ignore db Config table entries that have already been defined in conf.d files so that they take precedence. 2020-08-20 20:44:28 -04:00
Andrew Bauer bec77c9ce3 change pointer when over frames table 2020-08-20 10:39:55 -05:00
Andrew Bauer de4d144cd4 fix scale dropdown in frame view 2020-08-20 10:16:28 -05:00
Andrew Bauer 72d95275c3 add navbar for frame view 2020-08-20 09:19:04 -05:00