d1aa440449
Merge pull request #3023 from Carbenium/ci-skip-deploy-fork
...
CI: Do not try to run deploy when building from a fork
2020-08-25 11:18:02 -04:00
aeebe0b4ed
Merge pull request #3024 from Carbenium/utils-travis-cleanup
...
Utils: Remove scripts related to Travis which are now handled by packpack
2020-08-25 11:17:40 -04:00
ad90dba0ae
Utils: Remove scripts related to Travis which are now handled by packpack
2020-08-25 16:47:32 +02:00
443c74a418
CI: Do not try to run deploy when building from a fork
2020-08-25 16:22:14 +02:00
fec98ce1a2
Merge pull request #3020 from Carbenium/ci-remove-eol-distros
...
CI: Remove EOL distro version from build matrix
2020-08-24 18:52:21 -04:00
6e32e86f10
Merge pull request #3019 from Carbenium/ci-packpack-exit-code
...
CI: Make sure the Travis build fails if packpack exits with an error code
2020-08-24 18:06:59 -04:00
2e4baba740
I have deprecated support for trusty, precise, really old debian.
2020-08-24 18:06:14 -04:00
981439cbd9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 17:42:37 -04:00
fe5e005d8e
Calculate scale to pass to getStreamSrc for thumbnail still and stream
2020-08-24 17:42:23 -04:00
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
409f740623
CI: Make sure the Travis build fails if packpack exits with an error code
2020-08-24 23:11:36 +02:00
0879ecf9a5
update timeline header
2020-08-24 14:33:01 -05:00
2d05fbda8d
simplify debug line
2020-08-24 14:36:36 -04:00
3c1651d98f
in getStreamSrc if scale isn't set figure it out from width and height if passed
2020-08-24 14:35:59 -04:00
41c1774e4a
remove ftp upload folder from specfile
2020-08-24 12:33:22 -05:00
8c32511c83
whitespace
2020-08-24 12:05:31 -05:00
bce38ae2c6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 12:05:25 -04:00
56e2ac5baa
add scale to query params because zms doesn't wupport width&height
2020-08-24 12:05:14 -04:00
e5e2c3b347
fix stats off by 1 frame, don't alert on score 0
2020-08-24 10:57:54 -05:00
c6e3107a50
make donate view a modal
2020-08-24 09:31:21 -05:00
67f2e3c1a0
Merge branch 'master' into filter_pre_post
2020-08-24 10:30:01 -04:00
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
0e9c8a35e6
fix thumbnail height style. Make thumbnail clickable.
2020-08-24 09:32:49 -04:00
0f27243007
Merge branch 'master' into filter_pre_post
2020-08-24 09:23:24 -04:00
8ea806e264
eslint
2020-08-23 18:40:58 -05:00
699b20b961
whitespace
2020-08-23 17:54:57 -05:00
65181c84ee
update frame top toolbar
2020-08-23 17:53:47 -05:00
773557ee8a
set view to stats rather than popup
2020-08-23 13:25:09 -05:00
86f0d41d8e
autoinit changeScale in frame view
2020-08-23 13:17:03 -05:00
63fc59568f
pad frames cells to account for detail view
2020-08-23 13:12:54 -05:00
4b144dea74
whitespace
2020-08-23 13:02:35 -05:00
f06bfe7cbb
use bootstrap-table on stats view
2020-08-23 12:23:58 -05:00
69ba9e6d0e
eslint
2020-08-23 12:14:09 -05:00
e111edbb72
bump version to 1.35.6 to pick a db fix from 1.34.20
2020-08-23 11:53:43 -04:00
2a7ea52330
Merge branch 'release-1.34'
2020-08-23 11:51:54 -04:00
977dee29f1
bump for release 1.34.20
2020-08-23 11:48:00 -04:00
cf63cc65c8
eoan is deprecated.
2020-08-23 11:42:08 -04:00
08c180b3ca
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-23 11:36:42 -04:00
4cbac47d6d
add navbar to stats view
2020-08-22 21:09:58 -05:00
0873b8a0ec
Remove long-deprecated config entries
2020-08-22 18:49:20 -04:00
de1d1c2ac6
change close link to back link
2020-08-22 14:43:53 -05:00
ad67f74ba4
add formatting to stats table
2020-08-22 14:12:11 -05:00
afc3d2c548
fix horizontal scroll issues events
2020-08-22 13:00:53 -05:00
e69e767878
fix horizontal scroll nonsense
2020-08-22 12:56:31 -05:00
61f89e3306
rough in frames detail view
2020-08-22 12:45:19 -05:00
822cb7bf1a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-22 11:37:19 -04:00
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
08aee63f66
Don't need a variable can just pass the define
2020-08-22 11:36:07 -04:00
9f9b771d3f
remove dead code
2020-08-22 10:58:16 -04:00
5d09ae91ab
move div tag into $imgHTML
2020-08-22 07:14:47 -05:00
Isaac Connor
Peter Keresztes Schmidt
Isaac Connor
Andrew Bauer
Andrew Bauer