Isaac Connor
dc7707bbc1
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
2019-06-18 10:03:14 -04:00
Tom Hodder
1336c03f97
WIP: Add pagination to frames.php in classic ( #2618 )
...
* add pagination to the frames.php results
* remove commented code, fix view all paging
* removing debugging logging statements
* default frames paging to on
2019-06-16 12:02:00 -04:00
Pliable Pixels
98bf7800b0
remove a password log, corrected PHP version in log ( #2627 )
...
* remove a password log, corrected PHP version in log
* PHP version correction
2019-06-16 11:59:48 -04:00
Pliable Pixels
c4dc5f34e4
add event file system path to API ( #2639 )
2019-06-16 11:59:23 -04:00
Isaac Connor
d87f5e3276
Merge branch 'master' into storageareas
2019-06-11 14:39:08 -04:00
Isaac Connor
ec7b373913
fix structure of events_by_monitor_id
2019-06-11 14:38:51 -04:00
Isaac Connor
1e7cf8c7cf
fix eslint, Fix video not resuming after setting speed to 0.
2019-06-11 14:38:28 -04:00
Isaac Connor
1241761683
Add a title popup telling people about the zoomin/out/pan functions. Add ctrl-click to zoomout
2019-06-11 10:58:54 -04:00
Isaac Connor
3a91880e2e
Merge branch 'storageareas'
2019-06-10 16:01:03 -04:00
Isaac Connor
1eadb814e2
Fix use of onclick and onchange. Fix bulk frame lookup. Make scanning events more efficient
2019-06-10 15:59:19 -04:00
Isaac Connor
265e49fe45
Add a newline after each filter group to make the code easier to read
2019-06-10 15:58:17 -04:00
Isaac Connor
1749a7a4f9
fix extra closing button tag in shutdown button. Add a newline after each Storage group to make the code easier to read
2019-06-10 15:57:53 -04:00
Isaac Connor
b9ea9ce0ae
Merge branch 'master' into storageareas
2019-06-07 14:40:43 -04:00
Isaac Connor
cfca67f663
spacing and quotes
2019-06-07 14:07:23 -04:00
Isaac Connor
9b507734b2
spacing
2019-06-06 13:49:24 -04:00
Isaac Connor
41714c676d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-06 13:40:09 -04:00
Isaac Connor
dfc60baf85
fix eslint spacing
2019-06-06 13:40:00 -04:00
fri.K
b254e1e392
For column name title field should be taken instead of array name ( #2635 )
2019-06-06 12:58:33 -04:00
Isaac Connor
4879249d77
V4LMultiBuffer has a string value so testing against an integer fails.
2019-06-06 12:53:25 -04:00
fri.K
43d24cda8e
Completed Polish translation ( #2634 )
...
* Completed Polish translation
* Changing translation to be simillar with other lines
2019-06-05 17:07:32 -04:00
Isaac Connor
08cc4e0383
add null value to set() function
2019-06-05 10:22:20 -04:00
Isaac Connor
5346f82de9
Fix unable to login when ZM_AUTH_RELAY != hashed and fix setting the password in session when ZM_AUTH_RELAY==plain
2019-06-05 09:23:34 -04:00
Isaac Connor
83b00c2cd1
Merge branch 'master' into storageareas
2019-06-04 16:43:43 -04:00
Isaac Connor
4b9b2015cb
write a note why regnerateAuthHash doesn't work when saving config
2019-06-04 16:30:57 -04:00
Isaac Connor
cc269378cf
regenerate auth_hash in session because we might have changed an auth hash setting
2019-06-04 16:27:25 -04:00
Isaac Connor
168aa35461
force regeneration of auth_hash on login. Fix failed auth_hash verification not logging you out by returning null instead of false. Update session with new auth_hash when forcing regeneration
2019-06-04 16:26:29 -04:00
Isaac Connor
86ad96b788
increase height of donate popup to hold all content
2019-06-04 12:08:08 -04:00
Isaac Connor
7649f5d6b9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-04 10:33:14 -04:00
Isaac Connor
9d6091e271
better fix for #2453 . Pushing an element causes td's within td's. Weird formatting, etc. We use an html escaping function to prevent XSS
2019-06-04 10:32:54 -04:00
Tom Hodder
a6f3303859
add options help to linked monitors option ( #2633 )
...
* add options help to linked monitors option
* fix typo and clarify instructions for new widget
2019-06-04 10:05:08 -04:00
Isaac Connor
7445f5588f
show storage when there are 4 areas. Used to only do it for < 4
2019-05-31 11:01:09 -04:00
Isaac Connor
aefd735abb
quotes
2019-05-31 11:00:30 -04:00
Isaac Connor
eaa1939f6b
comment out debug lines
2019-05-31 10:35:54 -04:00
Isaac Connor
274737d1b1
Fix moocord to mocord.
2019-05-31 10:35:18 -04:00
Isaac Connor
b0869a0b13
spaces and quotes
2019-05-31 10:34:53 -04:00
Isaac Connor
75ec4818a6
WHen saving a monitor, only start zmc and zma if appropriate
2019-05-31 10:15:02 -04:00
Isaac Connor
ba96f0709c
fix saving user using password_hash
2019-05-30 09:58:54 -04:00
Isaac Connor
628760d5b9
Spacing and braces cleanup from asker's code
2019-05-29 10:29:03 -04:00
Isaac Connor
8e0f828aa1
Add APIEnabled to translations
2019-05-29 10:28:42 -04:00
Isaac Connor
ee0c21d587
Add API Enabled to User edit
2019-05-29 10:28:25 -04:00
Isaac Connor
722411475d
Fix +/- buttons on new line in filter not having onclick events bound
2019-05-29 09:23:56 -04:00
Isaac Connor
21761a35ad
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-05-29 08:40:52 -04:00
Isaac Connor
07d4310466
Can't cache-bust jquery-ui-theme.css as it loads sprites by relative path
2019-05-29 08:40:48 -04:00
Pliable Pixels
bc0565858b
check for API disabled only when auth is on ( #2624 )
2019-05-28 13:44:06 -04:00
Isaac Connor
c4d76f03c9
Introduce ZM_PATH_SHUTDOWN to cmake config
2019-05-27 12:09:32 -04:00
Isaac Connor
ac8197f2e5
fix eslint errors in monitor.js
2019-05-27 11:25:49 -04:00
Isaac Connor
3c5d20a2e1
when an event view is scaled, adjust the frame popup window size accordingly
2019-05-24 15:06:37 -04:00
Isaac Connor
fad919adec
Fix incorrect fix for dealing with bulk frames. prev and next fid should just be +/- 1, so that we show the actual capture frame as opposed to the non-existent db frame record. Fix is by specifying the EventId as well
2019-05-24 14:59:33 -04:00
Isaac Connor
4765b9d936
Don't generate php errors when returned row doesn't have the specified column
2019-05-24 14:52:04 -04:00
Isaac Connor
d5b29923a4
add a.disabled css style
2019-05-24 14:51:39 -04:00
Isaac Connor
0c00752ab4
fix nextFid and prevFid when using bulk frames. Disable buttons instead of removing them entirely.
2019-05-24 14:51:08 -04:00
Isaac Connor
1ddd5b1f74
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-05-24 13:56:30 -04:00
Isaac Connor
34400419e8
Add shutdown capability ( #2575 )
...
* Add Config for showing a system shutdown/restart option
* Add a translation for Shutdown
* add a shutdown power button to the navbar
* but the shutdown icon in a navbar-txt
* set width and height of shutdown window
* Add instructions for enabling the web user to run shutdown
* add the shutdown view and actions
2019-05-24 13:53:24 -04:00
Pliable Pixels
fc27393a96
Replace MySQL Password() with bcrypt, allow for alternate JWT tokens ( #2598 )
...
* added sha1 and bcrypt submodules
* added bcrypt and sha to src build process
* added test sha1 and bcrypt code to validate working
* bcrypt auth migration in PHP land
* added include path
* add sha source
* added bcrypt to others
* put link_dir ahead of add_executable
* fixed typo
* try add_library instead
* absolute path
* absolute path
* build bcrypt as static
* move to wrapper
* move to fork
* logs tweak
* added lib-ssl/dev for JWT signing
* Moved to openSSL SHA1, initial JWT plugin
* removed vog
* fixed SHA1 algo
* typo
* use php-jwt, use proper way to add PHP modules, via composer
* fixed module path
* first attempt to fix cast error
* own fork
* own fork
* add composer vendor directory
* go back to jwt-cpp as PR merged
* moved to jwt-cpp after PR merge
* New token= query for JWT
* Add JWT token creation, move old code to a different function for future deprecation, simplified code for ZM_XX parameter reading
* JWT integration, validate JWT token via validateToken
* added token validation to zms/zmu/zmuser
* add token to command line for zmu
* move decode inside try/catch
* exception handling for try/catch
* fix db read, forgot to exec query
* remove allowing auth_hash_ip for token
* support refresh tokens as well for increased security
* remove auth_hash_ip
* Error out if used did not create an AUTH_HASH_SECRET
* fixed type conversion
* make sure refresh token login doesn't generate another refresh token
* fix absolute path
* move JWT/Bcrypt inside zm_crypt
* move sha headers out
* move out sha header
* handle case when supplied password is hashed, fix wrong params in AppController
* initial baby step for api tab
* initial plumbing to introduce token expiry and API bans per user
* remove M typo
* display user table in api
* added revoke all tokens code, removed test code
* use strtoul for conversion
* use strtoul for conversion
* use strtoul for conversion
* more fixes
* more fixes
* add mintokenexpiry to DB seek
* typo
* add ability to revoke tokens and enable/disable APIs per user
* moved API enable back to system
* comma
* enable API options only if API enabled
* move user creation to bcrypt
* added password_compat for PHP >=5.3 <5.5
* add Password back so User object indexes don't change
* move token index after adding password
* demote logs
* make old API auth optional, on by default
* make old API auth mechanism optional
* removed stale code
* forgot to checkin update file
* bulk overlay hash mysql encoded passwords
* add back ssl_dev, got deleted
* fix update script
* added token support to index.php
* reworked API document for new changes in 2.0
* Migrate from libdigest to crypt-eks-blowfish due to notice
* merge typo
* css classess for text that disappear
* fixed html typo
* added deps to ubuntu control files
* spaces
* removed extra line
* when regenerating using refresh tokens, username needs to be derived from the refresh token, as no session would exist
* add libssl1.0.0 for ubuntu 16/12
* small API fixes
* clean up of API, remove redundant sections
* moved to ZM fork for bcrypt
* whitespace and google code style
* regenerate auth hash if doing password migration
* dont need AUTH HASH LOGIN to be on
* Add auth hash verification to the user logged in already case
* fix missing ]
* reject requests if per user API disabled
2019-05-24 13:48:40 -04:00
Isaac Connor
e2d56597bf
Don't use an onlick inline js to show the caution text
2019-05-24 12:40:02 -04:00
Isaac Connor
2eebdb094c
move chosen setup to initPage
2019-05-24 11:54:14 -04:00
Isaac Connor
b6747e9b1f
spacing
2019-05-24 11:49:59 -04:00
Isaac Connor
3dd5caebca
fix quotes and stop merging lines of options help. Change MaxFPS help to advise against setting a value
2019-05-24 11:49:27 -04:00
Isaac Connor
729dee5dda
Merge branch 'master' into storageareas
2019-05-24 10:06:14 -04:00
Isaac Connor
db9ba7eeab
Add StartDateTime and EndDateTime as Sort options. Fixes #2614
2019-05-24 10:02:15 -04:00
Isaac Connor
c02eb2cd46
spacing
2019-05-24 10:00:51 -04:00
Isaac Connor
4e51379087
spacing
2019-05-24 10:00:15 -04:00
Isaac Connor
f9004443cf
Merge branch 'master' into storageareas
2019-05-24 09:37:03 -04:00
Isaac Connor
843a9a6630
Merge branch 'pliablepixels-crypt-replacement3' into storageareas
2019-05-24 09:36:54 -04:00
Isaac Connor
2fc7b3cf4d
Don't allow deleting of in-progress recording
2019-05-24 09:31:48 -04:00
Isaac Connor
aa1264f4d2
fix missing ]
2019-05-23 16:26:40 -04:00
Isaac Connor
4466ef13fd
Merge branch 'pliablepixels-crypt-replacement3' into storageareas
2019-05-23 15:21:58 -04:00
Isaac Connor
7559c975e3
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement3
2019-05-23 15:15:52 -04:00
Isaac Connor
883688a72d
Add auth hash verification to the user logged in already case
2019-05-23 15:15:37 -04:00
Pliable Pixels
57708c016c
dont need AUTH HASH LOGIN to be on
2019-05-23 14:59:21 -04:00
Isaac Connor
d5120f7506
regenerate auth hash if doing password migration
2019-05-23 14:30:45 -04:00
Isaac Connor
bc9116dd94
whitespace and google code style
2019-05-23 14:27:17 -04:00
Isaac Connor
2ce2381269
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-19 08:45:42 -04:00
Pliable Pixels
8e1037458a
when regenerating using refresh tokens, username needs to be derived from the refresh token, as no session would exist
2019-05-18 11:23:16 -04:00
Isaac Connor
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
Isaac Connor
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
Pliable Pixels
a4eff3e8e0
fixed html typo
2019-05-17 09:44:22 -04:00
Pliable Pixels
923f798e69
css classess for text that disappear
2019-05-17 09:32:23 -04:00
Pliable Pixels
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
Isaac Connor
96f578f1bd
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup. ( #2604 )
2019-05-16 15:37:37 -04:00
Isaac Connor
1855ee441a
Fix #2609 invalid value horz instead of hori in orientations enumeration
2019-05-15 19:35:19 -04:00
Pliable Pixels
95460a945a
added token support to index.php
2019-05-14 19:22:49 -04:00
Pliable Pixels
e9f843f297
bulk overlay hash mysql encoded passwords
2019-05-13 14:29:24 -04:00
Isaac Connor
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
Isaac Connor
7f704263d8
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup.
2019-05-13 10:30:41 -04:00
Jonathan Meredith
74d9f4f1aa
Spelling and grammar fixes in help ( #2603 )
...
* Edit Help array to make it match others below. This should not affect the results
* Misc. grammer and spelling fixes along with removing some duplicated words. This should not affect compilation.
* More grammer and spelling errors
* Replace Javascript with ZoneMinder because it did not make sense there.
* More spelling and grammar edits
2019-05-13 07:58:18 -04:00
Pliable Pixels
41ae745b17
removed stale code
2019-05-12 18:53:51 -04:00
Pliable Pixels
ec279ccc9a
make old API auth mechanism optional
2019-05-12 18:51:07 -04:00
Pliable Pixels
881d531fe9
make old API auth optional, on by default
2019-05-12 18:19:19 -04:00
Pliable Pixels
21710b6e49
demote logs
2019-05-12 15:45:39 -04:00
Pliable Pixels
adb01c4d0e
added password_compat for PHP >=5.3 <5.5
2019-05-12 13:57:25 -04:00
Pliable Pixels
d7dbaf52d4
move user creation to bcrypt
2019-05-12 13:01:29 -04:00
Pliable Pixels
91dd6630b5
enable API options only if API enabled
2019-05-12 12:34:55 -04:00
Pliable Pixels
9998c26101
comma
2019-05-12 12:21:49 -04:00
Pliable Pixels
c1891e35b9
moved API enable back to system
2019-05-12 12:15:08 -04:00
Pliable Pixels
a9d601e5ae
add ability to revoke tokens and enable/disable APIs per user
2019-05-12 10:56:17 -04:00
Pliable Pixels
225893fcd6
add mintokenexpiry to DB seek
2019-05-12 05:50:19 -04:00
Pliable Pixels
88d50ec9ca
added revoke all tokens code, removed test code
2019-05-11 15:47:57 -04:00
Pliable Pixels
2ee466f5e4
display user table in api
2019-05-11 14:08:49 -04:00
Pliable Pixels
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
Pliable Pixels
e6b7af4583
initial baby step for api tab
2019-05-10 15:11:35 -04:00
Pliable Pixels
95b448abdd
handle case when supplied password is hashed, fix wrong params in AppController
2019-05-10 11:25:55 -04:00
Pliable Pixels
1770ebea23
make sure refresh token login doesn't generate another refresh token
2019-05-08 15:26:51 -04:00
Pliable Pixels
0bc96dfe83
Error out if used did not create an AUTH_HASH_SECRET
2019-05-08 14:26:16 -04:00
Pliable Pixels
f9730bb46b
remove auth_hash_ip
2019-05-08 14:07:48 -04:00
Pliable Pixels
bc050fe330
support refresh tokens as well for increased security
2019-05-08 13:38:42 -04:00
Pliable Pixels
27e6e46f84
remove allowing auth_hash_ip for token
2019-05-08 12:11:32 -04:00
Pliable Pixels
b293592e4c
added token validation to zms/zmu/zmuser
2019-05-08 10:55:32 -04:00
Pliable Pixels
e8f79f3254
JWT integration, validate JWT token via validateToken
2019-05-07 15:04:51 -04:00
Pliable Pixels
d36c1f5d3c
Add JWT token creation, move old code to a different function for future deprecation, simplified code for ZM_XX parameter reading
2019-05-07 15:04:12 -04:00
Pliable Pixels
0bbc582971
New token= query for JWT
2019-05-07 15:03:13 -04:00
Isaac Connor
5fe565b99d
spacing
2019-05-06 10:49:18 -04:00
Isaac Connor
1ca5eee53a
spacing
2019-05-06 10:45:40 -04:00
Pliable Pixels
ca3f65deef
go back to jwt-cpp as PR merged
2019-05-05 14:32:09 -04:00
Pliable Pixels
37040f33a8
add composer vendor directory
2019-05-05 12:49:33 -04:00
Pliable Pixels
a55a11dad1
first attempt to fix cast error
2019-05-05 11:24:55 -04:00
Pliable Pixels
8d62c61b7a
fixed module path
2019-05-05 07:50:52 -04:00
Pliable Pixels
725c3c50ed
use php-jwt, use proper way to add PHP modules, via composer
2019-05-05 07:08:25 -04:00
Pliable Pixels
887912e7ad
bcrypt auth migration in PHP land
2019-05-01 13:22:24 -04:00
Isaac Connor
91f7034642
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-01 08:57:40 -04:00
Isaac Connor
25614bb75e
Merge branch 'master' into storageareas
2019-05-01 08:57:20 -04:00
Isaac Connor
b3fb934fb5
add namespace to Logging calls
2019-04-29 14:16:55 -04:00
Isaac Connor
940338ea12
namespace escape Error calls
2019-04-29 12:51:02 -04:00
Isaac Connor
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
Isaac Connor
a0dbb70af6
filter the form submit on enter to only affect input elements, not textareas
2019-04-26 10:40:11 -04:00
Isaac Connor
735a996e41
dsiable form submit on enter on the monitor view
2019-04-26 10:26:16 -04:00
Isaac Connor
6a250d61e3
cache_bust logger.js and overlay.js
2019-04-26 10:25:32 -04:00
Steve Root
0d4651c2d6
Update url to donate page ( #2586 )
2019-04-23 10:58:28 -04:00
Javier González Calleja
8195c4e395
Fixing video export view ( #2585 )
2019-04-20 11:19:27 -04:00
Isaac Connor
5b68ddcc9a
add a note deprecating getDiskPercent
2019-04-17 09:55:34 -04:00
Isaac Connor
14791ec19b
Merge branch 'master' into storageareas
2019-04-15 13:27:41 -04:00
andornaut
164a2d4d70
Fix image path ( #2576 )
...
Change the path of the "center.png" image from skins/classic/graphics/graphics/center.png to skins/classic/graphics/center.png.
Note that the `graphics/` directory was previously duplicated.
2019-04-14 15:41:58 -04:00
Isaac Connor
8828e2fe61
Merge branch 'master' into storageareas
2019-04-14 13:50:31 -04:00
Andrew Bauer
733bd66773
Merge pull request #2562 from santos995/master
...
Added and edited tranlations to ru_ru.php
2019-04-13 08:25:09 -04:00
Isaac Connor
f0af0619e4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-04-12 14:58:24 -04:00
Isaac Connor
3f3ae748f0
Merge branch 'add_shutdown_capability' into storageareas
2019-04-12 14:58:11 -04:00
Isaac Connor
160f5c7bd9
Merge branch 'master' into storageareas
2019-04-12 14:57:54 -04:00
Isaac Connor
d59f058956
basic update of optionhelp view
2019-04-12 14:57:11 -04:00
Isaac Connor
1a1c2db15f
add the shutdown view and actions
2019-04-12 14:55:56 -04:00
Isaac Connor
c9d45b143c
Merge branch 'master' into add_shutdown_capability
2019-04-12 13:09:45 -04:00
Isaac Connor
36336d67be
set width and height of shutdown window
2019-04-12 13:09:25 -04:00
Isaac Connor
7b98dcbb94
but the shutdown icon in a navbar-txt
2019-04-12 13:08:58 -04:00
Isaac Connor
d7747b3385
add a shutdown power button to the navbar
2019-04-12 09:37:14 -04:00
Isaac Connor
ec6d56fd7e
Add a translation for Shutdown
2019-04-12 09:36:56 -04:00
Isaac Connor
df348c3513
lets go with reporting actual errors
2019-04-10 11:48:17 -04:00
Isaac Connor
f7dfe2982b
Fix deleting single events
2019-04-10 11:46:12 -04:00
Pliable Pixels
d270fbd0ad
added support for named params to consoleEvents ( #2571 )
2019-04-09 16:28:46 -04:00
Isaac Connor
37b7c32465
fix errors when no filter specified
2019-04-09 09:45:28 -04:00
Isaac Connor
5ad9219609
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-09 09:39:39 -04:00
Andrew Bauer
50dd63c21d
fix eslint
2019-04-08 19:58:18 -05:00
Andrew Bauer
8af96e3c00
fix eslint errors
2019-04-08 18:40:52 -05:00
Isaac Connor
3abf263e7a
fixup half-merged changes to filter to view in montagereview
2019-04-08 16:57:41 -04:00
Isaac Connor
780f4f9b9a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-06 09:27:44 -04:00
Isaac Connor
381f526d66
spacing
2019-04-05 15:18:20 -04:00
Isaac Connor
79de2b65cd
If we are saving jpegs we don't save a snapshot image, and since we may delay writing frame info to the db, we have to default to frame 0 instead of snapshot
2019-04-04 12:18:46 -04:00
Isaac Connor
8f3d1f8653
fix a missing = and use csrf_get_tokens instead of csrf_get_secret which is the wrong function
2019-04-02 15:25:14 -04:00
Isaac Connor
9e96c29620
Log a failed csrf check
2019-04-02 15:24:47 -04:00
Isaac Connor
8a90176a2c
Add CanReboot to Controls
2019-04-02 09:25:50 -04:00
Isaac Connor
501324d778
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-04-01 22:09:57 -04:00
Isaac Connor
d5402e9cba
Correct Storaage Server name in list
2019-04-01 22:09:47 -04:00
Isaac Connor
110e5075f4
fix namespace fixes #3566
2019-04-01 17:21:01 -04:00
Isaac Connor
15fb546e15
spacing
2019-04-01 11:13:35 -04:00
Isaac Connor
7d07cdf530
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-01 10:12:09 -04:00
Isaac Connor
fa9803d819
Can't use this->data to avoid another db hit. Must load by id
2019-04-01 10:11:56 -04:00
Andrew Bauer
e97751558f
eslint fix
2019-03-30 10:41:04 -05:00
Isaac Connor
90e97ff135
Merge branch 'master' into storageareas
2019-03-28 11:20:29 -04:00
Isaac Connor
49e3f0a68e
eslint fixes
2019-03-28 09:43:31 -04:00
Isaac Connor
ee4b452e42
Update monitor edit to not use inline js
2019-03-25 16:25:09 -04:00
Isaac Connor
c7e09e03d3
add cache busting to base.js
2019-03-25 16:24:46 -04:00
Isaac Connor
052a2ef1fd
fix eventserver => eventnotification
2019-03-25 12:20:21 -04:00
Isaac Connor
7565e171b4
spacing
2019-03-25 12:18:15 -04:00
Isaac Connor
4eafc52955
spacing
2019-03-25 12:18:01 -04:00
Isaac Connor
7e62ccca3c
Handle div by zero when TotalMem is not known for Server
2019-03-25 12:08:56 -04:00
Isaac Connor
8d07a4a08f
Log useful error messages when can't mkdir the monitor events dir or the symlink to it. symlink is a warning because the symlink is just a user aid
2019-03-25 11:58:04 -04:00
santos995
accf826ae9
New translations
2019-03-25 11:44:01 +03:00
santos995
42196ed5aa
Update translation ru 2
2019-03-25 10:20:27 +03:00
Isaac Connor
677b9cfbed
Make controlcap popup wider
2019-03-24 09:59:04 -04:00
Isaac Connor
bd5c9b5b20
add Control to ZM namespace
2019-03-24 09:58:50 -04:00
santos995
01056fc0f4
Перевод некоторых слов
2019-03-24 04:14:06 +03:00
Isaac Connor
f311fcc9e0
change to a button
2019-03-22 17:28:23 -04:00
Isaac Connor
8f28ba0be3
beter debug and less often when no terms in parseFilter
2019-03-22 17:28:12 -04:00
Isaac Connor
6d4d353209
fix namespace on MontageLayout
2019-03-22 17:27:58 -04:00
Isaac Connor
16467595d4
Fix clicking in montage
2019-03-21 17:00:51 -04:00
Isaac Connor
65fab1b032
add px to width and height of event img
2019-03-21 14:14:45 -04:00
Isaac Connor
7f7acc18ee
spacing and code doc
2019-03-21 14:14:30 -04:00
Isaac Connor
f434042c52
fix spacing
2019-03-21 14:14:15 -04:00
Isaac Connor
f5dfa0d740
Spacing and fix clone monitor by setting the Id to 0 instead of nextId, so that when we go to save it, we use an insert instead of an update
2019-03-20 15:03:20 -04:00
Isaac Connor
10a972f2a0
fixes to download video
2019-03-20 14:51:59 -04:00
Isaac Connor
d4353af8af
Fix eslint errors
2019-03-20 14:51:39 -04:00
Isaac Connor
a5366d522d
Fixup exporting
2019-03-20 14:29:05 -04:00
Isaac Connor
ae7391689b
Add some code doc
2019-03-20 14:28:19 -04:00
Isaac Connor
ad059f985e
spacing
2019-03-20 14:27:23 -04:00
Isaac Connor
09b42f8b55
remove nonce from js because it is the exported html not part of the zm web ui
2019-03-20 14:27:10 -04:00
Isaac Connor
6efeab5f8d
improve readability of parseFilter
2019-03-20 14:26:48 -04:00
Isaac Connor
b988ce0573
more parentheses to make logic more clear
2019-03-20 14:26:35 -04:00
Isaac Connor
c3324ada18
Put back mkdir ZM_PATH_SOCKS
2019-03-20 14:26:03 -04:00
Isaac Connor
84a200395e
spacing and turn off errors because ajax should only return json
2019-03-20 14:25:34 -04:00
Isaac Connor
52e66adc99
Fix namespace
2019-03-20 14:25:12 -04:00
Isaac Connor
a634d8b774
use id instead of this->data when loading Event to delete in API
2019-03-19 17:26:20 -04:00
Isaac Connor
0623afb0ae
add language entry for Monitor DefaultCodec
2019-03-19 12:19:58 -04:00