4123f2be1c
Can't seem to catch a break tonight. Moving dian files into correct folder.
2013-09-17 18:32:53 -05:00
d7dc4ce4ed
Merge branch 'debian' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian
2013-09-17 18:02:24 -05:00
e30a43bc0a
Move debian folder under distros
2013-09-17 17:50:50 -05:00
f716fbb237
Open the Config Option tab by default
2013-09-17 12:48:38 -04:00
f7b7a49616
shoNoImage was always being called as the $mon variable was incorrect
2013-09-17 09:43:48 -04:00
ddec9a0dd8
Fixes 147 - there were unescaped quotes
2013-09-17 09:28:42 -04:00
17b60bf25f
Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern
2013-09-17 09:13:03 -04:00
e694616702
Reworked the Config view to display options in rows using bootstrap.
...
This commit fixes #134
2013-09-17 09:07:35 -04:00
064b86c95f
Added my events dir to the gitignore list
2013-09-17 08:54:53 -04:00
e0423570bd
Added classes to take care of smaller and larger displays
2013-09-17 08:50:46 -04:00
5a9364703c
a better fix for the sign comparison warnings during compilation
2013-09-17 10:28:59 +03:00
7d5e0d3ba2
Update README.Fedora
...
Update README.Fedora installation instructions. Fixes issue #145 .
2013-09-16 08:21:37 -05:00
dc316b0aee
Add static image when the monitor/system is not enabled/running
2013-09-16 22:00:27 +12:00
6c60813a6f
Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern
2013-09-16 13:13:07 +12:00
7f1589a74e
Search for a different string in zmdc.pl to correctly determine if ZM is running or not
2013-09-16 13:11:01 +12:00
46aa2e0ebb
Merge pull request #141 from knnniggett/redhat
...
Removing the redhat folder from the root for real this time
2013-09-15 15:07:39 -07:00
2858a58f79
Removing the redhat folder from the root for real this time
2013-09-15 17:03:40 -05:00
ee5413f5d9
Merge pull request #136 from knnniggett/redhat
...
Add Redhat rpm dev files to distros/redhat
2013-09-15 14:41:37 -07:00
efc729110a
Move redhat folder to a subfolder called distros
2013-09-15 16:33:09 -05:00
ab4c091693
change eq's to le's so that it runs scripts for upgrading from 1.26.0
2013-09-15 12:59:45 -04:00
021b775f4a
Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern
2013-09-14 22:11:35 -04:00
c6d1715948
Removed an unneeded div in the Events view.
2013-09-14 22:10:49 -04:00
3738c3866d
Added a link to each event row to delete that event.
...
This fixes #126 however that issue was not specific enough. This
commit allows a user to delete individual events. There is currently
no way to delete multiple events.
2013-09-14 22:09:28 -04:00
bf2e46f512
Added a function to delete events.
...
Currently this only allows single events to be deleted.
2013-09-14 22:05:08 -04:00
c3f7af7cd1
Fix sign warning during compilation
2013-09-15 04:13:09 +03:00
0b5a215dca
Use the HtmlHelper::tableHeaders helper to display the table headers
2013-09-14 21:03:31 -04:00
f0006404cc
Merge pull request #121 from rkojedzinszky/master
...
Rewrote the logState() sql query to allow mysql to use indexes
2013-09-14 17:43:43 -07:00
4cc80d4cc5
Update zoneminder.1.26.el6.spec
...
Removed reference to a patch that has been added upstream
2013-09-14 12:14:08 -05:00
a6d3b35996
Delete zoneminder-1.25.0-installfix.patch
...
no longer needed. Fix has been added to latest branch.
2013-09-14 12:11:49 -05:00
4cb89e7883
Moved these over to github issues
2013-09-13 15:20:49 -04:00
79d408f028
Update STATUS.md
2013-09-13 15:17:17 -04:00
7b0e4e0a3f
Fix formatting
2013-09-13 15:12:37 -04:00
54d25513ff
Add basic acceptance criteria for release of this UI.
2013-09-13 15:11:40 -04:00
7496d3e932
Create STATUS.md
2013-09-13 14:59:26 -04:00
42e37e7e25
Add video playback to events. Very crude at this stage but it works
2013-09-14 04:50:51 +12:00
9ccf5c4ee8
Added a horizontal rule to the footer to help it stand out.
...
This isn't ideal (the footer should have css to make it stand out,
instead of an extra element).
2013-09-13 09:13:07 -04:00
5e0c0ffc27
Merge upstream master to branch to keep up to date
2013-09-14 01:10:09 +12:00
16994dbdb2
Add some styling to the version number in the footer.
...
If there is an upgrade available, the label-info (blue) class is
applied.
If there is not an upgrade avaiable, the label-success (green)
class is applied.
2013-09-13 09:07:19 -04:00
b2ab1cea09
Initial commit of Version Controller and View
2013-09-13 08:55:46 -04:00
774a84d487
Updated event processing to actually add frames into the DB. Use MP4 container
2013-09-14 00:50:54 +12:00
2f99274c0a
Initial commit of Version model
2013-09-13 08:44:21 -04:00
180d879894
Display the ZM version in the footer of all pages.
2013-09-13 08:43:11 -04:00
0437e6e5b6
Pass the zmVersion variable to all views
2013-09-13 08:42:55 -04:00
f0231a7d5f
Added some styling to the logs table
2013-09-12 20:10:51 -04:00
34b4ec0b94
Display elements properly for bootstrap. Also fixed element id's
2013-09-12 20:03:41 -04:00
d32bab4248
Use the Html, Form and Paginator helpers from BoostCake
2013-09-12 20:02:33 -04:00
e42afcd76a
Load all available CakePHP plugins
2013-09-12 20:01:31 -04:00
e1ce213f04
Adding the BoostCake plugin
2013-09-12 20:00:57 -04:00
0f5c90bbe4
Rewritten the query to allow mysql to use indexes
...
On a system with heavy logging, without this the login procedure took
too long.
2013-09-12 22:46:26 +02:00
75acaea36e
Open the monitor edit general tab by default
2013-09-11 15:29:18 -04:00
Andy Bauer
Kyle Johnson
mastertheknife
Andy Bauer
Chris Wiggins
abauer
Isaac Connor
Kyle Johnson
Richard Kojedzinszky