manupap1
|
eae1357a45
|
Support plugins in web user interface
|
2014-11-12 00:53:53 +01:00 |
Andrew Bauer
|
26c9a77590
|
Update skin.js
Fix issue caused by a previous merge
|
2014-11-10 12:12:54 -06:00 |
Isaac Connor
|
2f32c3895b
|
Merge branch 'release-1.28'
Conflicts:
web/skins/flat/js/skin.js
|
2014-10-22 15:10:19 -04:00 |
|
Isaac Connor
|
c5a1d9ffa9
|
fix console refresh in this skin too
|
2014-10-22 10:58:06 -04:00 |
|
Andrew Bauer
|
23ebbf3887
|
Update skin.js
Move this line down to mitigate the problem where the console doesn't refresh.
|
2014-10-21 17:22:33 -05:00 |
|
Isaac Connor
|
8d225566b1
|
Move this line down to mitigate the problem where the console doesn't refresh.
|
2014-10-20 15:32:30 -04:00 |
|
Andrew Bauer
|
7ea003441d
|
Merge pull request #371 from m-bene/resizeWindows
Reduce window size to exclude task bar area
|
2014-10-09 14:46:46 -05:00 |
|
Isaac Connor
|
bec58a6011
|
fixes WRT to db logging. I believe fixes issue #504
|
2014-09-26 14:43:58 -04:00 |
|
Andrew Bauer
|
aa3803cb0b
|
Update functions.php
A more efficient check for IE >= 11 than the previous commit
|
2014-09-13 09:47:22 -05:00 |
|
Andrew Bauer
|
91b99b97a5
|
Update functions.php
Add logic to detect the User Agent string from IE11 (and potentially newer).
|
2014-09-13 08:19:08 -05:00 |
|
Isaac Connor
|
2018228daf
|
fix V inputs
|
2014-08-21 11:58:51 -04:00 |
|
Isaac Connor
|
6564c4359b
|
adjust monitor popup height
|
2014-08-21 11:15:35 -04:00 |
|
Isaac Connor
|
707f2e84db
|
increase monitor popup height to fit v4l settings in
|
2014-08-21 11:14:48 -04:00 |
|
Isaac Connor
|
f93a28f2be
|
fixup multibuffering so it can have a null value which makes it fall back to config table
|
2014-08-21 11:13:38 -04:00 |
|
Isaac Connor
|
0834e1b61d
|
I see no reason for these to be posts. They retrieve info, that's it.
|
2014-07-29 16:15:31 -04:00 |
|
Isaac Connor
|
96322dd59c
|
remove v4l tab that I never used
|
2014-07-29 14:45:02 -04:00 |
|
Isaac Connor
|
b2f1c2fe68
|
Merge branch 'v4l_to_monitor'
|
2014-07-24 14:35:23 -04:00 |
|
Isaac Connor
|
e065e2b3cc
|
add V4L
|
2014-07-24 11:37:10 -04:00 |
|
Isaac Connor
|
5e262f5a67
|
the var is remSockFile, not remSocketFile
|
2014-07-24 11:05:35 -04:00 |
|
Isaac Connor
|
b3f078eaa5
|
add the word disabled after function if the monitor is not enabled.
|
2014-07-23 15:46:37 -04:00 |
|
Isaac Connor
|
edd794a993
|
ensure captures_per_frame >0
add missing lang entries for MultiBuffer and CapturesPerFrame
|
2014-07-14 14:07:28 -04:00 |
|
Isaac Connor
|
9385471392
|
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
|
2014-07-13 16:39:27 -04:00 |
|
Isaac Connor
|
eb5f299512
|
increase max_socket_tries to 10 as #470
|
2014-07-11 10:51:24 -04:00 |
|
Isaac Connor
|
8f88e2a6c0
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2014-07-08 10:54:16 -04:00 |
|
Isaac Connor
|
2be38d7f32
|
fix problem editing users, a semi-colon screwed up the if statement.
Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
|
2014-07-08 10:52:55 -04:00 |
Andrew Bauer
|
371c1bae3d
|
Merge pull request #359 from knnniggett/eyezm
fix eyezm authentication issue
|
2014-07-07 17:57:48 -05:00 |
|
Andrew Bauer
|
5c8c00c1ab
|
Fix double login issue with eyezm
|
2014-07-07 17:48:33 -05:00 |
|
Isaac Connor
|
70471936a7
|
get rid of escapeSql and replace it's calls with new PDO-style calls to FetchOne FetchALl,e etc
|
2014-07-07 10:06:50 -04:00 |
|
Andrew Bauer
|
48d961082c
|
Determine full path to arp
|
2014-07-05 11:11:36 -05:00 |
|
Andrew Bauer
|
c2e2a12995
|
Merge pull request #406 from m-bene/focusPopup
focus popup windows
|
2014-07-04 13:00:45 -05:00 |
|
Andrew Bauer
|
9a0eb63df2
|
Merge pull request #415 from m-bene/selectSkin
make skin selection persistent
|
2014-07-04 12:57:37 -05:00 |
|
Andrew Bauer
|
5aad658262
|
Fixes errors when opening Filters (issue #34)
|
2014-07-04 11:00:00 -05:00 |
stevegilvarry
|
a8d60aa727
|
Fixed missing $ on ARRAY(event[id]). Fixes #455
|
2014-07-02 23:58:44 +10:00 |
|
stevegilvarry
|
61cf067be0
|
Wrap sort order. Fixes #450
|
2014-06-29 22:09:59 +10:00 |
|
Isaac Connor
|
623837115b
|
fix missing ARRAY() around params to dbFetchOne
|
2014-06-25 14:01:45 -04:00 |
|
Isaac Connor
|
5fac727c2f
|
Users tab should always be available
|
2014-06-25 13:40:37 -04:00 |
|
Isaac Connor
|
11718f0559
|
The users tab should always be available. It is useful to configure users BEFORE turning on auth.
|
2014-06-25 13:39:31 -04:00 |
tim
|
8ac6ce17bc
|
Fixed issue DateTime handling in filter queries that broke timeline view.
|
2014-06-15 13:05:25 -07:00 |
|
Isaac Connor
|
5bf894d263
|
guard against unsafe monitor name
|
2014-06-05 15:23:15 -04:00 |
|
Isaac Connor
|
0689e8453c
|
guard against dangerous (old or new) monitor names
by rogerroger288
|
2014-06-05 15:21:28 -04:00 |
|
Isaac Connor
|
baf5da9561
|
guard against monitor names being dangerous
by rogerroger288
|
2014-06-05 15:20:04 -04:00 |
|
Isaac Connor
|
5ae3cb8907
|
merge some security fixes from rogerroger288
|
2014-06-05 15:14:12 -04:00 |
Kfir Itzhak
|
5fea101294
|
Merge pull request #421 from m-bene/ffmpegoptions
Add optional options field for ffmpeg and VLC source types
|
2014-05-18 18:07:42 +03:00 |
m-bene
|
82447ebb27
|
remove unwanted comment change
|
2014-05-17 22:05:57 +02:00 |
|
m-bene
|
a81b9b8ce2
|
change examples for options
|
2014-05-17 21:48:08 +02:00 |
|
m-bene
|
f62afdb8cc
|
add select list for rtsp method for ffmpeg and libvlc
|
2014-05-17 20:41:22 +02:00 |
|
m-bene
|
de107f77ba
|
fix option help text for overlooked languages
|
2014-05-17 04:51:01 +02:00 |
|
m-bene
|
9a71a0068a
|
add help window for ffmpeg/libvlc options
|
2014-05-17 04:33:33 +02:00 |
|
m-bene
|
ceff5a98ea
|
add generic Option field to ffmpeg and libvlc cameras
|
2014-05-05 13:29:12 +02:00 |
|
m-bene
|
b197f985e0
|
make expiry date relative (~10years)
|
2014-05-01 09:53:45 +02:00 |