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

1919 Commits

Author SHA1 Message Date
Heng Liu 59b0675588 only expose monitor info which are being used in client 2015-10-02 20:04:10 -07:00
Heng Liu 2fd6cbe742 fix timeline view for SaveJPEGs monitors (without enabled VideoWriter) 2015-10-01 22:41:31 -07:00
Andrew Bauer 42e021e652 Merge pull request #976 from SteveGilvarry/FrameImageGen 
Dynamically create jpegs from video file for viewing in browser
 2015-07-28 10:10:38 -05:00
Michael 5c44285f98 dynamically create jpegs from video file for viewing in browser 2015-07-29 00:24:05 +10:00
SteveGilvarry c7c27d7009 Merge remote-tracking branch 'upstream/feature-h264-videostorage' into h264_playback 
Conflicts:
	web/skins/classic/views/event.php
 2015-07-29 00:14:12 +10:00
Michael 7502e5b3e3 added control for video playback rate 
Conflicts:
	web/skins/classic/views/event.php
 2015-07-29 00:07:19 +10:00
Andrew Bauer bb0c016d3d Merge pull request #974 from SteveGilvarry/h264_jpeg_mode 
Fix to display thumbnails when only storing snapshot.jpg
 2015-07-28 08:55:52 -05:00
Michael d83349cc7f fix to display thumbnails when only storing snapshot.jpg 2015-07-28 23:43:50 +10:00
Michael 477c34cc2c Added missing brackets 2015-07-28 23:08:45 +10:00
Michael 6c8dbb8bea Typo 
added missing "
 2015-07-28 23:08:10 +10:00
Michael e6e1427c48 added missing videojs.zoomrotate.js file 
added missing videojs.zoomrotate.js file
 2015-07-28 23:06:03 +10:00
Michael 2d4c2bbe0a Beautify! 
Make the code somewhat readable.
 2015-07-28 23:05:06 +10:00
user 46204c2768 local storage of video js plugin 2015-07-28 23:03:59 +10:00
user 2e8d88915b removed redundant field in sql query 
Conflicts:
	web/skins/classic/views/event.php
 2015-07-28 23:02:56 +10:00
user 05e82d2a96 proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate 
Conflicts:
	web/skins/classic/views/event.php
 2015-07-28 22:55:27 +10:00
SteveGilvarry f09a551d6a Merge branch 'master' into feature-h264-videostorage 2015-07-28 21:06:52 +10:00
Pliable Pixels e332fc36a9 Fixed Configs API to return all values 2015-07-21 13:28:37 -04:00
Andrew Bauer 500b560884 Merge pull request #952 from schrorg/583-correct-de_de-encoding 
Change encoding of german language file to UTF-8
 2015-07-20 08:07:30 -05:00
Isaac Connor 02ee745167 parameter to defined should be in quotes 2015-07-17 10:09:22 -04:00
root a9df82256b Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8 2015-07-17 14:24:46 +02:00
root 560a4cccbe Show correct part of URL (hostname) for ffmpeg sources in console 2015-07-17 13:59:40 +02:00
Isaac Connor ace8597b8d Merge branch 'master' into multi-server 2015-07-14 16:10:51 -04:00
Pliable Pixels 444d978c81 Added API routing 2015-07-13 18:55:28 +00:00
Isaac Connor 04366e752a add Servers to options, a server editing popup and a server selection to monitors 2015-07-09 11:41:46 -04:00
Isaac Connor 42ac3ceb3b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-07-09 11:00:05 -04:00
Isaac Connor 51631b84b4 cleanup generated files 2015-07-09 10:59:45 -04:00
Andrew Bauer 8406818b00 Merge pull request #921 from pliablepixels/master 
Added "RewriteBase /zm/api" for API routing
 2015-07-05 08:34:28 -05:00
Pliable Pixels 3a9c941213 Added "RewriteBase /zm/api" for API routing 2015-07-05 08:59:07 -04:00
Andrew Bauer 1b2f214340 Dumb down Crud from 4.0 -> 3.0.10 2015-06-30 10:26:29 -05:00
Andy Bauer 1aebbec4e8 Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States 
Conflicts:
	db/zm_create.sql.in
	db/zm_update-1.28.99.sql
 2015-06-27 16:32:32 -05:00
Andrew Bauer 592ecd8e94 fix montage view issue in mobile skin 2015-06-26 08:47:20 -05:00
Isaac Connor 4be341986f Merge pull request #897 from pliablepixels/881-api-branch 
Fixed events API to remove thumbnail code
 2015-06-22 13:01:15 -04:00
Pliable Pixels 1a0d4d2221 Console now shows custom run state in header (if applicable) 2015-06-21 09:31:21 -04:00
Pliable Pixels 719a903d43 Fixed events API to remove thumbnail code 2015-06-20 20:08:10 -04:00
Pliable Pixels 138e931e24 Fixed events API to remove thumbnail code 2015-06-20 19:57:55 -04:00
Andrew Bauer 8d309fbd6e Merge pull request #874 from seeebek/master 
German translation update
 2015-06-19 13:50:55 +02:00
pliablepixels 7112001b64 getVersion.json now returns both ZM version and API version 2015-06-13 16:33:15 +00:00
pliablepixels 12ba217de0 Added API version in addition to ZM version, also added loadConfig code that was there in the angular-ui branch but not merged to master 2015-06-13 16:32:37 +00:00
Isaac Connor bda35ed4d6 fix bootstrap.ini substitution 2015-06-12 11:12:58 -04:00
Isaac Connor ecb7720056 Merge pull request #882 from pliablepixels/881-merge-angularui-apis 
Merged Angular UI branch API to master
 2015-06-12 11:06:59 -04:00
Andrew Bauer d915d859ed Convert Crud to submodule 2015-06-11 11:56:39 -05:00
Ubuntu dd9603f70f Merged Angular UI branch API to master 2015-06-11 02:58:58 +00:00
SteveGilvarry b6af731400 Add translate options for h264 Storage options in Monitor and update en_gb file 2015-06-10 23:41:17 +10:00
SteveGilvarry 9b06b1399c Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
	src/zm_ffmpeg_camera.cpp
	web/skins/classic/views/event.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/timeline.php
 2015-06-10 23:09:30 +10:00
Sebastian Kaminski f3a8217651 resolve conflicts from merge by seebaer1976 2015-06-05 19:34:52 +02:00
Isaac Connor e10fdaf344 reduce the wait to 2/10ths instead of a whole second 2015-06-05 11:49:05 -04:00
Isaac Connor c8e41319e6 fix state popup dimensions 2015-06-03 12:22:12 -04:00
Isaac Connor f99c5f3627 use correct tag for the frame popup so that it gets the correct popup window size 2015-06-03 12:09:38 -04:00
seebaer1976 4cf1e61197 Update de_de.php 2015-05-31 17:43:21 +02:00
Sebastian Kaminski ba980ae4ae update german translation 2015-05-27 15:38:47 +02:00