11337eb2d3
Don't call Terminate if we aren't connected. Spacing
2022-06-08 16:46:16 -04:00
ac763ac7f9
Fix a poorly worded debug
2022-06-08 16:45:56 -04:00
1b107b2e02
Must memset the new allocation or we can use an unitialized value from the buffer
2022-06-08 16:45:13 -04:00
1531ced590
Remove unneeded debug
2022-06-08 16:44:47 -04:00
866ad4f5e2
Don't turn '0' into ''
2022-06-07 09:44:37 -04:00
b14dfea87c
Merge pull request #3502 from iasmanis/master
...
Update config.php.in
2022-06-07 09:40:46 -04:00
5ae57efeda
Merge pull request #3501 from nabbi/master
...
Fix semaphore_tries on systems without System V
2022-06-07 09:26:37 -04:00
af2f1cc6e6
Update config.php.in
2022-06-07 12:33:41 +03:00
f6fdcc2953
Fix semaphore_tries on systems without System V
...
This appears to be impacting systems without php System V semaphore support
have_semaphore is not a boolean
Signed-off-by: Nic Boet <nic@boet.cc>
2022-06-06 22:51:34 -05:00
baebdb277e
Only return error messages, not a bunch of empty arrays
2022-06-06 13:09:41 -04:00
5068cf5e62
Add a progress ticker, and delete events in chunks of 10. Fixes #3444
2022-06-06 13:09:41 -04:00
1e6f5c7987
Fix eslint
2022-06-06 13:09:41 -04:00
034ae4905b
Merge pull request #3500 from ZoneMinder/dependabot/github_actions/actions/checkout-3
...
Bump actions/checkout from 2 to 3
2022-06-06 12:11:35 -04:00
d483332b8d
Merge pull request #3499 from ZoneMinder/dependabot/github_actions/github/codeql-action-2
...
Bump github/codeql-action from 1 to 2
2022-06-06 12:10:59 -04:00
c4d2385e57
Bump actions/checkout from 2 to 3
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-06-06 14:47:56 +00:00
5e3656cab6
Bump github/codeql-action from 1 to 2
...
Bumps [github/codeql-action](https://github.com/github/codeql-action ) from 1 to 2.
- [Release notes](https://github.com/github/codeql-action/releases )
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md )
- [Commits](https://github.com/github/codeql-action/compare/v1...v2 )
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-06-06 14:47:53 +00:00
0feb501f23
Merge pull request #3495 from turrisxyz/Dependabot-GitHub-Actions
...
chore: Included githubactions in the dependabot config
2022-06-06 10:16:28 -04:00
f6b9eaf433
Merge pull request #3498 from turrisxyz/Dependency-GitHub
...
chore(deps): Included dependency review
2022-06-05 15:42:21 -04:00
d877a32500
Only include config if logged in or auth turned off. Login view doesn't require any config.
2022-06-05 11:50:56 -04:00
eda03fc4e8
chore(deps): Included dependency review
...
> Dependency Review GitHub Action in your repository to enforce dependency
> reviews on your pull requests.
> The action scans for vulnerable versions of dependencies introduced by package version
> changes in pull requests,
> and warns you about the associated security vulnerabilities.
> This gives you better visibility of what's changing in a pull request,
> and helps prevent vulnerabilities being added to your repository.
https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-06-05 13:07:32 +00:00
4be56ec676
Add php-intl as a dependency. Fixes #3496
2022-06-04 10:24:29 -04:00
e379faede5
chore: Included githubactions in the dependabot config
...
This should help with keeping the GitHub actions updated on new releases. This will also help with keeping it secure.
Dependabot helps in keeping the supply chain secure https://docs.github.com/en/code-security/dependabot
GitHub actions up to date https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
https://github.com/ossf/scorecard/blob/main/docs/checks.md#dependency-update-tool
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-06-04 01:29:45 +00:00
d45f6bb7f6
fix formatter->format
2022-06-03 14:25:19 -04:00
d135be17ba
Must pass time() to format()
2022-06-03 14:25:19 -04:00
7874825064
put back including config.php
2022-06-03 10:09:36 -04:00
3677d385ce
Merge pull request #3494 from turrisxyz/Pinned-Dependencies-GitHub
...
chore: Set permissions for GitHub actions
2022-06-03 09:56:28 -04:00
950dfa1ecf
chore: Set permissions for GitHub actions
...
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.
- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ )
Signed-off-by: neilnaveen <42328488+neilnaveen@users.noreply.github.com>
2022-06-03 01:08:38 +00:00
4a6ad1f880
move dateFormatters to config. This is so that they get setup even if not using index.php. Like cakephp for example.
2022-06-02 20:13:37 -04:00
beec86fda2
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-06-02 20:09:33 -04:00
a480366232
Don't trim select values. In monitor selects are all well defined. Fixes not being able to multi-select groups or linked monitors
2022-06-02 16:33:32 -04:00
cce403419b
use a global mode variable to determine if we are editing and disable clicking on image. disabling the onclick doesn't seem to be working. When activating edit mode and saving positions use #monitor instead of #monitorFrame which went away.
2022-06-02 15:12:09 -04:00
edfaffb88f
Only set onclick if a new function is given
2022-06-02 15:11:59 -04:00
73977c518d
use zm_setcookie function with will set required cookie fields so that cookie actually gets set
2022-06-02 15:11:47 -04:00
2883a78e5c
Fix eslint
2022-06-02 09:22:02 -04:00
1b365c5471
add php-intl as a dependency as we use it now.
2022-06-02 08:57:20 -04:00
60f4be3966
Merge branch 'php8.1'
2022-06-01 16:31:19 -04:00
b9e16f4885
Handle ctrl-click for opening in a new window
2022-06-01 16:31:11 -04:00
dd3ee2247d
Include connKey is debug line
2022-06-01 16:31:11 -04:00
52f6be7319
get rid of warning when not Connected. zms can provide that message now.
2022-06-01 16:31:11 -04:00
9582ea92dd
Remove debug
2022-06-01 16:31:11 -04:00
efe2f0b0a1
Add overriding timeFormatter pattern
2022-06-01 16:20:36 -04:00
4a54931292
Add ZM_TIME_FORMAT_PATTERN
2022-06-01 16:19:51 -04:00
cde59e9f79
convert from strftime to date
2022-06-01 16:18:04 -04:00
038e38eb13
convert from strftime to date
2022-06-01 16:17:57 -04:00
49a744da17
replace strftime, but also fix the fact that we weren't passing a format string
2022-06-01 16:17:40 -04:00
c0435c9053
Use global dateTimeFormatter to replace strftime
2022-06-01 16:17:14 -04:00
bd22cd7fdd
Use global dateTimeFormatter to replace strftime
2022-06-01 16:17:00 -04:00
655daff383
Add timeFormatter
2022-06-01 16:16:38 -04:00
2dfc8297d5
Use dateTimeFOrmatter to format the date/time on session access
2022-06-01 16:02:47 -04:00
804fb71c6a
convert from strftime() to date()
2022-06-01 15:59:09 -04:00
Isaac Connor
Isaac Connor
Ingemārs
Nic Boet
dependabot[bot]
naveen
neilnaveen