ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,002 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

4002 Commits

Author SHA1 Message Date
Andrew Bauer 72bfa0089c Merge pull request #570 from jmcastro2014/master 
Add Control 3S N5071 Dome Ptz Camera
 2014-11-12 06:49:28 -06:00
jmcastro2014 af57c177d7 Update zm_create.sql.in 
Add Control 3S N5071 Dome Ptz Camera
 2014-11-12 08:47:35 -03:00
jmcastro2014 5fe0b84b3c Create 3S.pm 
3S API Control Protocol Module
 2014-11-12 08:40:35 -03:00
Cosme Domínguez Díaz 7c8030fccf Restore README.md to 3fe5724ca0. 2014-11-11 23:06:34 +01:00
Cosme Domínguez Díaz 972dedd15a * distros/debian -> Autotools 
* distros/debian_cmake -> CMake
 2014-11-11 22:48:04 +01:00
Kyle Johnson 7b4effc3ed Remove Chart.js 2014-11-11 16:49:56 +00:00
Kyle Johnson 7f83eeafbf Do not text-align center everything 2014-11-11 14:56:45 +00:00
Kyle Johnson 942c65f1e2 Remove the existing #header from timeline 2014-11-11 14:34:34 +00:00
Kyle Johnson 1c046a7afd Added header to the timeline view 2014-11-11 14:33:35 +00:00
Kyle Johnson 09282045c6 Align the Events control buttons vertically 2014-11-11 14:31:43 +00:00
Kyle Johnson 487cd20b18 Fix typo in class name 2014-11-11 14:23:21 +00:00
Kyle Johnson 02cc5d0a6c Move Events controls to sidebar 2014-11-11 14:21:13 +00:00
Kyle Johnson 1e04e341e4 Link to paginated Events in Header 2014-11-11 14:20:03 +00:00
Kyle Johnson ea782d46b2 Move timeline link from Events to Header 2014-11-11 14:19:15 +00:00
Cosme Domínguez Díaz 964cdde2b3 Use gnutls-openssl instead of gnutls to 
fix build with CMake.
 2014-11-11 00:34:23 +01:00
Andrew Bauer 26c9a77590 Update skin.js 
Fix issue caused by a previous merge
 2014-11-10 12:12:54 -06:00
Cosme Domínguez Díaz 96859e3b11 * Use CMake instead of Autotools. 
* Some lintian love (minor fixes and cosmetic changes...)
* Don't remove database data if we are using a remote MySQL server.
 2014-11-09 14:18:14 +01:00
Isaac Connor 3fe5724ca0 Merge pull request #550 from SteveGilvarry/patch-1 
Update Ubuntu install instructions
 2014-11-08 14:58:49 -05:00
Isaac Connor 1d6dffde47 Merge pull request #560 from manupap1/rtsp_fix 
Send keepalive messages if the rtsp server supports this feature
 2014-11-08 14:53:45 -05:00
Isaac Connor b4a8ba8e8e Merge pull request #561 from manupap1/rtsp_fix2 
Use our own SSRC when sending packets on the RTP control stream
 2014-11-08 14:52:36 -05:00
Isaac Connor 35d3859aa3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-11-08 14:50:57 -05:00
Isaac Connor 3e8d49d88d add comment to improve understanding 2014-11-08 14:50:44 -05:00
manupap1 336c69e3c0 Use our own SSRC when sending packets on the control stream 2014-11-07 19:38:11 +01:00
manupap1 ea8b93be84 Use our own SSRC when sending packets on the control stream 2014-11-07 19:15:42 +01:00
manupap1 ee7d6a6254 Send keepalive messages if the rtsp server supports this feature 2014-11-07 17:39:50 +01:00
Andrew Bauer 966767e346 Update zoneminder.service.in 
Fix restart issue when using systemd
 2014-11-06 17:42:40 -06:00
Isaac Connor 17e38560d6 just update the perldoc parts 2014-11-06 10:02:34 -05:00
Andrew Bauer 23ee96c966 Merge pull request #556 from ZoneMinder/add_join 
Add a stringVector join function for future use
 2014-11-06 08:33:28 -06:00
Andrew Bauer 22a0daaac8 Merge pull request #557 from manupap1/rtsp_fix 
Fixed bug in rtsp streaming caused by a bad string concatenation
 2014-11-06 07:12:00 -06:00
manupap1 e764938a0d Fixed bug in rtsp streaming caused by a bad string concatenation 2014-11-06 10:16:28 +01:00
Isaac Connor 91986f3159 Merge pull request #555 from manupap1/rtsp_fix 
Fixed bug in rtsp streaming caused by a signed - unsigned conversion.

I like it. but please... somehelp help out with my comments above.
 2014-11-05 15:10:50 -05:00
Isaac Connor a88ce80716 Add a stringVector join function for future use 2014-11-05 14:01:48 -05:00
manupap1 fefc17b0fc Fixed bug in rtsp streaming caused by a signed - unsigned conversion. 2014-11-05 19:08:57 +01:00
Steve Gilvarry 1f73155bfd Update Ubuntu install instructions 
Removed need to install snapshot version for latest Ubuntu now that 1.28 is packaged.
 2014-11-04 07:53:51 +11:00
Kyle Johnson dfc3d70584 Remove Filters from the header 2014-11-03 13:49:48 +00:00
Kyle Johnson e8b93f0a20 Revert "Remove Filters from the header" 
This reverts commit 4b6cf9ca04.
 2014-11-03 13:49:36 +00:00
Kyle Johnson 4b6cf9ca04 Remove Filters from the header 2014-11-03 13:49:06 +00:00
Kyle Johnson 28a4de809b Show log state color in header 2014-11-02 14:54:08 +00:00
Kyle Johnson ee2e0a5aec Add Events to main nav 2014-11-02 12:42:40 +00:00
Kyle Johnson f847ad548a Added ZoneMinder logo to header 2014-11-02 12:41:40 +00:00
Kyle Johnson 91af0992bd Remove unused elements from the sidebar 2014-11-02 00:51:56 +00:00
Kyle Johnson dfa246bbf6 Add header to log and rearrange filter elements 2014-11-02 00:51:24 +00:00
Kyle Johnson 1f8d2d3b77 Add header to monitor view 2014-11-02 00:48:21 +00:00
Kyle Johnson 23b367614b Use <a> elements intead of makePopupLink() in header 2014-11-02 00:47:32 +00:00
Kyle Johnson 1436414ddc Add header to main views 2014-11-02 00:47:14 +00:00
Kyle Johnson 79e41dbb1b Fix bug where on / off icon didn't have class if not console view 2014-11-02 00:40:26 +00:00
Kyle Johnson 6435fe24c0 Add console link to header 2014-11-01 16:04:15 +00:00
Kyle Johnson c892e72ae8 Display cycle and montage as <a> element, only if running 2014-11-01 16:01:30 +00:00
Kyle Johnson bcbd73fe44 Split nav / header out into own file 2014-11-01 15:39:11 +00:00
Kyle Johnson 1a83b3053e More work on cosole - split into sep. files, create sidebar 2014-11-01 15:26:19 +00:00