ca0b583007
Use material icons for sort because they look nicer
2019-08-19 08:59:15 -04:00
239c68dd7f
add .. to fix #2686
2019-08-19 08:58:52 -04:00
d39da61b66
Don't actually write out the session when generating auth hashes. Means they should never actually persist.
2019-08-16 15:27:24 -04:00
070b8066f2
document that zm_session_start should be called previously to session_regenerate_id
2019-08-16 15:08:35 -04:00
28155ebd90
Should use zm_session_start instead of session_start
2019-08-16 15:08:10 -04:00
cfeedd39a4
Use zm_session_start instead of session_start
2019-08-16 15:07:20 -04:00
660eddc69d
Only open/close session if we are clearing a session var
2019-08-16 15:06:56 -04:00
3475a11e15
use instead of session when generating auth hash.
2019-08-16 14:13:13 -04:00
51c7f0b73f
shuffle lines
2019-08-16 14:12:52 -04:00
1d0ee227d7
fix mUser to username, etc.
2019-08-16 14:12:37 -04:00
4108495a7d
Add session storage if stateful query param is on, but only for LEGACY_API_AUTH
2019-08-16 14:12:14 -04:00
376b8af889
Make links in donate text actual links
2019-08-16 11:40:38 -04:00
fdb66aaa72
Merge branch 'master' into fix_token_auth_sessions
2019-08-15 16:22:09 -04:00
336f45219b
fix object caching
2019-08-15 16:04:56 -04:00
68052368f7
use backticks on table and column names. Use data-on-change-this in group dropdown
2019-08-15 16:04:37 -04:00
1103928ed7
only call check_timezone on console for efficiency in all other requests
2019-08-15 15:16:20 -04:00
f09941ed48
timezone errors shouldn't be fatal
2019-08-15 15:16:02 -04:00
7c54ac85a0
remove debugging
2019-08-15 15:05:37 -04:00
618e6816ef
Rework auth. login using username and password only occurs on login action now. Including auth.php should not touch the session. auth_hash logins no longer touch the session. replace userLogin with a function called validateUser which matches the semantics of validateToken.
2019-08-15 14:59:15 -04:00
0ec6e8d635
Merge branch 'master' into fix_token_auth_sessions
2019-08-15 12:05:07 -04:00
ed9175b4ad
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2019-08-13 15:34:11 -04:00
4140d51e9f
database.php cleanup. remove dbFetchMonitor and dbFetchGroup. Their usage has been replaced with the Object::find_one usage. Also more quoting of table and colume names to fix #2659
2019-08-13 11:45:50 -04:00
9da10abca9
Move APIEnabled check to the api from auth.php
2019-08-13 11:29:32 -04:00
a63b6486b9
Remove Session from App Components list.
2019-08-12 15:36:40 -04:00
c2e1293472
spacing
2019-08-12 15:10:58 -04:00
0bf036fc55
Remove Session from the components list
2019-08-12 15:06:46 -04:00
2320ab4d66
update HostController. Use config constants, don't use sessions
2019-08-12 15:01:40 -04:00
4922861d1d
Merge branch 'master' into fix_token_auth_sessions
2019-08-12 13:59:11 -04:00
38a09bbd18
Don't auto-add default storage area to header. If someone wants to see it's space in the header they can add it to storage areas
2019-08-08 15:34:07 -04:00
5f77634aca
Update Group object to use shared code in Object.php. Should fix #2659
2019-08-08 13:51:56 -04:00
702cb65d2a
Merge branch 'storageareas'
2019-08-08 13:38:36 -04:00
45b970fb09
fix spacing
2019-08-08 13:34:28 -04:00
df285006d2
change sortHeader to include eid if it is in the request
2019-08-08 13:34:10 -04:00
a9de537e01
Merge branch 'master' into storageareas
2019-08-08 09:27:27 -04:00
1892528679
quotes
2019-08-08 09:26:15 -04:00
5b0509e000
When invalid operator terms, use print_r on the term instead of just the operator
2019-08-08 09:26:00 -04:00
3a142df14f
Only send zmdc.pl commands for filters to running servers
2019-08-07 15:51:01 -04:00
fb414b3f19
remove debug statements
2019-08-07 15:34:45 -04:00
fb7ab993b5
Have to include the --daemon param when telling zmdc.pl what to do with zmfilter.pl
2019-08-07 15:34:30 -04:00
d4b59211cd
Merge branch 'master' into storageareas
2019-08-07 11:21:19 -04:00
962049fa31
Merge branch 'master' into filter_add_copy
2019-08-06 20:17:21 -04:00
7e6b0058d2
Update Zone buttons. Fix double submit. Fixes #2671
2019-08-02 08:04:38 -04:00
6a425b6988
If token is present do token based auth and do not do anything with session
2019-08-01 10:02:31 -04:00
7f19831e0c
Use isset when testing for existence of authash in session
2019-07-29 14:54:55 -04:00
8167ff2143
fix eslint
2019-07-26 12:28:02 -04:00
547e80b1a9
Fix download and export button from events list. Fixes #2668 ( #2670 )
2019-07-24 12:31:43 -04:00
a6a2239e5b
Fixes #2579 by putting the event Id into an attribute of the delete button. Also uses a button instead of a link. Also only does parent refresh if parent exists ( #2662 )
2019-07-24 11:39:21 -04:00
39262d55f5
Also show secondary storage area when viewing event
2019-07-24 11:26:07 -04:00
2d46f2adab
add Secondary Storage Area options.
2019-07-24 11:25:51 -04:00
1a0beab703
add Secondary Storage Area options. Storage array is now an array of Objects so use the Name key
2019-07-24 11:25:38 -04:00
1254e8ab67
Add AttrSecondaryStorageArea to lang
2019-07-24 11:24:50 -04:00
45afc2a534
introduce array_recursive_diff which we use to compare two arrays in Object::changes
2019-07-24 11:24:37 -04:00
e3a9d5d488
Rewrite changes to run through the keys of the passed in new values array, and handle object methods as well as basic values
2019-07-24 11:24:14 -04:00
341f4adbdf
Functions that change the Query must reset Query_json as well
2019-07-24 11:23:38 -04:00
58851d23d2
Add Secondary Storage support to the Event object
2019-07-24 11:22:55 -04:00
a4a144d2fa
Merge branch 'master' into filter_add_copy
2019-07-23 10:04:23 -04:00
88beb46c3e
Add FilterCopyEvents
2019-07-23 10:04:15 -04:00
df0aef89af
gracefully handle when window[fnName] doesn't exist
2019-07-23 10:03:28 -04:00
0e040fc2fc
Add click_autocopy function
2019-07-23 10:00:05 -04:00
346933126d
Update filter view to use Filter::find
2019-07-23 09:59:49 -04:00
9b6dedb35d
Update Filter saving action to use object set/save etc
2019-07-23 09:58:28 -04:00
35ec60ca03
Change Storage object to extend ZM_Object
2019-07-23 09:58:05 -04:00
7c52f8a4ae
Fixes and add Objects_Indexed_By_Id
2019-07-23 09:57:44 -04:00
b05aff1d5d
Update Filter Object to extend ZM_Object. Rename Query to Query_json and implement a Query function to parse Query_json
2019-07-23 09:57:16 -04:00
fe71a9abaa
php_errormsg is deprecated
2019-07-19 16:32:40 -04:00
a9d01ba3d2
Alarm api ( #2665 )
...
* fixed alarm api to use tokens if present
* clearer debug logs for tokens
* space
2019-07-17 20:38:58 -04:00
d244aadee6
Fix #2655
2019-07-08 14:27:49 -04:00
df8c46f0f0
Fix #2657
2019-07-08 14:22:46 -04:00
da5e8d19b8
Fix #2656
2019-07-07 17:54:45 -04:00
b84e3499f4
Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message
2019-07-07 17:25:49 -04:00
4b41655dc5
fix
2019-07-07 16:10:53 -04:00
3c1cd1e750
rename var from nevents to nFrames because that's what they are. Fix an error when page=0
2019-07-07 16:03:54 -04:00
256a0aa679
google code style
2019-07-04 09:04:43 -04:00
2470c09b20
Honour thumbnail width when bringing up frames popup for frames and alarm frames
2019-07-03 17:19:10 -04:00
268bc2264b
Merge branch 'storageareas'
2019-07-02 10:19:03 -04:00
1161c251fc
Add a warning when the monitor is not capturing in live view
2019-06-28 10:28:53 -04:00
d972ab6006
add min_section_length test to alarmed events that go unalarmed
2019-06-27 21:50:12 -04:00
305a954ee2
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2019-06-25 22:20:19 -04:00
0dbe48fb31
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2019-06-25 22:19:53 -04:00
46f3aabc25
Merge branch 'hwdecode' into storageareas
2019-06-25 15:35:56 -04:00
a28f17653f
Add DecoderHWAccel fields to Monitor
2019-06-25 15:34:45 -04:00
46c19c7efb
fix for zone overlay scaling issues in montage ( #2643 )
...
* remove extra px in svg tag
* add js method to track liveStream img size for zones
* switch to using SVG scaling to deal with zone polygons
* update jsdoc for eslint
* fix blank lines eslint issue
2019-06-24 11:45:40 -04:00
44e4d93445
Merge branch 'master' into storageareas
2019-06-24 11:35:36 -04:00
6ed0074077
End continuous events on alarm ( #2644 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* add update script to add MinSectionLength
* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
46032385fe
fix viewport on mobile. Fix duplicated css when selected css is base
2019-06-22 14:10:55 -04:00
38bcdbbffe
ONly close session if we opened it in generateAuthHash, only try to validate auth hash if it is set in the session
2019-06-21 18:04:39 -04:00
85b9b045cc
Copy Profile Token to ControlDevice for use with Netcat PTZ script
2019-06-21 12:42:26 -04:00
60618d5998
Fix hour subtraction in getAuthUser to actually subtract an hour
2019-06-21 11:45:33 -04:00
db7362dbcb
Merge branch 'master' into storageareas
2019-06-20 14:18:47 -04:00
d026c61077
Don't allow saving to built in layouts
2019-06-20 13:48:14 -04:00
71eadfc40e
Merge branch 'remove-extra-px' of https://github.com/tolland/zoneminder into tolland-remove-extra-px
2019-06-20 13:28:24 -04:00
3bae7a5432
spaces and parenthesis
2019-06-20 13:28:12 -04:00
ffaad88bf0
switch to using SVG scaling to deal with zone polygons
2019-06-20 17:11:22 +00:00
edd52e7fbf
add js method to track liveStream img size for zones
2019-06-20 12:46:04 +00:00
4da5c52cd2
remove extra px in svg tag
2019-06-19 20:18:38 +00:00
77eb15ff17
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
2019-06-19 09:22:21 -04:00
70a91c7069
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-19 09:22:21 -04:00
a6e42e4317
remove a password log, corrected PHP version in log ( #2627 )
...
* remove a password log, corrected PHP version in log
* PHP version correction
2019-06-19 09:22:21 -04:00
2d5f84cd22
add event file system path to API ( #2639 )
2019-06-19 09:22:21 -04:00
199e8182be
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-19 08:36:48 -04:00
dc7707bbc1
fix an oninput and use validHtmlStr on ServerNames storageName MonitorName etc in dropdowns
2019-06-18 10:03:14 -04:00
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
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
c4dc5f34e4
add event file system path to API ( #2639 )
2019-06-16 11:59:23 -04:00
d87f5e3276
Merge branch 'master' into storageareas
2019-06-11 14:39:08 -04:00
ec7b373913
fix structure of events_by_monitor_id
2019-06-11 14:38:51 -04:00
1e7cf8c7cf
fix eslint, Fix video not resuming after setting speed to 0.
2019-06-11 14:38:28 -04:00
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
3a91880e2e
Merge branch 'storageareas'
2019-06-10 16:01:03 -04:00
1eadb814e2
Fix use of onclick and onchange. Fix bulk frame lookup. Make scanning events more efficient
2019-06-10 15:59:19 -04:00
265e49fe45
Add a newline after each filter group to make the code easier to read
2019-06-10 15:58:17 -04:00
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
b9ea9ce0ae
Merge branch 'master' into storageareas
2019-06-07 14:40:43 -04:00
cfca67f663
spacing and quotes
2019-06-07 14:07:23 -04:00
9b507734b2
spacing
2019-06-06 13:49:24 -04:00
41714c676d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-06 13:40:09 -04:00
dfc60baf85
fix eslint spacing
2019-06-06 13:40:00 -04:00
b254e1e392
For column name title field should be taken instead of array name ( #2635 )
2019-06-06 12:58:33 -04:00
4879249d77
V4LMultiBuffer has a string value so testing against an integer fails.
2019-06-06 12:53:25 -04:00
43d24cda8e
Completed Polish translation ( #2634 )
...
* Completed Polish translation
* Changing translation to be simillar with other lines
2019-06-05 17:07:32 -04:00
08cc4e0383
add null value to set() function
2019-06-05 10:22:20 -04:00
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
83b00c2cd1
Merge branch 'master' into storageareas
2019-06-04 16:43:43 -04:00
4b9b2015cb
write a note why regnerateAuthHash doesn't work when saving config
2019-06-04 16:30:57 -04:00
cc269378cf
regenerate auth_hash in session because we might have changed an auth hash setting
2019-06-04 16:27:25 -04:00
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
86ad96b788
increase height of donate popup to hold all content
2019-06-04 12:08:08 -04:00
7649f5d6b9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-06-04 10:33:14 -04:00
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
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
7445f5588f
show storage when there are 4 areas. Used to only do it for < 4
2019-05-31 11:01:09 -04:00
aefd735abb
quotes
2019-05-31 11:00:30 -04:00
eaa1939f6b
comment out debug lines
2019-05-31 10:35:54 -04:00
274737d1b1
Fix moocord to mocord.
2019-05-31 10:35:18 -04:00
b0869a0b13
spaces and quotes
2019-05-31 10:34:53 -04:00
75ec4818a6
WHen saving a monitor, only start zmc and zma if appropriate
2019-05-31 10:15:02 -04:00
ba96f0709c
fix saving user using password_hash
2019-05-30 09:58:54 -04:00
628760d5b9
Spacing and braces cleanup from asker's code
2019-05-29 10:29:03 -04:00
8e0f828aa1
Add APIEnabled to translations
2019-05-29 10:28:42 -04:00
ee0c21d587
Add API Enabled to User edit
2019-05-29 10:28:25 -04:00
722411475d
Fix +/- buttons on new line in filter not having onclick events bound
2019-05-29 09:23:56 -04:00
21761a35ad
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-05-29 08:40:52 -04:00
07d4310466
Can't cache-bust jquery-ui-theme.css as it loads sprites by relative path
2019-05-29 08:40:48 -04:00
bc0565858b
check for API disabled only when auth is on ( #2624 )
2019-05-28 13:44:06 -04:00
c4d76f03c9
Introduce ZM_PATH_SHUTDOWN to cmake config
2019-05-27 12:09:32 -04:00
ac8197f2e5
fix eslint errors in monitor.js
2019-05-27 11:25:49 -04:00
3c5d20a2e1
when an event view is scaled, adjust the frame popup window size accordingly
2019-05-24 15:06:37 -04:00
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
4765b9d936
Don't generate php errors when returned row doesn't have the specified column
2019-05-24 14:52:04 -04:00
d5b29923a4
add a.disabled css style
2019-05-24 14:51:39 -04:00
0c00752ab4
fix nextFid and prevFid when using bulk frames. Disable buttons instead of removing them entirely.
2019-05-24 14:51:08 -04:00
1ddd5b1f74
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-05-24 13:56:30 -04:00
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
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
e2d56597bf
Don't use an onlick inline js to show the caution text
2019-05-24 12:40:02 -04:00
2eebdb094c
move chosen setup to initPage
2019-05-24 11:54:14 -04:00
b6747e9b1f
spacing
2019-05-24 11:49:59 -04:00
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
729dee5dda
Merge branch 'master' into storageareas
2019-05-24 10:06:14 -04:00
db9ba7eeab
Add StartDateTime and EndDateTime as Sort options. Fixes #2614
2019-05-24 10:02:15 -04:00
c02eb2cd46
spacing
2019-05-24 10:00:51 -04:00
4e51379087
spacing
2019-05-24 10:00:15 -04:00
f9004443cf
Merge branch 'master' into storageareas
2019-05-24 09:37:03 -04:00
843a9a6630
Merge branch 'pliablepixels-crypt-replacement3' into storageareas
2019-05-24 09:36:54 -04:00
2fc7b3cf4d
Don't allow deleting of in-progress recording
2019-05-24 09:31:48 -04:00
aa1264f4d2
fix missing ]
2019-05-23 16:26:40 -04:00
4466ef13fd
Merge branch 'pliablepixels-crypt-replacement3' into storageareas
2019-05-23 15:21:58 -04:00
7559c975e3
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement3
2019-05-23 15:15:52 -04:00
883688a72d
Add auth hash verification to the user logged in already case
2019-05-23 15:15:37 -04:00
57708c016c
dont need AUTH HASH LOGIN to be on
2019-05-23 14:59:21 -04:00
d5120f7506
regenerate auth hash if doing password migration
2019-05-23 14:30:45 -04:00
bc9116dd94
whitespace and google code style
2019-05-23 14:27:17 -04:00
2ce2381269
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-19 08:45:42 -04:00
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
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
a4eff3e8e0
fixed html typo
2019-05-17 09:44:22 -04:00
923f798e69
css classess for text that disappear
2019-05-17 09:32:23 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
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
1855ee441a
Fix #2609 invalid value horz instead of hori in orientations enumeration
2019-05-15 19:35:19 -04:00
95460a945a
added token support to index.php
2019-05-14 19:22:49 -04:00
e9f843f297
bulk overlay hash mysql encoded passwords
2019-05-13 14:29:24 -04:00
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
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
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
41ae745b17
removed stale code
2019-05-12 18:53:51 -04:00
ec279ccc9a
make old API auth mechanism optional
2019-05-12 18:51:07 -04:00
881d531fe9
make old API auth optional, on by default
2019-05-12 18:19:19 -04:00
21710b6e49
demote logs
2019-05-12 15:45:39 -04:00
adb01c4d0e
added password_compat for PHP >=5.3 <5.5
2019-05-12 13:57:25 -04:00
d7dbaf52d4
move user creation to bcrypt
2019-05-12 13:01:29 -04:00
91dd6630b5
enable API options only if API enabled
2019-05-12 12:34:55 -04:00
9998c26101
comma
2019-05-12 12:21:49 -04:00
c1891e35b9
moved API enable back to system
2019-05-12 12:15:08 -04:00
a9d601e5ae
add ability to revoke tokens and enable/disable APIs per user
2019-05-12 10:56:17 -04:00
225893fcd6
add mintokenexpiry to DB seek
2019-05-12 05:50:19 -04:00
88d50ec9ca
added revoke all tokens code, removed test code
2019-05-11 15:47:57 -04:00
2ee466f5e4
display user table in api
2019-05-11 14:08:49 -04:00
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
e6b7af4583
initial baby step for api tab
2019-05-10 15:11:35 -04:00
95b448abdd
handle case when supplied password is hashed, fix wrong params in AppController
2019-05-10 11:25:55 -04:00
1770ebea23
make sure refresh token login doesn't generate another refresh token
2019-05-08 15:26:51 -04:00
0bc96dfe83
Error out if used did not create an AUTH_HASH_SECRET
2019-05-08 14:26:16 -04:00
f9730bb46b
remove auth_hash_ip
2019-05-08 14:07:48 -04:00
bc050fe330
support refresh tokens as well for increased security
2019-05-08 13:38:42 -04:00
27e6e46f84
remove allowing auth_hash_ip for token
2019-05-08 12:11:32 -04:00
b293592e4c
added token validation to zms/zmu/zmuser
2019-05-08 10:55:32 -04:00
e8f79f3254
JWT integration, validate JWT token via validateToken
2019-05-07 15:04:51 -04:00
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
0bbc582971
New token= query for JWT
2019-05-07 15:03:13 -04:00
5fe565b99d
spacing
2019-05-06 10:49:18 -04:00
1ca5eee53a
spacing
2019-05-06 10:45:40 -04:00
ca3f65deef
go back to jwt-cpp as PR merged
2019-05-05 14:32:09 -04:00
37040f33a8
add composer vendor directory
2019-05-05 12:49:33 -04:00
a55a11dad1
first attempt to fix cast error
2019-05-05 11:24:55 -04:00
8d62c61b7a
fixed module path
2019-05-05 07:50:52 -04:00
725c3c50ed
use php-jwt, use proper way to add PHP modules, via composer
2019-05-05 07:08:25 -04:00
887912e7ad
bcrypt auth migration in PHP land
2019-05-01 13:22:24 -04:00
91f7034642
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-01 08:57:40 -04:00
25614bb75e
Merge branch 'master' into storageareas
2019-05-01 08:57:20 -04:00
b3fb934fb5
add namespace to Logging calls
2019-04-29 14:16:55 -04:00
940338ea12
namespace escape Error calls
2019-04-29 12:51:02 -04:00
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
a0dbb70af6
filter the form submit on enter to only affect input elements, not textareas
2019-04-26 10:40:11 -04:00
735a996e41
dsiable form submit on enter on the monitor view
2019-04-26 10:26:16 -04:00
6a250d61e3
cache_bust logger.js and overlay.js
2019-04-26 10:25:32 -04:00
0d4651c2d6
Update url to donate page ( #2586 )
2019-04-23 10:58:28 -04:00
8195c4e395
Fixing video export view ( #2585 )
2019-04-20 11:19:27 -04:00
5b68ddcc9a
add a note deprecating getDiskPercent
2019-04-17 09:55:34 -04:00
14791ec19b
Merge branch 'master' into storageareas
2019-04-15 13:27:41 -04:00
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
8828e2fe61
Merge branch 'master' into storageareas
2019-04-14 13:50:31 -04:00
733bd66773
Merge pull request #2562 from santos995/master
...
Added and edited tranlations to ru_ru.php
2019-04-13 08:25:09 -04:00
f0af0619e4
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-04-12 14:58:24 -04:00
3f3ae748f0
Merge branch 'add_shutdown_capability' into storageareas
2019-04-12 14:58:11 -04:00
160f5c7bd9
Merge branch 'master' into storageareas
2019-04-12 14:57:54 -04:00
d59f058956
basic update of optionhelp view
2019-04-12 14:57:11 -04:00
1a1c2db15f
add the shutdown view and actions
2019-04-12 14:55:56 -04:00
c9d45b143c
Merge branch 'master' into add_shutdown_capability
2019-04-12 13:09:45 -04:00
36336d67be
set width and height of shutdown window
2019-04-12 13:09:25 -04:00
7b98dcbb94
but the shutdown icon in a navbar-txt
2019-04-12 13:08:58 -04:00
d7747b3385
add a shutdown power button to the navbar
2019-04-12 09:37:14 -04:00
ec6d56fd7e
Add a translation for Shutdown
2019-04-12 09:36:56 -04:00
df348c3513
lets go with reporting actual errors
2019-04-10 11:48:17 -04:00
f7dfe2982b
Fix deleting single events
2019-04-10 11:46:12 -04:00
d270fbd0ad
added support for named params to consoleEvents ( #2571 )
2019-04-09 16:28:46 -04:00
37b7c32465
fix errors when no filter specified
2019-04-09 09:45:28 -04:00
5ad9219609
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-09 09:39:39 -04:00
50dd63c21d
fix eslint
2019-04-08 19:58:18 -05:00
8af96e3c00
fix eslint errors
2019-04-08 18:40:52 -05:00
3abf263e7a
fixup half-merged changes to filter to view in montagereview
2019-04-08 16:57:41 -04:00
780f4f9b9a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-06 09:27:44 -04:00
381f526d66
spacing
2019-04-05 15:18:20 -04:00
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
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
9e96c29620
Log a failed csrf check
2019-04-02 15:24:47 -04:00
8a90176a2c
Add CanReboot to Controls
2019-04-02 09:25:50 -04:00
501324d778
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-04-01 22:09:57 -04:00
d5402e9cba
Correct Storaage Server name in list
2019-04-01 22:09:47 -04:00
110e5075f4
fix namespace fixes #3566
2019-04-01 17:21:01 -04:00
15fb546e15
spacing
2019-04-01 11:13:35 -04:00
7d07cdf530
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-01 10:12:09 -04:00
fa9803d819
Can't use this->data to avoid another db hit. Must load by id
2019-04-01 10:11:56 -04:00
e97751558f
eslint fix
2019-03-30 10:41:04 -05:00
90e97ff135
Merge branch 'master' into storageareas
2019-03-28 11:20:29 -04:00
49e3f0a68e
eslint fixes
2019-03-28 09:43:31 -04:00
ee4b452e42
Update monitor edit to not use inline js
2019-03-25 16:25:09 -04:00
c7e09e03d3
add cache busting to base.js
2019-03-25 16:24:46 -04:00
052a2ef1fd
fix eventserver => eventnotification
2019-03-25 12:20:21 -04:00
7565e171b4
spacing
2019-03-25 12:18:15 -04:00
4eafc52955
spacing
2019-03-25 12:18:01 -04:00
7e62ccca3c
Handle div by zero when TotalMem is not known for Server
2019-03-25 12:08:56 -04:00
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
accf826ae9
New translations
2019-03-25 11:44:01 +03:00
42196ed5aa
Update translation ru 2
2019-03-25 10:20:27 +03:00
677b9cfbed
Make controlcap popup wider
2019-03-24 09:59:04 -04:00
bd5c9b5b20
add Control to ZM namespace
2019-03-24 09:58:50 -04:00
01056fc0f4
Перевод некоторых слов
2019-03-24 04:14:06 +03:00
f311fcc9e0
change to a button
2019-03-22 17:28:23 -04:00
8f28ba0be3
beter debug and less often when no terms in parseFilter
2019-03-22 17:28:12 -04:00
6d4d353209
fix namespace on MontageLayout
2019-03-22 17:27:58 -04:00
16467595d4
Fix clicking in montage
2019-03-21 17:00:51 -04:00
65fab1b032
add px to width and height of event img
2019-03-21 14:14:45 -04:00
7f7acc18ee
spacing and code doc
2019-03-21 14:14:30 -04:00
f434042c52
fix spacing
2019-03-21 14:14:15 -04:00
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
10a972f2a0
fixes to download video
2019-03-20 14:51:59 -04:00
d4353af8af
Fix eslint errors
2019-03-20 14:51:39 -04:00
a5366d522d
Fixup exporting
2019-03-20 14:29:05 -04:00
ae7391689b
Add some code doc
2019-03-20 14:28:19 -04:00
ad059f985e
spacing
2019-03-20 14:27:23 -04:00
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
6efeab5f8d
improve readability of parseFilter
2019-03-20 14:26:48 -04:00
b988ce0573
more parentheses to make logic more clear
2019-03-20 14:26:35 -04:00
c3324ada18
Put back mkdir ZM_PATH_SOCKS
2019-03-20 14:26:03 -04:00
84a200395e
spacing and turn off errors because ajax should only return json
2019-03-20 14:25:34 -04:00
52e66adc99
Fix namespace
2019-03-20 14:25:12 -04:00
a634d8b774
use id instead of this->data when loading Event to delete in API
2019-03-19 17:26:20 -04:00
0623afb0ae
add language entry for Monitor DefaultCodec
2019-03-19 12:19:58 -04:00
71cd024fda
spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown
2019-03-19 12:16:31 -04:00
6b6e787e4e
fix ajax stream code
2019-03-19 12:05:45 -04:00
418276ff1c
cleanup/debug
2019-03-19 12:02:42 -04:00
3f9564c10a
Merge branch 'master' into storageareas
2019-03-19 10:37:35 -04:00
428f7e8e8f
create setup_onclick and disable_onclick in the monitor object. Use it to setup and disable the click event when editing/cancelling layout editing
2019-03-19 10:24:30 -04:00
72b87a7c00
Add code to be a bit more careful about not deleting all events when an incomplete event object is used.
2019-03-19 09:36:58 -04:00
2c1c9fe6cd
fix missing ZM namespaces
2019-03-19 09:23:35 -04:00
1d3af44d02
Fix namespace Warning
2019-03-19 09:13:56 -04:00
ad5f6a8729
Camera reboot function ( #2554 )
...
* Adding a button for camera reboot function
This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.
* Adding reboot function option to contorl configuration
This patch adds a reboot option to the camera control configuration
view.
* Adding Reboot field to Controls table
This patch adds a Reboot field to the Controls table to support
a camera reboot control option.
* Correcting button value to match reset
* Updating language files
I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.
* Add missing forward slash
2019-03-18 14:49:05 -04:00
520c41da23
Merge ../ZoneMinder.connortechnology.bad into storageareas
2019-03-18 14:40:03 -04:00
06eb38f802
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-03-18 11:24:33 -04:00
9482207f5c
revert namespace stuff in index.php
2019-03-18 11:24:28 -04:00
3c31dd63ce
Use zm_session_start() for API auth. Fixes #2547
2019-03-11 00:27:46 -07:00
abb6ef1688
API: Escape 'named' params for SQLi in two more Event endpoints.
...
Fixes #2099
2019-03-11 00:21:51 -07:00
056b96f7fc
API: Monitor and Event 'index' SQLi. Fixes #2099
2019-03-11 00:21:51 -07:00
ac547e0d5d
Don't scroll to the top of the page when force/cancel alarm is clicked
2019-03-10 20:58:24 -07:00
e6220e9d07
Fix eslint issues in cycle.js
2019-03-10 20:56:08 -07:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
24665264a2
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-05 20:16:05 -05:00
fa124eb29a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-03-05 14:35:15 -05:00
f0f2b6a17c
implement click_automove and submitToMontrageReview for onclick handlers
2019-03-05 14:35:02 -05:00
5a66969fd1
change buttons from inputs to buttons. Add submit to montagereview. get rid of onclick handlers
2019-03-05 14:34:34 -05:00
7b7a58b2f1
remove old xhtml-isms
2019-03-05 14:33:03 -05:00
0022dbfb76
add a newline to improve readability
2019-03-05 14:31:39 -05:00
e59eb510e3
update and fix the donate popup
2019-03-05 13:10:04 -05:00
73ae3f49ed
Merge branch 'master' into storageareas
2019-03-05 11:35:55 -05:00
36b00d09e3
fix destination view on the monitors view
2019-03-05 11:02:58 -05:00
7779edb485
Fix saving multiple monitors at once by moving the relevant code to includes/actions/monitors.php
2019-03-05 11:02:37 -05:00
8053f61a08
fix eslint missing {}
2019-03-05 11:02:09 -05:00
76ee31bf68
fix eslint missing {}
2019-03-05 11:01:58 -05:00
49a1954f96
fix typo and remove deprecated DefaultView
2019-03-05 11:01:39 -05:00
8b29c5f54c
Fix typo: Ineterval to Interval
2019-03-05 10:58:23 -05:00
f446e73ff7
Typo: AnalysisUpdateDelete to AnalysisUpdateDelay
2019-03-05 10:55:27 -05:00
778707c8df
Merge branch 'master' into storageareas
2019-03-04 14:33:28 -05:00
7cee8356bd
Fix setting frame width when changing from fixed width to scaled
2019-03-04 13:43:03 -05:00
96e29c0299
fix up remaining issues with cycle updates
2019-03-04 13:35:40 -05:00
e9a6eee2bb
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-01 17:47:50 -05:00
190142b24c
Merge branch 'master' into storageareas
2019-03-01 17:47:07 -05:00
ff8c5c5db8
remove debug
2019-03-01 17:28:00 -05:00
78513e22fd
When doing an OPTIONS just do CORS and exit. if xmlHttpRequest don't do a redirect login. Do a failed auth header and quit
2019-03-01 17:27:08 -05:00
7703661cb1
Don't use streaming port in UrlToIndex because xmlHttpRequest won't send cookies to a different port
2019-03-01 17:25:17 -05:00
520bd4e7a7
Add ZM namespace to Logger
2019-03-01 14:42:05 -05:00
05bc57e245
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-01 14:27:30 -05:00
466c379e94
Merge branch 'master' into storageareas
2019-03-01 14:03:49 -05:00
675b4975b0
Fix control presets
2019-03-01 13:37:34 -05:00
2d75ab50af
Implement deleting from Logs based on line count instead of interval
2019-02-28 16:12:34 -05:00
20fe502ca4
Add ZM to ErrorHandler. Spacing and quotes
2019-02-27 12:02:40 -05:00
2db030265b
Merge branch 'master' into storageareas
2019-02-27 11:08:04 -05:00
a1f1c19c0f
fix missing ZM namepsace
2019-02-27 11:07:52 -05:00
af9c87a112
Merge branch 'master' into storageareas
2019-02-27 10:53:19 -05:00
6e4444099b
Only populate session with user info on successful login. Use parameters in sql when loading users in getAuthUser. Fixes #2542
2019-02-27 09:57:50 -05:00
804c384b4c
add Event Notification support to server
2019-02-27 09:29:11 -05:00
a7ca75758b
add Event Notification label
2019-02-27 09:29:00 -05:00
c0ae7820bb
add zmeventnotification to Server object
2019-02-27 09:28:36 -05:00
4c35f2910c
fix ZM namespace
2019-02-26 18:09:18 -05:00
df3e11d83c
Fix authentication in api because we no longer store the user object in the session
2019-02-26 17:01:45 -05:00
95567e07a4
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-26 11:43:07 -05:00
a00e2381b7
Merge branch 'master' into storageareas
2019-02-26 11:33:29 -05:00
92dc7878de
Fix 2340 ( #2368 )
...
* include includes/functions.php so that we have access to all it's contents
* add a beforeDelete function which deletes the files. Add other needed functions like Path() LinkPath() etc.
* add require_once for Storage and functions because we use them in Event
* Now that ZM has namespaces use the ZM Event class to do the heavy lifting of delete
* Don't need functions in AppController anymore
2019-02-26 11:28:56 -05:00
5da51d51bc
Merge branch 'master' into storageareas
2019-02-26 10:55:51 -05:00
53c0fae688
Merge fix from storageareas for archive/delete in events list
2019-02-26 10:22:58 -05:00
627e9f74cf
fix spacing
2019-02-25 15:24:25 -05:00
2187dea2aa
add namespace to Warnings
2019-02-25 15:11:08 -05:00
cbd8ee80f8
add namespace for Monitor
2019-02-24 12:40:40 -05:00
3b06f3015a
redirect to console of successfullogin takes us to login
2019-02-24 10:07:42 -05:00
dd590aa729
remove warning when QUERY_STRING is not set
2019-02-24 10:05:45 -05:00
46c6735311
Missing namespace on filter. Fixes #2541
2019-02-24 10:02:49 -05:00
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
45778384a6
Merge branch 'release-1.32'
2019-02-22 11:24:23 -05:00
9a2dd06e1d
Fix use of empty which isn't supported in old php. Remove the code entirely as I think it was just cutnpasted from somewhere else. We don't care if it is a new server or not in the validate code.
...
Fixes #2540
2019-02-22 11:22:44 -05:00
5098329d94
remove ob_clean stuff which logs errors when output buffering is turned off ( #2395 )
...
* remove ob_clean stuff which logs errors when output buffering is turned off.
* Don't ob_clean because if buffering is off php will output an error
2019-02-22 09:58:16 -05:00
2b90bf15a6
Improve session ( #2487 )
...
* Introduce ZM_COOKIE_LIFETIME which sets the life of the SESSION cookie, instead of using what is in php.ini
* Use zm specific session functions, which are now located in includes/session.php. Be more agressive about clearing session on logout.
* Move session code to includes/session.php
* remove duplicate line
* Move is_session_open to session.php. Move code to clear a session into session.php
* improve debug line when there is a problem updating config entry
* split description into description and help text for COOKIE_LIFETIME
* Remove redirect on line. We do it in javascript on postlogin view so that we can say logging in before switching to console
* If there is a username in the session, then we are logged in, but we need to load the user object from the db. We can't just trust it from the session. The user may have been deleted and having that data in the session can be a security risk. So load the user object on every request.
* Use session_regenerate_id instead of our broken code to do the same
* Move auth code to includes/auth.php
* add autocomplete tags to username and password inputs
* Don't redirect to login if we are already viewing login. Put auth before including skin includes
* need to include session.php in auth.php
* update to php namespace
2019-02-22 09:43:38 -05:00
0a7667f2d0
Use buttons instead of divs and inputs ( #2522 )
2019-02-22 09:23:06 -05:00
410cb70ddb
get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again. ( #2534 )
2019-02-22 09:20:54 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
e087522203
remove debug
2019-02-21 14:15:10 -05:00
d93924bd89
increase width of controls popup.
2019-02-20 15:39:26 -05:00
8837015239
remove bogus test for Filter Id
2019-02-19 13:54:25 -05:00
6d1541a4d2
Merge branch 'fix_privacy_view' into storageareas
2019-02-19 12:57:01 -05:00
97a888c0db
get rid of js that just does the form submit. Upgrade the button from an input to a button. Use 0 and 1 instead of accept and decline, which allows us to pre-select the current value of ZM_TELEMETRY_DATA. So that if you had previously declined, you won't accidentally accept. This fixes the reported error that choosing decline would cause the setting to not be saved and the privacy popup to happen again.
2019-02-19 12:54:12 -05:00
fbdb5bcb62
Merge branch 'master' into storageareas
2019-02-19 12:06:32 -05:00
eaa7341935
Add missing / in path to auth.php
2019-02-19 10:07:36 -05:00
87988185e5
remove data-on-click-this from markEids[] because we have an onclick bind in initPage
2019-02-19 09:58:03 -05:00
5029d7214a
Merge branch 'master' into storageareas
2019-02-18 17:00:45 -05:00
4cd3a93e96
add missing /
2019-02-18 16:30:03 -05:00
b646284da3
don't quote dbEscape values it will quote it already ( #2529 )
2019-02-17 11:31:28 -05:00
04c17283ec
need to prefix with _dir_ otherwise relative to initial script ( #2531 )
2019-02-17 11:31:10 -05:00
b7a6aed1cd
Merge branch 'master' into storageareas
2019-02-16 11:51:23 -05:00
34873d5636
We must leave ZM_HOME_CONTENT unescaped so that we can insert actual html like image tags
2019-02-16 11:50:09 -05:00
6156aa2af9
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-15 10:49:06 -05:00
b25770a2f0
Merge branch 'master' into storageareas
2019-02-13 11:52:31 -05:00
d0745da11c
fix path to Control.php
2019-02-13 11:52:16 -05:00
a41e8a8834
Merge branch 'master' into storageareas
2019-02-13 11:38:38 -05:00
400d4dc27e
encode the label on the preset so that weird characters and quotes don't break the button
2019-02-13 11:24:09 -05:00
dd641793a2
Merge branch 'improve_session' into storageareas
2019-02-13 11:17:30 -05:00
91a280e56e
need to include session.php in auth.php
2019-02-13 11:17:15 -05:00
3d6efe2253
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-13 11:10:07 -05:00
d1b3b23c09
Merge branch 'master' into storageareas
2019-02-13 09:42:03 -05:00
b6a0e704d2
whitespace, remove xhtml cruft
2019-02-12 16:41:08 -05:00
7a8668ea99
whitespace
2019-02-12 16:40:48 -05:00
Isaac Connor
Isaac Connor
Isaac Connor
Pliable Pixels
Tom Hodder
fri.K
fri.K
Pliable Pixels
Jonathan Meredith
Steve Root
Javier González Calleja
andornaut
Andrew Bauer
Andrew Bauer
Andrew Bauer
santos995
Chris
Matthew Noorenberghe
Mitch Capper