Chris Wiggins
|
10e4ca848f
|
Update branch to track modern
|
2013-09-24 14:58:41 +12:00 |
Kyle Johnson
|
eed6c81287
|
An ugly hack to make the liveStreams display in both index and view views.
|
2013-09-23 21:51:02 -04:00 |
|
Kyle Johnson
|
d9bbcdf3a9
|
Removed web from SUBDIRS in Makefile.am
|
2013-09-23 20:54:15 -04:00 |
|
Kyle Johnson
|
ea2f2cbac2
|
Removed old web/ Makefiles from configure.ac
|
2013-09-23 15:55:16 -04:00 |
|
Kyle Johnson
|
172d7a52d1
|
Revert "Wrapping the main content in a container to fix #169"
This reverts commit 8a9f9a8ab5.
|
2013-09-23 15:22:07 -04:00 |
|
Kyle Johnson
|
0b0c7bea4b
|
Initial commit of .travis.yml
|
2013-09-23 15:14:30 -04:00 |
|
Kyle Johnson
|
3f70f6714f
|
Removed an old </table> tag
|
2013-09-23 15:09:58 -04:00 |
|
Kyle Johnson
|
8a9f9a8ab5
|
Wrapping the main content in a container to fix #169
|
2013-09-23 15:04:23 -04:00 |
|
Chris Wiggins
|
3dfff0b3ac
|
Merge branch 'master' into feature-h264-videostorage
|
2013-09-22 10:44:38 +12:00 |
|
Chris Wiggins
|
a7c4d3f3e9
|
Accidental copy of old logic. Fixed
|
2013-09-22 10:40:54 +12:00 |
Kyle Johnson
|
c38a666301
|
Merge pull request #158 from WDKevin/modern
Checks for updates every 5 minutes and notifies the user when there is one
|
2013-09-20 08:25:52 -07:00 |
Kevin Crider
|
2e8e3d55ad
|
Removed green version label and changed to red when a new version is available
|
2013-09-20 10:49:12 -04:00 |
|
Kevin Crider
|
0de88e7d68
|
Fixed small bug left over from testing
|
2013-09-20 10:49:12 -04:00 |
|
Kevin Crider
|
d78315de50
|
Polls the update check every 5 minutes and if an update is available it adds a message beside the version number in the footer. This should fix issue #130
|
2013-09-20 10:49:11 -04:00 |
Kfir Itzhak
|
d9c62d5bbe
|
Merge pull request #161 from chriswiggins/modern
Merge master into modern to keep changes up to date
|
2013-09-20 00:01:47 -07:00 |
|
Chris Wiggins
|
99bae6386e
|
Merge branch 'monitorSize' of git://github.com/chriswiggins/ZoneMinder into modern
|
2013-09-20 17:49:04 +12:00 |
|
Chris Wiggins
|
e37b118d1f
|
I was behind in my master. Re-merge
|
2013-09-20 09:30:23 +12:00 |
|
Chris Wiggins
|
e25b4d85e9
|
Merge master into modern
|
2013-09-20 09:12:36 +12:00 |
|
Kyle Johnson
|
92ec3bd013
|
Merge branch 'html5-video-event-playback' into modern
|
2013-09-19 13:47:24 -04:00 |
|
Kyle Johnson
|
f8db56b308
|
Have the Events view view (not index) use the popup layout
|
2013-09-19 11:31:54 -04:00 |
|
Kyle Johnson
|
0223aeb3ab
|
Set all event links to be colorboxes
|
2013-09-19 11:31:05 -04:00 |
|
Kyle Johnson
|
9e782ed407
|
Adding the colorbox css and js to the default template
|
2013-09-19 11:30:25 -04:00 |
|
Kyle Johnson
|
e0a7418d24
|
Adding the colorbot js
|
2013-09-19 11:29:42 -04:00 |
|
Kyle Johnson
|
afa281a750
|
Adding the colorbox css
|
2013-09-19 11:29:29 -04:00 |
|
Kyle Johnson
|
e936df0f0d
|
A minimum layout file for use with popups
|
2013-09-19 11:29:12 -04:00 |
|
Kyle Johnson
|
5f4ff5c7cf
|
Return the full path to the generated video
|
2013-09-19 09:53:20 -04:00 |
|
Kyle Johnson
|
ca8cc028ef
|
Display an HTML5 <video> for each event
|
2013-09-19 09:12:05 -04:00 |
|
Kyle Johnson
|
8aec78258b
|
Create a video for each event view.
This determines the appropriate video format based on the user agent,
creates the video, and then returns the video path to the view.
|
2013-09-19 09:10:57 -04:00 |
|
Kyle Johnson
|
5844a1cc89
|
Added a function which creates videos from event jpgs
|
2013-09-19 08:57:54 -04:00 |
|
Chris Wiggins
|
6a7b38dac6
|
update changes
|
2013-09-19 21:55:56 +12:00 |
|
Chris Wiggins
|
e2623fb789
|
Merge branch 'h264-mkv' of github.com:chriswiggins/ZoneMinder into h264-mkv
|
2013-09-19 21:49:22 +12:00 |
|
Chris Wiggins
|
a49e66889d
|
Move JS to main.js
|
2013-09-19 21:10:41 +12:00 |
|
Chris Wiggins
|
133b061179
|
Add code for dynamically scaling monitor images on home screen. Add new no-image image
|
2013-09-19 20:56:09 +12:00 |
|
Kyle Johnson
|
bd7cefcfda
|
Merge pull request #156 from WDKevin/modern
Delete multiple events at once
|
2013-09-18 16:46:02 -07:00 |
|
Kevin Crider
|
5178d4fa37
|
Added "Function" column to the $monitors array to fix issue 140
|
2013-09-18 17:24:52 -04:00 |
|
Kevin Crider
|
d7fd5566a7
|
Fixes issue 129 - Bandwidth is now updated in the UI after changing it
|
2013-09-18 17:10:17 -04:00 |
|
Kevin Crider
|
bf8f799c4c
|
Moved delete button to the sidebar
|
2013-09-18 16:46:44 -04:00 |
|
Kevin Crider
|
0cf11adb99
|
Removed logging line from deleteSelected function
|
2013-09-18 15:55:50 -04:00 |
|
Kevin Crider
|
c6bbdac0d7
|
Added ability to delete multiple events at once
|
2013-09-18 15:53:35 -04:00 |
|
Kyle Johnson
|
d0a8d86e3c
|
Merge pull request #155 from WDKevin/modern
Added missing jquery-2.0.1.min.map file and fix monitor sorting
|
2013-09-18 10:58:00 -07:00 |
|
Kevin Crider
|
0f25bec1d6
|
Fixes to monitor sorting and reordering
|
2013-09-18 13:23:16 -04:00 |
|
Kevin Crider
|
bcaa0ac36c
|
Added missing jquery-2.0.1.min.map file
|
2013-09-18 13:16:10 -04:00 |
Isaac Connor
|
b80ac24c76
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2013-09-18 13:00:06 -04:00 |
|
Isaac Connor
|
eba8b0dde0
|
move this into the distros dir
|
2013-09-18 12:51:10 -04:00 |
|
Kyle Johnson
|
08e224f2af
|
Merge pull request #154 from WDKevin/modern
Add support to change order of monitors
|
2013-09-18 09:43:08 -07:00 |
|
Kevin Crider
|
4430399b1e
|
Removed logging of post data
|
2013-09-18 12:37:01 -04:00 |
|
Kevin Crider
|
b0c5732620
|
Merge branch 'modern' of https://github.com/WDKevin/ZoneMinder into modern
|
2013-09-18 12:25:04 -04:00 |
|
Kevin Crider
|
6dfdba7023
|
Added ability to reorder monitors on the dashboard
|
2013-09-18 12:22:14 -04:00 |
|
Kevin Crider
|
20def177ef
|
Added ability to reorder monitors on the dashboard
|
2013-09-18 12:14:15 -04:00 |
Andy Bauer
|
d02f6ee0d3
|
Merge branch 'debian2' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian2
|
2013-09-17 18:39:33 -05:00 |