Isaac Connor
|
bbc2c2a607
|
Crud has more than 1 friend
|
2020-11-12 13:27:10 -05:00 |
Andrew Bauer
|
c8efddddf5
|
fix typo
|
2020-11-12 12:27:06 -06:00 |
|
Isaac Connor
|
df783f4835
|
Merge branch 'master' into zma_to_thread
|
2020-11-12 12:53:55 -05:00 |
|
Isaac Connor
|
15f1175f25
|
spacing
|
2020-11-12 12:36:36 -05:00 |
|
Isaac Connor
|
de74a15ab1
|
Move diag_fifo pipes in SOCKS_DIR instead of assigned Storage area. Storage areas could be a fs that cannot handle sockets or fifos like NFS.
|
2020-11-12 11:53:51 -05:00 |
|
Isaac Connor
|
645dca6bc9
|
Use FriendsOfCake 3.2.0 Crud
|
2020-11-12 09:59:32 -05:00 |
|
Isaac Connor
|
7faf774cd0
|
Use FriendsOfCake crud 3.2.0
|
2020-11-12 09:15:02 -05:00 |
Isaac Connor
|
52b4c6b089
|
Merge pull request #3076 from BlueMax/zmlinkcontent
Honor conf.d (zmlinkcontent.sh)
|
2020-11-11 20:48:05 -05:00 |
|
Isaac Connor
|
f91dcc9b60
|
declar rc as int
|
2020-11-11 20:05:47 -05:00 |
Bluemax
|
02f2c86d43
|
Honor conf.d (zmlinkcontent.sh)
Signed-off-by: Bluemax <1403092+BlueMax@users.noreply.github.com>
|
2020-11-12 01:32:15 +01:00 |
|
Isaac Connor
|
77c177c482
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-11 17:43:40 -05:00 |
|
Isaac Connor
|
9636a76ccf
|
drop db lock before reporting mysql_errors
|
2020-11-11 17:42:29 -05:00 |
|
Isaac Connor
|
7b764d04d3
|
Fix use of next when it should be return. Improve some logging of errors.
|
2020-11-11 17:40:31 -05:00 |
|
Isaac Connor
|
95f8aad19b
|
Fix detection of filter['id']
|
2020-11-11 17:39:55 -05:00 |
|
Isaac Connor
|
fe733fe1e6
|
Must use & instead of & in filter redirect
|
2020-11-11 17:39:37 -05:00 |
|
Isaac Connor
|
73e8c04b6f
|
Fix encoding of = in filter['Id']. Fixes redirect after saving
|
2020-11-11 17:39:20 -05:00 |
|
Isaac Connor
|
076d649189
|
Include Record Monitors in zmtrigger
|
2020-11-11 16:12:30 -05:00 |
|
Isaac Connor
|
4fdf7f79ae
|
Include Record monitors in zmtrigger.
|
2020-11-11 16:05:58 -05:00 |
|
Isaac Connor
|
f855f207e2
|
Limit that # of db frames to buffer to 120 because the sql will exceed 8192.
|
2020-11-11 14:03:08 -05:00 |
|
Isaac Connor
|
d663683f47
|
Add a bunch of debug statements to figure out crash
|
2020-11-11 12:43:41 -05:00 |
|
Isaac Connor
|
2c5b13d001
|
Revert to FriendsOfCake instead of our fork, as they have merged our patch.
|
2020-11-11 12:09:25 -05:00 |
|
Isaac Connor
|
77c810d43b
|
Merge branch 'master' of github.com:connortechnology/ZoneMinder
|
2020-11-11 12:09:08 -05:00 |
|
Isaac Connor
|
736e108b66
|
Revert to FriendsOfCake instead of our fork, as they have merged our patch.
|
2020-11-11 12:04:55 -05:00 |
|
Isaac Connor
|
52c7cc5869
|
reorganize code. Remove Server caching as it is done in Object.php.
|
2020-11-11 11:49:44 -05:00 |
|
Isaac Connor
|
0aef0adf48
|
Fix more Monitors.Id => Monitor_Status.MonitorId
|
2020-11-11 11:32:54 -05:00 |
|
Isaac Connor
|
330023f65b
|
Move Events totals to Monitor_Status instead of Monitors
|
2020-11-11 09:30:39 -05:00 |
|
Isaac Connor
|
b4aacde5bf
|
Remove debug. Auth is pretty solid these days
|
2020-11-10 13:15:46 -05:00 |
|
Isaac Connor
|
5b10fff2a0
|
Use cached objects when using new instead of only find_one
|
2020-11-10 13:14:36 -05:00 |
|
Isaac Connor
|
8f456e7c3d
|
Add a useful warning message regarding the update needing SUPER prvilege
|
2020-11-10 12:38:10 -05:00 |
|
Isaac Connor
|
cda3824a25
|
Use INSERT.. ON DUPLICATE... instead of REPLACE INTO. REPLACE INTO deletes the existing row. Since we now have event counts in there, we lose them.
|
2020-11-10 12:33:10 -05:00 |
|
Isaac Connor
|
b3e3fea79f
|
Update summary event count tables
|
2020-11-09 12:26:14 -05:00 |
|
Isaac Connor
|
4b4863c44a
|
Fix remaining references to MonitorStatus.Id
|
2020-11-06 16:07:40 -05:00 |
|
Isaac Connor
|
2e7aa17882
|
Fix triggers that update Storage
|
2020-11-06 14:32:21 -05:00 |
|
Isaac Connor
|
691ff5881d
|
Fix some commas
|
2020-11-06 14:28:11 -05:00 |
|
Isaac Connor
|
f2630b8fbc
|
Merge branch 'master' into move_event_totals_to_monitor_status
|
2020-11-06 14:17:23 -05:00 |
|
Isaac Connor
|
a3a6d94b6f
|
bump version to 1.15.14
|
2020-11-06 14:16:34 -05:00 |
|
Isaac Connor
|
9cc9461b7e
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-06 14:15:23 -05:00 |
|
Isaac Connor
|
98e296a2c8
|
Move event stat totals to Monitor_Status.
|
2020-11-06 14:15:05 -05:00 |
|
Isaac Connor
|
59403dc11b
|
Move event stat totals to Monitor_Status.
|
2020-11-06 14:00:18 -05:00 |
|
Isaac Connor
|
159b383276
|
Move event stat totals to Monitor_Status. Implement a class for them called Monitor_Status
|
2020-11-06 13:27:47 -05:00 |
|
Isaac Connor
|
63c78b43f8
|
Change event stats to Monitor_Status
|
2020-11-06 13:27:00 -05:00 |
|
Isaac Connor
|
6ed006bc60
|
rename StartTime and EndTime to StartDateTime and EndDateTime in the named query params
|
2020-11-06 12:25:04 -05:00 |
|
Isaac Connor
|
402b559b2c
|
Add StartTime and EndTime virtual fields for backwards compatability
|
2020-11-06 11:15:12 -05:00 |
|
Isaac Connor
|
27f336975c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-11-05 18:12:43 -05:00 |
|
Isaac Connor
|
68cdd2123d
|
Merge branch 'release-1.34'
|
2020-11-05 13:55:15 -05:00 |
|
Isaac Connor
|
746882ba85
|
Get rid of zmEventScaleAuto cookie. Just use the per monitor zmEventScale cookie. Fixes #3070
|
2020-11-05 13:45:02 -05:00 |
Esteban Flores
|
c4eb59442e
|
Changed "Purge By Age" filter
Changed "Purge By Age" filter, the "date" option is not available in v1.34.22. Using "End Date" as the filter parameter works just fine.
|
2020-11-05 12:27:46 -05:00 |
|
Isaac Connor
|
50b991b88d
|
Merge pull request #3067 from msLinuxNinja/master
Changed "Purge By Age" filter
|
2020-11-05 12:26:56 -05:00 |
|
Isaac Connor
|
7b8ee6af9f
|
Rework code to use Filter methods to generate advanced search functionality. Reduces sql queries to 1 or 2, using count() to populate [total] and [totalNotFiltered]. Does pagination using array_splice instead of SQL queries. Will use more ram, but reduces db load.
|
2020-11-05 12:20:49 -05:00 |
|
Isaac Connor
|
ee89eb45e6
|
Fix EndTime to EndDateTime
|
2020-11-04 18:39:02 -05:00 |