Isaac Connor
|
c71a4fd690
|
fix spacing
|
2017-06-05 15:36:37 -04:00 |
|
Isaac Connor
|
08d505360d
|
spacing
|
2017-06-05 15:22:32 -04:00 |
|
Isaac Connor
|
e1da754ff1
|
scale zones svg as well when changing width/height/scale
|
2017-06-05 13:25:27 -04:00 |
|
Isaac Connor
|
2a45cd02ca
|
sync some missing styles from classic
|
2017-06-05 12:49:39 -04:00 |
|
Isaac Connor
|
bfa724d06c
|
fix spacing
|
2017-06-05 11:11:34 -04:00 |
|
Isaac Connor
|
451714a403
|
Merge branch 'master' into storageareas
|
2017-06-04 21:42:56 -04:00 |
|
Isaac Connor
|
be77269acb
|
fix merge messup
|
2017-06-04 17:40:54 -04:00 |
|
Isaac Connor
|
07835969f1
|
get rid of viewport line that prevents zooming in and out
|
2017-06-04 17:31:17 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
555a667035
|
fix filter button
|
2017-06-02 12:12:59 -04:00 |
|
Isaac Connor
|
352ea6b6ae
|
spacing
|
2017-06-02 12:12:41 -04:00 |
|
Isaac Connor
|
e47adcf6cc
|
the tfoot has to come after the tbody
|
2017-06-01 09:36:00 -04:00 |
|
Isaac Connor
|
73ca07792b
|
double quotes to single quotes
|
2017-05-31 22:11:54 -04:00 |
|
Isaac Connor
|
5c67c87147
|
remove deprecated cellspacing attr on table
|
2017-05-31 22:08:44 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
1df147e183
|
adjust spacing
|
2017-05-31 22:01:35 -04:00 |
|
Isaac Connor
|
502cb6a7d8
|
fix spacing
|
2017-05-31 21:34:38 -04:00 |
|
Isaac Connor
|
83da2dfa05
|
double to single quotes
|
2017-05-31 21:30:19 -04:00 |
|
Isaac Connor
|
98b49fb64d
|
quotes, spacing
|
2017-05-31 21:28:40 -04:00 |
|
Isaac Connor
|
17c8224733
|
begin to ahndle imageData not being populated
|
2017-05-31 20:55:10 -04:00 |
|
Isaac Connor
|
dbeb000505
|
Merge ../ZoneMinder.connortechnology
|
2017-05-31 20:45:37 -04:00 |
|
Isaac Connor
|
2b9134512f
|
remove leftover
|
2017-05-31 20:45:21 -04:00 |
|
Isaac Connor
|
06a9598755
|
Merge ../ZoneMinder.connortechnology
|
2017-05-31 12:55:35 -04:00 |
|
Isaac Connor
|
8596891e4d
|
fix double to single quote mistakes
|
2017-05-31 12:55:27 -04:00 |
|
Isaac Connor
|
ece10d6278
|
braces and whitspace
|
2017-05-31 11:16:55 -04:00 |
|
Isaac Connor
|
cbe7924041
|
fix spacing
|
2017-05-30 19:53:02 -04:00 |
|
Isaac Connor
|
83d6f415b3
|
cleanup whitespace
|
2017-05-30 14:07:37 -04:00 |
|
Isaac Connor
|
b96f5cf49d
|
more merges/fixes from SA
|
2017-05-30 13:50:24 -04:00 |
|
Isaac Connor
|
8b3b9eb30e
|
more merges/fixes from SA
|
2017-05-30 13:47:30 -04:00 |
|
Isaac Connor
|
e9adc3bc5b
|
restore SA version
|
2017-05-30 13:14:27 -04:00 |
|
Isaac Connor
|
0e643f0f93
|
Merge branch 'master' into storageareas
|
2017-05-30 11:58:38 -04:00 |
|
Isaac Connor
|
5bbe13f98f
|
update cycle from SA
|
2017-05-30 11:53:05 -04:00 |
|
Isaac Connor
|
26131f8a10
|
double quotes to single quotes
|
2017-05-30 11:52:48 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
5c5aafb1e8
|
white space and a check for mid being set to quiet error messages
|
2017-05-30 11:37:48 -04:00 |
|
Isaac Connor
|
59d00b20b1
|
fix fetchImage
|
2017-05-30 11:35:52 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
bb051fd509
|
fix merge conflicts
|
2017-05-25 15:29:31 -04:00 |
|
Isaac Connor
|
7cfa0b12ec
|
Merge branch 'dragndrop_monitor_sorting' into storageareas
|
2017-05-25 15:26:04 -04:00 |
|
Isaac Connor
|
123aaad080
|
add applySort function, and the sorting init code
|
2017-05-25 15:03:30 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
aacfea735e
|
always include bootstrap, and include jquery
|
2017-05-25 15:00:44 -04:00 |
|
Isaac Connor
|
afce83d289
|
Merge branch 'master' into dragndrop_monitor_sorting
|
2017-05-25 14:31:41 -04:00 |
|
Isaac Connor
|
31b5a99b43
|
remove old code to do sequence up/down arrows, replace with jquery sortable
|
2017-05-25 14:30:07 -04:00 |
|
Isaac Connor
|
043d722651
|
braces,whitespace
|
2017-05-25 14:26:49 -04:00 |
|
Isaac Connor
|
a515041e14
|
Merge branch 'master' into storageareas
|
2017-05-23 15:17:46 -04:00 |
Isaac Connor
|
13265a8f4f
|
undo StorageAreas contents
|
2017-05-23 10:41:21 -04:00 |
|
Isaac Connor
|
d988b9b6d5
|
improve efficiency of progress bar updating/drawing. Add some debug
|
2017-05-19 12:25:26 -04:00 |
|
Isaac Connor
|
641384f38d
|
spacing
|
2017-05-19 12:24:59 -04:00 |