Isaac Connor
|
4ef28bb30d
|
don't put the leading / in the cache link
|
2017-11-03 09:22:43 -04:00 |
|
Isaac Connor
|
31b756bd53
|
add missing tests for StartDateTime etc
|
2017-11-03 07:18:30 -04:00 |
|
Isaac Connor
|
495cd580aa
|
add more debugging
|
2017-11-02 11:45:49 -04:00 |
|
Isaac Connor
|
a8b679e479
|
set frameCount for audio packets too so that a long period of just audio will return and update lastframesent etc.
|
2017-11-02 11:45:33 -04:00 |
|
Isaac Connor
|
5aa61cf1f5
|
unset the ref so that last monitor isn't duplicated
|
2017-11-02 07:59:25 -04:00 |
Isaac Connor
|
ca758a6099
|
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
|
2017-11-01 12:02:43 -07:00 |
|
Isaac Connor
|
866c875312
|
Merge branch 'storageareas' into tesla
|
2017-11-01 12:01:51 -07:00 |
|
Isaac Connor
|
cb01b96dc0
|
fixes
|
2017-11-01 12:01:11 -07:00 |
Isaac Connor
|
f0cfebe719
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-01 13:11:49 -04:00 |
|
Isaac Connor
|
1aea1517bf
|
put back old behaviour for add monitor
|
2017-11-01 13:09:14 -04:00 |
|
Isaac Connor
|
fe5cbea3e5
|
Merge branch 'storageareas' into tesla
|
2017-11-01 13:08:24 -04:00 |
|
Isaac Connor
|
c5182f68ee
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-11-01 13:08:06 -04:00 |
|
Isaac Connor
|
eb2ee76f57
|
disable and re-enabled onclick action when editing layout/cancelling edit
|
2017-11-01 13:08:01 -04:00 |
|
Isaac Connor
|
96e0959c35
|
clear the cookie for zmMontageLayout
|
2017-11-01 13:07:35 -04:00 |
|
Isaac Connor
|
0af389c984
|
populate the Id of the layout when inserting it
|
2017-11-01 13:07:24 -04:00 |
|
Isaac Connor
|
6217351318
|
Merge pull request #46 from MalakymR/patch-1
Add default for UpdateDiskSpace in zm_create.sql
|
2017-11-01 10:07:03 -07:00 |
MalakymR
|
5852147678
|
Add default for UpdateDiskSpace in zm_create.sql
Add default for UpdateDiskSpace
|
2017-11-01 16:51:01 +00:00 |
|
Isaac Connor
|
a7f590a28d
|
add value for the DiskSpace column
|
2017-11-01 12:37:08 -04:00 |
|
Isaac Connor
|
d4080dcdbd
|
when saving a new layout, auto-select it
|
2017-11-01 12:19:27 -04:00 |
|
Isaac Connor
|
ac9116e78b
|
add connkey to logging so I can tell which process is which
|
2017-11-01 12:01:12 -04:00 |
|
Isaac Connor
|
8e010b3bd0
|
get rid of experimental code to fix monitor layout. Apparently draggable does it all for us.
|
2017-11-01 12:00:48 -04:00 |
|
Isaac Connor
|
ac6964b159
|
add position clearing to other Layouts
|
2017-11-01 11:56:18 -04:00 |
|
Isaac Connor
|
b1cb83c8ff
|
Freeform layout has to clear left,top,bottom,right
|
2017-11-01 11:53:45 -04:00 |
|
Isaac Connor
|
445fbb06d6
|
clearFix so that #monitors actually has a height
|
2017-11-01 11:52:59 -04:00 |
|
Isaac Connor
|
a9d4dfac45
|
fix the file extension so that mime type works better
|
2017-11-01 11:52:32 -04:00 |
|
Isaac Connor
|
36e13039c7
|
Switch to LONGTEXT FROM JSON type
|
2017-11-01 11:05:21 -04:00 |
|
Isaac Connor
|
25210b7ecf
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-11-01 09:41:22 -04:00 |
|
Isaac Connor
|
e6918cd1bd
|
implement crude cache busting code for .js and .css files
|
2017-11-01 09:41:19 -04:00 |
|
Isaac Connor
|
33771f92e9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-10-31 13:32:47 -07:00 |
|
Isaac Connor
|
9473fbecd8
|
more debug
|
2017-10-31 13:32:42 -07:00 |
|
Isaac Connor
|
c9d52b47ba
|
add debug
|
2017-10-31 13:29:49 -07:00 |
|
Isaac Connor
|
ab1c9f7c98
|
add more debugging
|
2017-10-31 16:27:43 -04:00 |
|
Isaac Connor
|
3deb8a35bb
|
fixes
|
2017-10-30 21:38:27 -04:00 |
|
Isaac Connor
|
b5491102ef
|
Fix saving MontageLayouts
|
2017-10-30 20:21:16 -04:00 |
|
Isaac Connor
|
ce6cc24de5
|
turn off debug
|
2017-10-30 20:20:40 -04:00 |
|
Isaac Connor
|
52110adfa9
|
update code because we are now including the entire object in the layouts array
|
2017-10-30 16:32:14 -04:00 |
|
Isaac Connor
|
efe8b2db7e
|
update code because we are now including the entire object in the layouts array
|
2017-10-30 16:32:03 -04:00 |
|
Isaac Connor
|
c69e2468b0
|
add edit and save layout
|
2017-10-30 16:30:15 -04:00 |
|
Isaac Connor
|
207b66c8fa
|
add Edit Layout
|
2017-10-30 16:29:46 -04:00 |
|
Isaac Connor
|
1694eeb436
|
debugging and code simplification
|
2017-10-30 16:29:27 -04:00 |
|
Isaac Connor
|
97757ba6cd
|
add Inserting when saving
|
2017-10-30 16:29:13 -04:00 |
|
Isaac Connor
|
01acd154f9
|
fix adding Layouts
|
2017-10-30 16:28:55 -04:00 |
|
Isaac Connor
|
a6c790b374
|
use a shared include for the filters bar
|
2017-10-30 07:37:08 -07:00 |
|
Isaac Connor
|
f420dde04d
|
fix quotes
|
2017-10-30 09:05:08 -04:00 |
|
Isaac Connor
|
8312bf52a4
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-10-30 08:37:54 -04:00 |
|
Isaac Connor
|
ae8bfadcf7
|
use static logging method
|
2017-10-27 21:13:14 -07:00 |
|
Isaac Connor
|
b3d65729da
|
apache style logging function take a logging object
|
2017-10-27 21:13:01 -07:00 |
|
Isaac Connor
|
2003798e64
|
copy in start and end transaction
|
2017-10-27 21:06:11 -07:00 |
|
Isaac Connor
|
ad96d29b31
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-10-27 21:04:00 -07:00 |
|
Isaac Connor
|
2d6998ad25
|
fix debug_all
|
2017-10-27 20:54:54 -07:00 |