Andrew Bauer
|
691791c647
|
Merge pull request #458 from knnniggett/arp
Determine full path to arp
|
2014-07-05 11:17:48 -05: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
|
5508747afb
|
Merge pull request #457 from knnniggett/filter
Fixes errors when opening Filters (issue #34)
|
2014-07-04 11:34:49 -05:00 |
Andrew Bauer
|
5aad658262
|
Fixes errors when opening Filters (issue #34)
|
2014-07-04 11:00:00 -05:00 |
Andrew Bauer
|
9163536219
|
Merge pull request #358 from knnniggett/prevbutton
Fix prev button while in gapless mode. All buttons tested and working.
|
2014-07-04 10:33:05 -05:00 |
Andrew Bauer
|
841d6c50d8
|
Merge pull request #456 from SteveGilvarry/455-Flat-Skin-Export-Functions
Fixed missing $ on ARRAY(event[id]). Fixes #455
|
2014-07-02 09:13:57 -05:00 |
stevegilvarry
|
a8d60aa727
|
Fixed missing $ on ARRAY(event[id]). Fixes #455
|
2014-07-02 23:58:44 +10:00 |
Andrew Bauer
|
471014e28f
|
Merge pull request #451 from SteveGilvarry/450-log-ajax-load-order
Wrap sort order. Fixes #450
|
2014-06-29 08:01:05 -05:00 |
stevegilvarry
|
61cf067be0
|
Wrap sort order. Fixes #450
|
2014-06-29 22:09:59 +10:00 |
Isaac Connor
|
6e22278f74
|
password might be null when auth_relay is none.
|
2014-06-27 12:47:56 -04:00 |
Isaac Connor
|
07dbbd46d3
|
only do mmap on demand
|
2014-06-26 14:54:47 -04:00 |
Isaac Connor
|
8f4fb8bb64
|
fix mysql_escape_String call. Must use strlen, not sizeof
|
2014-06-26 14:44:37 -04:00 |
Isaac Connor
|
e2987067f4
|
add avtools instead of ffmpg
|
2014-06-26 13:09:52 -04:00 |
Isaac Connor
|
90b06060af
|
fix missing ExtendAlarmFrames column when add Default ZonePreset
|
2014-06-26 11:17:09 -04:00 |
Isaac Connor
|
20bccdf431
|
use the size of the username and password when calling mysql_escape_string
|
2014-06-25 16:23:10 -04:00 |
Isaac Connor
|
79b7792466
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
Conflicts:
scripts/zmdc.pl.in
|
2014-06-25 15:30:04 -04:00 |
Isaac Connor
|
c58c4a9720
|
add the glue to define HOST_OS and use it to detect BSD and use different arguments to killall
|
2014-06-25 15:28:10 -04:00 |
Isaac Connor
|
676c73e26e
|
Merge pull request #445 from clandmeter/busybox-compat
scripts: BusyBox compatibility
|
2014-06-25 15:24:51 -04: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 |
Carlo Landmeter
|
b2323cb36d
|
scripts: BusyBox compatibility
BusyBox killall does not support long options using short options instead
|
2014-06-25 11:19:15 +02:00 |
Isaac Connor
|
f2eddf0850
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2014-06-24 11:22:34 -04:00 |
Isaac Connor
|
0592276f53
|
fix mysql_escape_string calls after referring to docs
|
2014-06-24 11:22:08 -04:00 |
Kyle Johnson
|
229cfcaa5b
|
Find the last occurrence of '@' in the host string. Fixes #443
|
2014-06-23 14:22:27 -04:00 |
Kyle Johnson
|
89209fbe4b
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2014-06-23 14:21:04 -04:00 |
Isaac Connor
|
924e65f42c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2014-06-20 12:43:07 -04:00 |
Isaac Connor
|
0f4e9eb3e4
|
add these dependencies, apparently they are required for sftp upload
|
2014-06-17 10:54:42 -04:00 |
Isaac Connor
|
03abd3c936
|
Merge pull request #442 from Tim-Craig/master
Fixed issue DateTime handling in filter queries that broke timeline view...
|
2014-06-17 10:37:56 -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
|
b48d06b279
|
change commands to handle if db already has the User and Pass fields
|
2014-06-13 16:09:01 -04:00 |
Kyle Johnson
|
5e7cdc44a8
|
Made the contribution section of the readme more clear
|
2014-06-11 09:33:15 -04:00 |
Kyle Johnson
|
0aa5591774
|
Changes to the Contribution section of the readme
|
2014-06-11 09:30:30 -04:00 |
Kyle Johnson
|
047cff8038
|
Added contribution and development tips to README
|
2014-06-10 15:43:25 -04:00 |
Kfir Itzhak
|
a9cd6caeaf
|
Minor corrections to cURL code
|
2014-06-06 09:35:02 +03:00 |
Kfir Itzhak
|
caa0cb0fd5
|
Bump version to v1.27.1 to fix upgrade db issues
|
2014-06-06 08:58:35 +03: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
|
93aed26a00
|
escape username and password inside zm_user
by rogerroger288
|
2014-06-05 15:18:02 -04:00 |
Isaac Connor
|
5ae3cb8907
|
merge some security fixes from rogerroger288
|
2014-06-05 15:14:12 -04:00 |
Kyle Johnson
|
fa2371f8e6
|
Merge pull request #438 from bountysource-support/patch-1
Add Bountysource badge to README
|
2014-06-05 10:58:19 -04:00 |
bountysource-support
|
007eadeb19
|
Add Bountysource badge to README
Because you have some open bounties, we thought you might want to display this badge in your README!
|
2014-06-04 14:42:42 -07:00 |
Isaac Connor
|
a73e367d5e
|
add libav-tools as an option instead of ffmpeg
|
2014-06-04 11:21:43 -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 |