543a1f2490
Merge pull request #78 from knnniggett/patch-3
...
Don't check for gnutls-openssl on systems with older gnutls
2013-08-17 08:26:31 -07:00
e3576ccd17
Don't check for gnutls-openssl on systems with older gnutls
...
This was causing a false warning on CentOS 6 w/ gnutls 2.8.5. It would otherwise compile and work fine despite the warning.
2013-08-17 10:24:30 -05:00
fcea4660cd
Minor formatting changes
2013-08-17 11:21:52 -04:00
d31e9a6c2c
Merge pull request #76 from knnniggett/patch-1
...
Added build notes for CentOS & RHEL
2013-08-17 08:19:43 -07:00
050a5ac414
Change default dB Engine from MyISAM to InnoDB
...
I have long ago converted my production zoneminder dB tables to InnoDB and have not experienced any side effects. One benefit of using InnoDB is a significantly lesser chance of table corruption after an unclean shutdown. Thoughts?
2013-08-17 09:44:40 -05:00
42c9b4e7a5
Added build notes for CentOS & RHEL
2013-08-17 08:52:24 -05:00
0a911d9d27
The .deps directory shouldn't have been included. Removing it.
...
.deps is generated during configure (or is it make?). Fixes #52
2013-08-15 12:44:10 -04:00
e8fa5694e8
Changing AUTOMAKE_OPTIONS from gnu to foreign to fix automake.
...
In commit 21ee8dbe02
2013-08-15 12:24:02 -04:00
4d6b9f7276
More updates to the Hungarian translation. #Fixes #45
2013-08-15 09:39:45 -04:00
cacf77a183
Merge pull request #37 from nagyrobi/patch-2
...
Update Hungarian translation - thanks to robi / @nagyrobi
2013-08-15 06:26:33 -07:00
0a79e4a975
1.26 Beta did not install SkyIPCam7xx.pm Control Script. Fixes #38
2013-08-15 09:08:51 -04:00
1fa04cc104
Update hu_hu.php
2013-08-14 22:38:37 +02:00
21ee8dbe02
Moved README to markdown language for github display
2013-08-14 12:38:42 -04:00
2df9c25df8
Updated release notes with something meaningful
2013-08-14 12:37:10 -04:00
4a03935d10
Added URLs to mastertheknife and nextime changes
2013-08-14 09:57:31 -04:00
1ed901edd1
Updated the changelog with some of the changes in this release
2013-08-13 14:17:40 -04:00
6c411b5c43
Merge branch 'release-1.26' of https://github.com/ZoneMinder/ZoneMinder into release-1.26
2013-08-13 12:40:03 -04:00
c9425a5626
iI decided to keep this just for reference
2013-08-13 12:39:42 -04:00
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
cb97c43ce7
Renamed db update file to match standard.
2013-08-13 11:12:02 -04:00
940f7a191e
add code to add Colours and Deinterlacing to Monitors table. These were added by mastertheknife's perfpatch.
2013-08-13 11:05:20 -04:00
e2da7c37dc
bump version
2013-08-13 10:25:34 -04:00
c014f3faaa
delete generated files
2013-08-13 10:06:37 -04:00
0ec6622a9e
Cleaning up some build errors regarding Native Motion Detection
2013-08-13 09:59:30 -04:00
c3f468eb8c
Fixing zm_image_analyser.h:13:25: fatal error: zm_detector.h: No such file or directory
2013-08-13 09:53:31 -04:00
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
266b67d0bd
Support for control when monitor source is ffmpeg. This should fix #16 .
2013-08-13 08:34:37 -04:00
3a305522c4
Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
2013-07-25 11:50:24 -04:00
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
f1d9de75b0
Point root to the Monitors index action
2013-07-19 09:30:08 -04:00
46deb93f74
Events index view is now at a semi-usable state, similar to the original skin.
...
In the interest of releasing something, I am not going to use ajax here
for now. Goal is to have this view behave similar to the original Events
view in the original skin. Currently you can:
* Paginate events
* Filter events using the sidebar
Bug: Filter elements are unset when paginating.
2013-07-19 07:30:13 -04:00
ad0aaa6e93
Initial commit of Zone MVC
2013-07-18 08:08:07 -04:00
6ba1d8f041
Added the Js helper and RequestHandler component to AppController to be available app-wide.
2013-07-16 08:33:53 -04:00
e4ccd359cd
Allow setting of width with the live stream helper
2013-07-15 07:35:39 -04:00
4265e8b45f
Sort with newest at top, not bottom.
2013-07-11 12:09:45 -04:00
67ad15fdc5
Initial commit of the Logs Controller and View.
...
The log functionality is similar to that of the classic skin, though
with fewer options. Initial filtering support is for only component type.
Also displays a fixed last 100 log events, sorted by TimeKey ascending.
2013-07-11 12:06:12 -04:00
2ea43105ec
Merged config.js and events.js into main.js.
...
This should fix #15 as I'm keeping all JS in a single file, instead of
a file per page.
2013-07-11 12:00:01 -04:00
80ebaad07b
Initial commit of the Log model
2013-07-10 10:00:49 -04:00
64fba81f6a
Moved the navigation items to an ordered list
2013-06-25 12:21:21 -04:00
cdbb3d126e
Added Masonry from http://masonry.desandro.com/
...
Masonry is a JavaScript grid layout library, and it is going to make my
life easier on the Events page.
2013-06-22 21:53:53 -04:00
12537a7860
Added jquery-ui images and updated jquery-ui css to point to them.
2013-06-22 21:50:22 -04:00
e9e99261d9
Better styling of the Config page.
...
Added row highlighting, positioned all of the labels and inputs
appropriately, and added the description of the option.
2013-06-22 21:40:29 -04:00
bffe78904f
Display the correct input type for the config option.
...
I am keying the input type off of the 'Hint' and 'Type' columns
in the Config table. It would be easier if I just added an 'inputtype'
column to the Config table, and I might do that later, but I don't want to
mess with the database right now.
2013-06-22 11:59:46 -04:00
fe5df3eb8c
Also grab the Hint column from the Config table
2013-06-22 11:59:03 -04:00
5635b24897
Make the tab's first character uppercase
2013-06-21 22:22:54 -04:00
567c0c5c20
Switching on the category type to determine which type of input to display.
2013-06-21 22:20:16 -04:00
6faa248248
Sorting the Config results by Type (boolean, string, etc)
2013-06-21 22:19:27 -04:00
819f1b48d6
Filtering out the "hidden" category
2013-06-21 22:18:44 -04:00
d64a09576f
Split the config / options page into tabs based on Category.
...
Still a lot of work to do such as displaying the proper input
type based on option, however basic tabbing and saving works,
as does the on-hover tooltip (I think I put that in this commit).
2013-06-21 12:52:30 -04:00
bb19e80fa8
Support for control when monitor source is ffmpeg. This should fix #16 .
...
Some IP cameras need the source set to ffmpeg even though they are remote
cameras. These cameras do have a remote PTZ interface, but previously
when the monitor source was set to ffmpeg, the only control type
available was 'none'.
2013-06-15 19:50:19 -04:00
Kyle Johnson
Andy
nagyrobi
Isaac Connor