Commit Graph

4685 Commits

Author SHA1 Message Date
Emmanuel Papin 7e8648d563 Add missing lines in distros/debian8_cmake/rules 2015-06-04 21:39:56 +02:00
Emmanuel Papin e2957702b5 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-06-04 20:57:34 +02:00
Emmanuel Papin 1b42dd90ef Merge branch 'plugin_support_cmake' into plugin_support 2015-06-04 20:54:35 +02:00
Emmanuel Papin 90fd90ae1e Add support to compile with -fPIC when using CMAKE on x86_64 architecture 2015-06-03 20:34:11 +02:00
Emmanuel Papin 5492fd9e93 Fix conflict during package installation 2015-06-03 20:10:02 +02: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
Emmanuel Papin a8524d9b3b Add debian8_cmake folder 2015-06-02 22:58:49 +02:00
Emmanuel Papin ded38268a4 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_cmake 2015-06-02 21:19:13 +02:00
Emmanuel Papin e3eee72abf Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-06-02 21:18:53 +02:00
Isaac Connor 35074dd75a Merge pull request #859 from manupap1/fix_iostream_include
Move iostream inclusion in zm.h and declare explicitely the namespace
2015-06-01 17:05:57 -04:00
Emmanuel Papin 3f20a08d16 Add cmake support 2015-05-31 02:37:58 +02:00
Emmanuel Papin 905237d7a6 Fix undefined variable issue with pOptions and call only pLang for translation 2015-05-30 14:33:15 +02:00
Emmanuel Papin 872fead1fa Rename zoneminder library 2015-05-30 14:11:42 +02:00
Emmanuel Papin 33f7342cec Enable plugin support on legacy debian folder and add a missing conditional build in zm_monitor.cpp 2015-05-30 00:30:35 +02:00
Emmanuel Papin de2ec868b4 Merge branch 'fix_iostream_include' into plugin_support
Conflicts:
	src/zm_image_analyser.h
2015-05-29 23:49:10 +02:00
Emmanuel Papin 7811354d92 Move iostream inclusion in zm.h and declare explicitely the namespace for cout 2015-05-29 23:22:20 +02:00
Emmanuel Papin 746deece73 Rename some files, remove links to unused libraries on binaries and some cleanup 2015-05-29 22:26:11 +02:00
Emmanuel Papin eff56664c3 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
Conflicts:
	web/lang/de_de.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/plugin.php
2015-05-28 23:43:13 +02:00
Isaac Connor a64182b45c Merge pull request #854 from seeebek/german-translation
update german translation
2015-05-27 09:55:14 -04:00
Isaac Connor bde8f781bd Merge pull request #850 from seeebek/840-ubuntu-15.04
ubuntu 15.04
2015-05-27 09:40:00 -04:00
Sebastian Kaminski ba980ae4ae update german translation 2015-05-27 15:38:47 +02:00
Sebastian Kaminski 3266b0b57e change for systemd 2015-05-24 22:13:09 +02:00
Sebastian Kaminski 3080ecdb20 add service and temp files 2015-05-24 22:09:43 +02:00
Sebastian Kaminski a671b452a8 change dependencies for ubuntu 15.04 2015-05-24 22:05:09 +02:00
Sebastian Kaminski f45af08947 copy ubutnu1204 without init.d 2015-05-24 22:01:51 +02:00
Isaac Connor 38666466fa Merge pull request #845 from knnniggett/slang2
Additional SLANG changes
2015-05-21 13:37:05 -04:00
Andrew Bauer bf4038a724 followup changes based on comments in #833 2015-05-21 12:23:31 -05:00
Isaac Connor 45b5fd3945 Merge pull request #801 from knnniggett/nph-zms
link zms to nph-zms, rather than build identical
2015-05-21 13:15:38 -04:00
Isaac Connor 5876186909 Merge pull request #803 from knnniggett/mootools
Update Mootools
2015-05-21 13:15:13 -04:00
Isaac Connor b7890ec923 Merge pull request #833 from knnniggett/slang
add translate function
2015-05-21 13:14:44 -04:00
Isaac Connor bf7df97abf Merge pull request #844 from knnniggett/cmake_hostos
Cmake hostos
2015-05-21 13:14:15 -04:00
Andrew Bauer d509861f9e Merge pull request #838 from ZoneMinder/zmaudit_update1
Zmaudit update1: Make MIN_AGE Configurable
2015-05-21 12:10:08 -05:00
Andrew Bauer 4013d2134f Delete README-OmniOS.txt
This information is going to change and will be re-added later.
2015-05-20 17:26:43 -05:00
Andrew Bauer e8ecc505ed fix error 2015-05-20 17:23:41 -05:00
Andrew Bauer 47012c58de Check the Host OS, similar to configure.ac 2015-05-20 17:20:44 -05:00
Andrew Bauer 8d0bdc4cf1 Merge pull request #842 from whorfin/master
Port to OmniOS/Solaris
2015-05-19 08:35:22 -05:00
Andrew Bauer 2549865c63 Merge pull request #812 from SteveGilvarry/Cmakelists_CleanUp
Fixes #760 in part Clean up CMakeLists.txt
2015-05-19 08:09:08 -05:00
SteveGilvarry d96c952047 Merge branch 'master' into Cmakelists_CleanUp
Conflicts:
	CMakeLists.txt
2015-05-19 21:12:34 +10:00
Rick Sayre 334584d37f exactly rollback web/includes/config.php.in 2015-05-18 22:01:59 -07:00
Rick Sayre 8c7e633d8f Undo ZM_VERSION changes 2015-05-18 21:55:00 -07:00
Rick Sayre ffe46978d2 Undid PATH change, needed for mysqldump; which I see is indeed called
many other places with incorrect paths.
Make macros should be setting all this up correctly!
mysqldump is [for example] in /opt/local/bin, not /usr/bin, with pkgin
2015-05-18 21:49:08 -07:00
Rick Sayre fb5c1abc87 Undid ZM_VERSION hacks 2015-05-18 21:44:41 -07:00
Andrew Bauer f638b077fc Update README.md 2015-05-18 16:58:11 -05:00
Rick Sayre b52b7ea89b Added OmniOS/Solaris info 2015-05-17 17:34:52 -07:00
Rick Sayre 12516da3dc Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
Andrew Bauer ea7c1f6883 Update README.md 2015-05-17 16:34:08 -05:00
Andrew Bauer b65d08b445 Update README.md
typo
2015-05-17 16:21:22 -05:00
Andrew Bauer 9bd4fa6c8a Update README.md 2015-05-17 16:20:37 -05:00
Andrew Bauer 466c6d9dd8 Update README.md 2015-05-17 15:35:49 -05:00