Commit Graph

362 Commits

Author SHA1 Message Date
digital-gnome 43bba23735 Fix filteradd complaining 2017-12-06 10:36:37 -05:00
digital-gnome f8d3c07586 Add h264 event view functionality and new feature alarmCues (#2012)
* Fix nearEventsQuery

Removed dbEscape from getNearEvents previous event because it only returns 0.  Now matches next.  Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch.  Also added start times to allow for videoJS replaymode.

* Unescape filters

Filters need to be unescaped

* Add initial values to page load

* Add replay modes to videojs

* rough in figuring out a frame in between bulk frames

* Add alarmCues

Add a graphical indication of where alarm frames happened in an event.  Similar to what zmNinja shows.

* Add remaining buttons to videojs

Functionality for all buttons on videojs streams.  FF/RW buttons show as active when they are active.

* Whitespace and fix Bulkframe calcs

* Fix zms events trying to generate with mp4 code

ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed

* ZMS scrub bar

Move zms scrub bar to bottom of image feed.  Make it simpler and more like videojs style.

* Wrap event feeds properly

* Fix dvrControls on watch view

* Add scaleToFit

Add a scaleToFit option to event view

* Add navigation for videoJS streams

Disables nav buttons at beginning and end of events.  Handles switching from zms to videojs.  If zms crashes changes next event function to reload page instead of ajax.

* Add scaleToFit to watch and frame view

Adds scaleToFit to watch view.  Since frame view uses the watch cookie this required changes to frame view

* Add transition to zoom

* Change stills view to match stream

Move stills slider bar to match scrub bar on streams.  Allow it to resize, make it larger.  Add alarmcues.

* Add Stills for every event

Add stills for every event.  Match size to stream size

* Progressbox transitions
2017-12-04 21:26:59 -05:00
digital-gnome ab08769adb Add nice to archive commands
Archiving could hammer io/cpu on the server.  Big archives would cause problems.
2017-12-04 14:48:17 -05:00
digital-gnome 3e7c573da5 Add download video option to events view
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
digital-gnome 7a188a84f7 Add montagereview filter passing
montagereview now accepts any appropriate filters
2017-12-02 12:29:55 -05:00
digital-gnome 6d6b4366de Fix MontageReview filters 2017-12-02 12:29:54 -05:00
digital-gnome 1c201b0efe Fix timeline filters 2017-12-02 12:28:06 -05:00
digital-gnome 11629076f6 Fix Timeline view, add list link 2017-12-02 12:28:06 -05:00
digital-gnome 1289269e6f Change filter to work without popup 2017-12-02 12:28:04 -05:00
Isaac Connor 9d5447aa6a
Merge pull request #55 from digital-gnome/storageareas-updateNavbar
Add navbar refresh to all pages that use it
2017-12-02 10:44:01 -05:00
digital-gnome 53f886edc4 Make navbar refresh not change header links 2017-12-01 22:15:29 -05:00
digital-gnome 1bbcf239d7 Fix timeline by adding StartDateTime 2017-12-01 16:25:03 -05:00
digital-gnome 0a995aea78 Add navbar refresh to all pages that use it 2017-11-30 16:33:46 -05:00
digital-gnome f52306ff56 Fix scales to only use fixed width/height on montage 2017-11-26 19:08:06 -05:00
Isaac Connor 09938ef7ee join the echo's into 1 to also get the line breaks 2017-11-03 09:24:13 -04:00
Isaac Connor e6918cd1bd implement crude cache busting code for .js and .css files 2017-11-01 09:41:19 -04:00
Isaac Connor 653d213d62 Add EndTime and DiskSpace to Filters 2017-10-25 11:11:19 -07:00
digital-gnome 3fe46cbaff Scale to Fit
Added a scale to fit option.  When navigating between events of different size they will fill the window.  Turned on when any event uses it, turned off when any event turns it off.
2017-10-22 12:13:16 -04:00
Isaac Connor c363b5a190 fix some missing break lines in output 2017-10-17 10:10:20 -07:00
Isaac Connor 9e1893311d google code style 2017-10-16 15:16:33 -04:00
Isaac Connor 78d1c1ed20 google code style and quote marks 2017-10-12 11:43:15 -07:00
Isaac Connor e6c0add17e add ZM_BANDWIDTH_DEFAULT 2017-10-12 12:09:05 -04:00
Isaac Connor ffc1ac43f5 put back disk space in header, more debug in caching storagea 2017-10-10 14:06:21 -04:00
Isaac Connor 31e3a2d28d turn off disk space reporting 2017-10-10 10:41:04 -07:00
Isaac Connor 3af795264d add actual disk space as a mouseover in nav bar 2017-10-10 10:38:13 -04:00
Isaac Connor d4cf84f7e6 Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
Isaac Connor 6c87ed10c1 add a notice when javascript is turned off 2017-10-04 21:51:30 -04:00
digital-gnome ea4b9486aa alarmCues CSS
also function.php to load new vjs override file
2017-10-04 11:09:22 -04:00
Isaac Connor 72ca011e2f fix favicon 2017-10-02 13:05:23 -04:00
Isaac Connor 351d8ef24d make the word bandwidth also be part of the link 2017-10-02 12:39:39 -04:00
Isaac Connor c7ac854cfd always include classic.js 2017-10-02 12:30:55 -04:00
Isaac Connor b52944258d use css skin based favicon if it exists. 2017-10-02 11:55:36 -04:00
Isaac Connor 15ba7d2a35 fixes 2017-10-02 11:25:51 -04:00
Isaac Connor eaf29d2024 add a class to the active view link to highlight it 2017-10-02 09:02:57 -04:00
Isaac Connor 4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
Isaac Connor 4e16523cff Say Groups instead of listing the # of monitors in the header 2017-09-23 13:41:52 -04:00
Isaac Connor f294acde92 add global and for including the state view 2017-07-13 10:07:23 -04:00
Isaac Connor 22e957ba46 clean up state a bit, use 1 less call to daemon check by using global . When selecting a layout, set img width to 100% 2017-07-12 12:49:01 -04:00
Isaac Connor 0adc14da4e fix links to Filter and Devices 2017-07-12 11:17:07 -04:00
Isaac Connor ed4da1e8bc change to single quotes 2017-06-28 14:27:09 -04:00
Isaac Connor 5df4494c6c make Filters a main window view instead of a popup 2017-06-20 09:08:57 -04:00
Isaac Connor 8145f2bc4c whitespace 2017-06-15 12:13:40 -04:00
Isaac Connor 085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Isaac Connor 175e6921f9 use version-generic urls to jquery and jquery-ui 2017-06-07 14:13:03 -04:00
Isaac Connor b4bdc1fd6b Merge branch 'master' into dragndrop_monitor_sorting 2017-06-06 20:39:58 -04:00
Isaac Connor 451714a403 Merge branch 'master' into storageareas 2017-06-04 21:42:56 -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 ece10d6278 braces and whitspace 2017-05-31 11:16:55 -04:00
Isaac Connor e2df0b74d4 remove including state.js.php as it has nothing to do with this pr 2017-05-29 09:51:31 -04:00
Isaac Connor 7cfa0b12ec Merge branch 'dragndrop_monitor_sorting' into storageareas 2017-05-25 15:26:04 -04:00
Isaac Connor aacfea735e always include bootstrap, and include jquery 2017-05-25 15:00:44 -04:00
Isaac Connor f4008e2c6a Merge branch 'master' into storageareas 2017-05-19 11:20:33 -04:00
Isaac Connor f851daca68 merge code to load video.js etc on Event view 2017-05-18 15:10:13 -04:00
Isaac Connor f4224bb88e Merge branch 'master' into storageareas 2017-05-17 17:47:39 -04:00
Andrew Bauer 200f92b1ad make zmexport not rely on symlinks in the webroot (#1888)
* make zmexport not rely on symlinks in the webroot

* add archive view
2017-05-17 11:30:39 -04:00
Isaac Connor bde887fc9c remove unneeded ;'s 2017-05-05 17:17:55 -04:00
Isaac Connor 9482114f95 add db connections to the header 2017-04-28 14:17:09 -04:00
Isaac Connor dce39bb2a9 Merge branch 'master' into storageareas 2017-04-26 15:58:17 -04:00
Andrew Bauer 1a565a47f2 fix skin path in export_functions 2017-04-26 12:17:01 -05:00
Isaac Connor 83ba74ad66 work in progress, rough in adding the svg zones to montage 2017-04-24 11:11:54 -04:00
Isaac Connor 035b464b97 Revert "don't use external hosted video.js or moment.js"
This reverts commit fb2f8022a7.
2017-04-20 10:45:51 -04:00
Isaac Connor fb2f8022a7 don't use external hosted video.js or moment.js 2017-04-20 10:12:47 -04:00
Isaac Connor f1f54205fb Merge branch 'remove_BOM' into storageareas 2017-04-16 09:28:35 -04:00
Isaac Connor 5e0012569f use dos2unix to remove BOM 2017-04-16 09:22:37 -04:00
Isaac Connor 4df12ae370 Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height 2017-03-06 17:30:00 -05:00
Isaac Connor 7b73eb350f update to current. 2017-02-02 12:15:16 -05:00
Isaac Connor 6f6eacaa72 fixup classic and dark skins 2017-01-30 21:45:48 -05:00
Isaac Connor 89022fff0c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-01-30 21:16:26 -05:00
Isaac Connor f3378207c0 make navbar static instead of fixed, sync up dark theme, and improve storage editing styles 2017-01-30 21:16:21 -05:00
Isaac Connor ad2e00166a use isset 2017-01-30 19:53:08 -05:00
Isaac Connor 4543b3e1b1 include jquery-ui instead of using a cdn version 2017-01-30 19:17:14 -05:00
Isaac Connor 19aed3f860 dont check ZM_DIR_EVENTS if it already exists in storageareas 2017-01-30 17:29:15 -05:00
Isaac Connor fdd71a826a implement dragndrop sorting 2017-01-23 10:12:57 -05:00
Isaac Connor fea5fa1b59 fix xtell should be -1 for move left 2017-01-10 12:35:02 -05:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 2dda2d9e1e remove unneeded, empty files 2016-12-26 09:49:14 -06:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 02a2fdf58f Merge branch 'remove_emptys' into storageareas 2016-12-20 16:40:42 -05:00
Isaac Connor 38c0cedecc remove the use of empty which on php < 5.5 only supports variables. 2016-12-20 16:37:42 -05:00
Isaac Connor 7f2bf04c2f Merge branch 'cookie_http_only' into storageareas 2016-12-08 14:26:13 -05:00
Isaac Connor 2adb17ad90 fix type 2016-11-29 15:25:24 -05:00
Isaac Connor 02cd3e8cba Merge branch 'master' into small_fixes 2016-11-22 10:52:07 -05:00
Isaac Connor 3b7723ee8f Merge branch 'master' into storageareas 2016-11-11 22:40:00 -05:00
Kyle Johnson 3916b02a74 Only load bootstrap css in specific views.
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
2016-11-10 23:07:52 -07:00
Kyle Johnson 97fb53e95c Remove extra php tag in functions.php 2016-11-10 21:49:57 -07:00
Kyle Johnson 3e3956f45d Update doctype to HTML5, add meta tags for mobile browsers 2016-11-10 21:47:53 -07:00
Kyle Johnson eacf6cd415 Restyle login page, move recaptcha js to <head>
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
2016-11-10 21:46:55 -07:00
Kyle Johnson 1607ae1210 Load bootstrap css 2016-11-10 21:45:46 -07:00
Isaac Connor cb69d1a693 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2016-11-03 14:57:29 -04:00
Isaac Connor 2f22eb5a8c fix error when only 1 monitor is listed 2016-11-03 09:41:54 -04:00
Isaac Connor ca69a79bed fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist. 2016-10-27 17:05:33 -04:00
Isaac Connor f153e9b8fb MontageReview should only be visisble to people who can view events. Fix running state 2016-10-20 13:38:12 -04:00
Isaac Connor 67e14bd12f move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me. 2016-10-20 13:16:50 -04:00
Isaac Connor b00588b6ff add back montagereview 2016-10-11 17:35:41 -04:00
Isaac Connor 5ce2e95fb7 replace getDiskPercent call with code to show percent for all storageareas 2016-09-20 12:18:50 -04:00
bhaal2 c74af40ffb Had file open with old stuff. Fixed now. 2016-09-17 02:20:17 +10:00
bhaal2 aee6ae956d Moved '%' to getDiskPercent() where it should have been. 2016-09-17 02:13:33 +10:00
Isaac Connor 2c21fe80e7 Merge pull request #1626 from bhaal2/storageareas
Storageareas
2016-09-15 10:18:11 -04:00
bhaal2 76beaf281a Changed "Disk" to "Storage" which looked better when showing disk space for all storage areas. 2016-09-15 19:44:13 +10:00
Isaac Connor a0eaea00a5 fix relative paths to jquery and bootstrap fixes #1618 2016-09-14 10:06:15 -04:00
Isaac Connor 0bc50810de only add the development h3 if it has contents, otherwise it pushes the header size down 2016-09-13 10:25:49 -04:00
Isaac Connor 09ebcfb7f8 only put in the development h3 tag if the value has been set 2016-08-22 11:42:44 -04:00
Isaac Connor 2451768295 Merge branch 'master' into storageareas 2016-08-08 18:08:46 -04:00
Isaac Connor fff54e4086 update export to use event object, which automatically fixes storage path issues. Include mp4's in the list of video files to include 2016-05-18 09:02:14 -04:00
Isaac Connor 5e419e85d7 move logger down, as thisURL gets set in the skin.js and comment out overlay.js 2016-05-16 14:37:35 -04:00
Isaac Connor 9a1b0b79b9 don't use a dropdown for montage, etc 2016-05-13 11:43:38 -04:00
Isaac Connor 85f950d80a put jquery into no conflict mode so it doesn't overwite mootools use of $ 2016-05-13 09:45:24 -04:00
Isaac Connor ae40dc8b1b revert to fixed navbar 2016-05-07 18:11:58 -04:00
Isaac Connor dcdefac48a fix styles in header, move footer back into header 2016-05-06 16:08:32 -04:00
Isaac Connor 97a1d5a648 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:53:48 -04:00
Isaac Connor 52b4e98e5a fixes 2016-05-06 15:53:19 -04:00
Isaac Connor 38e02db9cf Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:46:00 -04:00
Isaac Connor daf10c1b84 make displayMonitors global 2016-05-06 15:44:35 -04:00
Isaac Connor 2ccefdb23c Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:30:25 -04:00
Isaac Connor fb1b8000ec fix the use of when specifying a skin 2016-05-06 15:24:20 -04:00
Isaac Connor 02b5cd6b6c Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:17:10 -04:00
Isaac Connor 5d8eeb5b56 deprecate header, just the getNavBarHTML function 2016-05-06 15:16:48 -04:00
Isaac Connor da97dfd9cf Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:59:10 -04:00
Isaac Connor ed5cb2f3ed fix global language problems 2016-05-06 14:58:41 -04:00
Isaac Connor 99d9f98244 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:40:08 -04:00
Isaac Connor 956b971719 put back maxWidtha nd maxHeight 2016-05-06 14:39:48 -04:00
Isaac Connor b3b63ec1d9 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:38:17 -04:00
Isaac Connor 829202b42a move more eventcounting stuff to console.php. 2016-05-06 14:38:08 -04:00
Isaac Connor 01397b6695 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:31:27 -04:00
Isaac Connor 1d673a0b8c move header into a function in functions.php. Move event population into console.php 2016-05-06 14:30:32 -04:00
Isaac Connor 7df2685223 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 12:51:40 -04:00
Isaac Connor e87a35b04d Merge branch 'always_show_ptz' into storageareas 2016-05-06 12:51:15 -04:00
Isaac Connor c9f1614e32 If the camera has no centering control, don't make it look like it does. This also removes a logged error 2016-05-06 12:51:03 -04:00
Isaac Connor d5f1519829 Can't externally reference .js.php, they have to be inline js 2016-05-06 12:40:23 -04:00
Isaac Connor 4defe92911 Merge branch 'master' into updated-console 2016-05-03 14:22:37 -04:00
Isaac Connor 516bacdfd3 Merge branch 'updated-console' into storageareas 2016-05-03 13:38:57 -04:00
Kyle Johnson c2fd3dd84a Also don't load additional JS to Log view
Another issue with mootools & jquery conflicts
2016-05-03 13:25:39 -04:00
Kyle Johnson 6768fe5554 Don't include extra js libraries for monitor view.
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
2016-05-03 13:06:28 -04:00
Isaac Connor fed575bdb4 add some missing () on class method calls. Remove some no longer needed global 's and some empty lines 2016-04-25 08:56:21 -04:00
Kyle Johnson f2d43de137 Revert "Include Chart.js"
This reverts commit 33d6d311b0.

Didn't mean to add this code in yet.  For a future feature.
2016-04-24 00:52:19 -04:00
Kyle Johnson ca0ba4a5f8 Add state view's js and php to all pages as it is now part of header 2016-04-23 22:59:50 -04:00
Isaac Connor 2ff01b6bcb remove unneeded global 2016-04-22 13:36:12 -04:00
Isaac Connor 30b746c603 Add missing ()'s 2016-04-22 13:35:40 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 564f189416 Merge branch 'always_show_ptz' into storageareas 2016-04-04 16:45:54 -04:00
Isaac Connor 5f3e7134fb split power out of the Panel box so that I can style it better 2016-04-04 13:22:26 -04:00
Isaac Connor 197ae67313 Merge branch 'always_show_ptz' into storageareas 2016-04-04 11:47:29 -04:00
Isaac Connor 2233747fcb add a missing t 2016-04-04 11:38:16 -04:00
Kyle Johnson 33d6d311b0 Include Chart.js 2016-04-02 00:48:58 -04:00
Kyle Johnson 8fdf3291b4 Load jquery and bootstrap js in classic skin 2016-03-16 00:49:51 -04:00
Kyle Johnson d01ef25f82 Update doctype to html5, and add additional meta tags 2016-03-16 00:17:05 -04:00
Kyle Johnson a403c1db8c Move recaptcha javascript to actual <head> tag
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
2016-03-12 19:14:07 -05:00
Kyle Johnson c9441ec8c0 Local copy of bootstrap 3.3.6, included in classic skin. 2016-03-12 01:16:19 -05:00
SteveGilvarry 5ff427d9e9 Removed Autotools Makefile.am
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
Isaac Connor f2065e2fcb Merge branch 'one_eighth' into multi-server 2015-12-08 08:47:35 -05:00
Isaac Connor d6b2e1959f add a 1/8th scale option, which is useful for 1920x1080 streams 2015-12-08 08:40:44 -05:00
Isaac Connor 95f002c7d6 convert monitor hash accesses to function calls 2015-12-01 15:16:53 -05:00
Isaac Connor ba1100fc03 continue conversion from array to class of Monitor 2015-09-17 16:06:47 -04:00
Isaac Connor b2699237c7 put back mootools 2015-08-27 11:35:47 -04:00
Isaac Connor 41637278c9 merge master 2015-08-19 16:08:12 -04:00
Andrew Bauer bf4038a724 followup changes based on comments in #833 2015-05-21 12:23:31 -05:00
Andrew Bauer 3a94712db2 add translate function 2015-05-10 08:10:30 -05:00
Isaac Connor 013009f127 fix the css .js file name 2015-05-01 16:50:29 -04:00
Isaac Connor 91737eb28b also reference a js file with the name of the chosen css. This is so that we can use different popup window sizes for flat because it's text and buttons are so much larger. 2015-05-01 16:03:40 -04:00
Dmitry Smirnov b2f6bfb5fc upgrade bundled jQuery (Closes: #785)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-15 11:39:29 +10:00
Dmitry Smirnov d1f00f02c2 skins/classic: fix HTML export with USE_DEEP_STORAGE (Closes: #506).
Use mygetEventPath() to get valid path.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-04 20:39:06 +11:00
Isaac Connor fafef86298 Merge branch 'control_improvements' 2014-12-08 16:52:52 -05:00
Isaac Connor 27b9001eb4 default MoveRoot to empty to quiet an error in logs 2014-12-08 16:52:10 -05:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
Isaac Connor 53b70d27fb Use the global variable which gets setup in web/index.php to look in a subdirectory of web/skins/classic/css to find the css files. 2014-11-26 11:18:03 -05:00
tim 8ac6ce17bc Fixed issue DateTime handling in filter queries that broke timeline view. 2014-06-15 13:05:25 -07:00
Isaac Connor 967dda737c more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
Isaac Connor ffa952419c Merge branch 'mysql2PDO'
Conflicts:
	distros/ubuntu1204/changelog
	scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
	web/includes/actions.php
2014-03-20 16:48:03 -04:00
Adam J. Henry e6b9b8218b Enclose value of the Notes attribute with quotes. 2013-12-31 17:32:20 -06:00
Kyle Johnson cad33ddb96 Removed embedded jquery, instead include by <script>. Fixes #274 2013-12-17 13:41:55 -05:00
Isaac Connor 3393a63525 more updates 2013-12-17 12:53:15 -05:00
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Isaac Connor a468baf9eb cleanup 2013-05-10 13:55:45 -04:00
Kyle Johnson 2c04d0774f Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
Kyle Johnson 1ed6462354 Removed all of the old web files 2013-05-01 06:52:43 -04:00
stan 4996dd0a51 Recreated generated files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:46:18 +00:00
stan 3a399378b2 Fixed problem with link to overlay css file
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3485 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-27 16:09:09 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 21:59:06 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
stan dc9e2755b0 Added sample apache config file.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:27:58 +00:00
stan 7e1979760e Updated with new bandwidth based stream config
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3166 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:36:03 +00:00
stan 70aee2ad56 Regenerated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3160 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:50:41 +00:00
stagecoach 1d77e03622 Updated skins/classic/includes/export_functions.php:
- time and date stamp in file name of master .html file modified: removed chars (i.e. :) that could trip up some browsers

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3150 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-20 18:13:29 +00:00
stagecoach b5146a067c Updated skins/classic/includes/export_functions.php:
- human-readable time and date stamp in file name of master .html file
- after download to client, master .html file is being removed from server

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3149 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-19 21:14:08 +00:00
stagecoach ee50a8c42e Playback functionality embedded into exported jpeg event.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3131 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-09-29 16:19:41 +00:00
stagecoach 2709b3eec6 Stagecoach Wireless Second Test Commit:
commented string removed from file below to reverse first test commit

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3130 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-09-29 00:57:52 +00:00
stagecoach 80c5c3edb1 Stagecoach Wireless Test Commit:
commented string, will be removed with second test

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3129 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-09-29 00:55:10 +00:00
stan 9b31bf29e8 Added in image view to allow event root to be able web root
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:12:12 +00:00
stan 84e6d5142a Seyi export bug fix.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3020 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:09:29 +00:00
stan 266e669dde Modified console filters to include archived events and fixed filters for timeline zooming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2989 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-20 21:36:17 +00:00
stan 6fc7acb378 Changed query separator to &amp; and added CDATA wrapper.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2981 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:04:44 +00:00
stan e0801bc216 Updated to use mootools 1.2.3
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2978 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 17:38:13 +00:00
stan 8cad0dbd6a Updated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-24 10:27:28 +00:00
stan 11a1cc2d41 Now supports custom perl install path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +00:00
stan 7b4c0fa926 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2820 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-03-27 16:01:59 +00:00
stan cfccc4b9bf Updates to event export and javascript fixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2814 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-27 09:14:54 +00:00
stan 75c654e654 Downgraded to support autoconf 2.59
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:59:13 +00:00
stan 3069dc2402 Final timestamp update
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:45:32 +00:00