2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
c71a4fd690
fix spacing
2017-06-05 15:36:37 -04:00
08d505360d
spacing
2017-06-05 15:22:32 -04:00
ad4264dad7
spacing
2017-06-05 15:21:27 -04:00
36ae355a2c
spacing, braces
2017-06-05 15:21:07 -04:00
e1da754ff1
scale zones svg as well when changing width/height/scale
2017-06-05 13:25:27 -04:00
2a45cd02ca
sync some missing styles from classic
2017-06-05 12:49:39 -04:00
bfa724d06c
fix spacing
2017-06-05 11:11:34 -04:00
a9183a1599
more quotes
2017-06-05 09:40:19 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
be77269acb
fix merge messup
2017-06-04 17:40:54 -04:00
07835969f1
get rid of viewport line that prevents zooming in and out
2017-06-04 17:31:17 -04:00
a9268d10e3
fix the use of ZM_OPT constants in javascript. Instead, check for existence of the element in the form.
2017-06-02 12:21:12 -04:00
555a667035
fix filter button
2017-06-02 12:12:59 -04:00
352ea6b6ae
spacing
2017-06-02 12:12:41 -04:00
cbc1636b11
Update danish translation file
2017-06-02 13:26:30 +02:00
e47adcf6cc
the tfoot has to come after the tbody
2017-06-01 09:36:00 -04:00
a1af422d29
the [filter][terms] etc part needs to be urlencoded as well. Becase [] are not valid in urls.
2017-06-01 09:35:38 -04:00
73ca07792b
double quotes to single quotes
2017-05-31 22:11:54 -04:00
5c67c87147
remove deprecated cellspacing attr on table
2017-05-31 22:08:44 -04:00
a940fe429c
deprecate the use of the center tag, and only put in the development h3 if it has contents
2017-05-31 22:08:05 -04:00
1df147e183
adjust spacing
2017-05-31 22:01:35 -04:00
502cb6a7d8
fix spacing
2017-05-31 21:34:38 -04:00
83da2dfa05
double to single quotes
2017-05-31 21:30:19 -04:00
98b49fb64d
quotes, spacing
2017-05-31 21:28:40 -04:00
17c8224733
begin to ahndle imageData not being populated
2017-05-31 20:55:10 -04:00
4889f3d0e8
rework logic in GetStreamImg a bit. If no frame is specified, then we can use snapshot...otherwise it should do the frame image!
2017-05-31 20:54:34 -04:00
dbeb000505
Merge ../ZoneMinder.connortechnology
2017-05-31 20:45:37 -04:00
2b9134512f
remove leftover
2017-05-31 20:45:21 -04:00
06a9598755
Merge ../ZoneMinder.connortechnology
2017-05-31 12:55:35 -04:00
8596891e4d
fix double to single quote mistakes
2017-05-31 12:55:27 -04:00
ece10d6278
braces and whitspace
2017-05-31 11:16:55 -04:00
cbe7924041
fix spacing
2017-05-30 19:53:02 -04:00
83d6f415b3
cleanup whitespace
2017-05-30 14:07:37 -04:00
b6ed806d6c
braces and comments
2017-05-30 13:51:00 -04:00
b96f5cf49d
more merges/fixes from SA
2017-05-30 13:50:24 -04:00
8b3b9eb30e
more merges/fixes from SA
2017-05-30 13:47:30 -04:00
1a43334113
Use NULLs instead of '' when saving things
2017-05-30 13:38:57 -04:00
c7b52bd998
fix logging dirs
2017-05-30 13:14:43 -04:00
e9adc3bc5b
restore SA version
2017-05-30 13:14:27 -04:00
e9a0474cf7
add back required lines with a comment
2017-05-30 12:04:12 -04:00
8a732dff8a
add back required lines with a comment
2017-05-30 12:03:31 -04:00
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -04:00
c5288a172d
fix merge problem
2017-05-30 11:57:20 -04:00
00479876f2
fix braces
2017-05-30 11:53:21 -04:00
5bbe13f98f
update cycle from SA
2017-05-30 11:53:05 -04:00
26131f8a10
double quotes to single quotes
2017-05-30 11:52:48 -04:00
a75488e0f3
flat and dark skins add some padding to the header, which makes it extend beyond 99%. These lines are not needed
2017-05-30 11:52:04 -04:00
5c5aafb1e8
white space and a check for mid being set to quiet error messages
2017-05-30 11:37:48 -04:00
59d00b20b1
fix fetchImage
2017-05-30 11:35:52 -04:00
f88abfcb4d
the liveStream element now has the monitorId appended to it, to be consistent with montage so we can reuse code
2017-05-30 11:26:57 -04:00
3062fe43f3
revert csrf on login page. csrf needs to be off in order for zmNinja to work
2017-05-30 11:25:25 -04:00
fe2155dd1a
merges from SA
2017-05-30 11:15:00 -04:00
e855ad685f
small cleanups
2017-05-30 11:14:22 -04:00
845ef6c05a
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-30 10:22:17 -04:00
32daa4faed
Merge branch 'master' into storageareas
2017-05-30 10:21:01 -04:00
c616a3b3b7
fix some bad to '' changes
2017-05-30 09:39:01 -04:00
ff08843d68
replace with ''
2017-05-30 09:10:41 -04:00
e2df0b74d4
remove including state.js.php as it has nothing to do with this pr
2017-05-29 09:51:31 -04:00
bb051fd509
fix merge conflicts
2017-05-25 15:29:31 -04:00
7cfa0b12ec
Merge branch 'dragndrop_monitor_sorting' into storageareas
2017-05-25 15:26:04 -04:00
123aaad080
add applySort function, and the sorting init code
2017-05-25 15:03:30 -04:00
229c8c6e23
Mmove Right buttons to the left, because there is no more room on the right anymore, move the script that sets up the sorting to js/console.js
2017-05-25 15:03:10 -04:00
09c0b47568
remove no longer used styles, and increase the width of the Mark Column to accomodate the up/down arrows
2017-05-25 15:02:30 -04:00
aacfea735e
always include bootstrap, and include jquery
2017-05-25 15:00:44 -04:00
afce83d289
Merge branch 'master' into dragndrop_monitor_sorting
2017-05-25 14:31:41 -04:00
31b5a99b43
remove old code to do sequence up/down arrows, replace with jquery sortable
2017-05-25 14:30:07 -04:00
043d722651
braces,whitespace
2017-05-25 14:26:49 -04:00
f1917a6bc1
delete old Makefile.am
2017-05-25 14:10:29 -04:00
b9736ad2f2
merge from sa the ajax file to apply the sorting.
2017-05-25 14:08:04 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
4347ee1258
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 10:41:40 -04:00
13265a8f4f
undo StorageAreas contents
2017-05-23 10:41:21 -04:00
75dc774a08
Continue to support non-USE_DEEP_STORAGE option
2017-05-22 21:21:49 -04:00
d988b9b6d5
improve efficiency of progress bar updating/drawing. Add some debug
2017-05-19 12:25:26 -04:00
641384f38d
spacing
2017-05-19 12:24:59 -04:00
f4008e2c6a
Merge branch 'master' into storageareas
2017-05-19 11:20:33 -04:00
9e3af977e2
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 11:09:08 -04:00
c64391c98d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 11:00:37 -04:00
29b43cfd0a
Whitespace, google style, localized video.js ( #1890 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
* merge whitespace and brace changes from sa branch
* merge localized versions of js files
* merge localized versions of js files
* merge code to load video.js etc on Event view
* Merge updates from sa branch
* Update frmo SA. Use Monitor object, still hide Controls by default.
2017-05-19 10:23:51 -04:00
75ca52dba5
fix width of plus and minus buttons in filters
2017-05-19 10:18:52 -04:00
94f7194e4f
Update frmo SA. Use Monitor object, still hide Controls by default.
2017-05-18 21:48:21 -04:00
319712a4c1
Merge updates from sa branch
2017-05-18 15:16:59 -04:00
377cc94acb
Merge more changes to make video storage ui's work ( #1889 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
* merge whitespace and brace changes from sa branch
* merge localized versions of js files
* merge localized versions of js files
* merge code to load video.js etc on Event view
2017-05-18 15:11:26 -04:00
f851daca68
merge code to load video.js etc on Event view
2017-05-18 15:10:13 -04:00
5500d7bbc0
merge localized versions of js files
2017-05-18 15:05:57 -04:00
bf3db69cbe
merge localized versions of js files
2017-05-18 15:05:10 -04:00
bc1a2dcb21
whitespace & braces
2017-05-18 14:55:53 -04:00
3ccf7e102e
fix Debug to Logger::Debug
2017-05-18 14:50:17 -04:00
57d07aef22
merge whitespace and brace changes from sa branch
2017-05-18 14:44:06 -04:00
2da374bfb1
log the command as well as output and return values
2017-05-18 14:43:17 -04:00
44c07c4e7a
put back proper sql
2017-05-18 14:42:55 -04:00
84a224d712
put back the AS E
2017-05-18 14:39:58 -04:00
4763ace165
Merge branch 'master' into storageareas
2017-05-18 14:24:09 -04:00
da33cbe1f9
fix
2017-05-18 14:09:46 -04:00
158741a7d8
fix whitespace
2017-05-18 14:07:56 -04:00
319ad7fede
fix whitespace
2017-05-18 14:07:51 -04:00
8b0f319834
fix whitespace
2017-05-18 14:06:13 -04:00
9fd9a75669
fix whitespace, braces, simplify sql
2017-05-18 14:04:24 -04:00
29bcab9204
fix Debug to Logger::Debug
2017-05-18 13:54:06 -04:00
Andrew Bauer
Isaac Connor
Jørgen Edelbo
Isaac Connor