Isaac Connor
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
Isaac Connor
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
Isaac Connor
d7680e1a44
Spacing
2020-05-23 10:15:48 -04:00
Isaac Connor
3f50277e1c
Revert effort to escape column names. Not smart enough.
2020-05-12 09:21:05 -04:00
Isaac Connor
eadff23465
Fix missing )
2020-05-12 09:16:37 -04:00
Isaac Connor
c5f082e7ac
fix escaping column names
2020-05-12 09:06:57 -04:00
Isaac Connor
582102c2c6
Fix use of backticks for newer mysql
2020-05-11 09:19:16 -04:00
Isaac Connor
81cd338545
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-05-11 08:34:19 -04:00
Isaac Connor
d23258cb23
Allow for backticks in sort column
2020-05-11 08:34:07 -04:00
Isaac Connor
f1d794c11b
spacing and escape sql fields
2020-05-07 13:57:37 -04:00
Isaac Connor
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
Isaac Connor
a25c3dfb5c
Add MonitorId to event data returned for status request
2020-04-10 11:11:24 -04:00
Isaac Connor
45c13176dc
cleanup. Don't output errors that break json response
2020-04-10 11:10:57 -04:00
Isaac Connor
4e58a38317
use ini_set(display_errors,0) instead of turning off errors entirely so that we still log errors, just not output them instead of json.
2020-04-03 15:21:31 -04:00
Isaac Connor
7c21f065bd
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
2020-03-02 12:07:11 -05:00
Isaac Connor
5f16c10e0a
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
2020-03-02 11:50:40 -05:00
Isaac Connor
1cbc75813c
improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:21:57 -05:00
Isaac Connor
dd0ce50c17
quotes and improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:21:30 -05:00
Isaac Connor
e8a0ed9208
quotes and improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:20:35 -05:00
Isaac Connor
1865df3fe0
remove some debug, add some parenthesis to ensure logic works as intended
2020-01-07 17:08:07 -05:00
Isaac Connor
fc017893bc
Sort the log filtering options. Fixes #2756
2019-12-20 16:09:34 -05:00
Isaac Connor
e123e689ca
fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in
2019-12-06 14:32:59 -05:00
Isaac Connor
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
Isaac Connor
c7f5673b47
Make filterFIelds global and give more info in error message
2019-10-09 10:30:40 -04:00
Isaac Connor
4126554092
Move sendControlCommand out of includes/control_functions.php into Monitor.php. Make it smarted about talking to zmcontrol.pl. Fix sending the quit command
2019-10-08 18:07:33 -04:00
Isaac Connor
e4b5052fb4
Add delete from logs ajax capability. Make the clear button use it. Fixes #2620
2019-10-02 15:39:04 -04:00
Isaac Connor
ae7644370f
quotes
2019-09-28 14:14:27 -04:00
Isaac Connor
afd10e49d6
spaces, quotes extra braces
2019-09-25 10:13:32 -04:00
Isaac Connor
481f5b7eac
Update control ajax
2019-09-20 10:36:38 -04:00
Isaac Connor
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
Isaac Connor
ed9175b4ad
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2019-08-13 15:34:11 -04:00
Isaac Connor
547e80b1a9
Fix download and export button from events list. Fixes #2668 ( #2670 )
2019-07-24 12:31:43 -04:00
Isaac Connor
cfca67f663
spacing and quotes
2019-06-07 14:07:23 -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
077ad75516
Merge branch 'storageareas' into origin/zma_to_thread
2019-04-25 12:41:48 -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
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
6b6e787e4e
fix ajax stream code
2019-03-19 12:05:45 -04:00
Isaac Connor
418276ff1c
cleanup/debug
2019-03-19 12:02:42 -04:00
Isaac Connor
e9a6eee2bb
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-01 17:47:50 -05:00
Isaac Connor
190142b24c
Merge branch 'master' into storageareas
2019-03-01 17:47:07 -05:00
Isaac Connor
520bd4e7a7
Add ZM namespace to Logger
2019-03-01 14:42:05 -05:00
Isaac Connor
95567e07a4
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-26 11:43:07 -05:00
Isaac Connor
279e0d8bcf
Merge branch 'storageareas' into zma_to_thread
2019-02-22 11:39:58 -05:00
Isaac Connor
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
Isaac Connor
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
Isaac Connor
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05:00