42ac3ceb3b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-07-09 11:00:05 -04:00
51631b84b4
cleanup generated files
2015-07-09 10:59:45 -04:00
8406818b00
Merge pull request #921 from pliablepixels/master
...
Added "RewriteBase /zm/api" for API routing
2015-07-05 08:34:28 -05:00
3a9c941213
Added "RewriteBase /zm/api" for API routing
2015-07-05 08:59:07 -04:00
1b2f214340
Dumb down Crud from 4.0 -> 3.0.10
2015-06-30 10:26:29 -05:00
1aebbec4e8
Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States
...
Conflicts:
db/zm_create.sql.in
db/zm_update-1.28.99.sql
2015-06-27 16:32:32 -05:00
592ecd8e94
fix montage view issue in mobile skin
2015-06-26 08:47:20 -05:00
4be341986f
Merge pull request #897 from pliablepixels/881-api-branch
...
Fixed events API to remove thumbnail code
2015-06-22 13:01:15 -04:00
1a0d4d2221
Console now shows custom run state in header (if applicable)
2015-06-21 09:31:21 -04:00
719a903d43
Fixed events API to remove thumbnail code
2015-06-20 20:08:10 -04:00
138e931e24
Fixed events API to remove thumbnail code
2015-06-20 19:57:55 -04:00
8d309fbd6e
Merge pull request #874 from seeebek/master
...
German translation update
2015-06-19 13:50:55 +02:00
7112001b64
getVersion.json now returns both ZM version and API version
2015-06-13 16:33:15 +00:00
12ba217de0
Added API version in addition to ZM version, also added loadConfig code that was there in the angular-ui branch but not merged to master
2015-06-13 16:32:37 +00:00
bda35ed4d6
fix bootstrap.ini substitution
2015-06-12 11:12:58 -04:00
ecb7720056
Merge pull request #882 from pliablepixels/881-merge-angularui-apis
...
Merged Angular UI branch API to master
2015-06-12 11:06:59 -04:00
d915d859ed
Convert Crud to submodule
2015-06-11 11:56:39 -05:00
dd9603f70f
Merged Angular UI branch API to master
2015-06-11 02:58:58 +00:00
f3a8217651
resolve conflicts from merge by seebaer1976
2015-06-05 19:34:52 +02:00
e10fdaf344
reduce the wait to 2/10ths instead of a whole second
2015-06-05 11:49:05 -04:00
c8e41319e6
fix state popup dimensions
2015-06-03 12:22:12 -04:00
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
4cf1e61197
Update de_de.php
2015-05-31 17:43:21 +02:00
ba980ae4ae
update german translation
2015-05-27 15:38:47 +02:00
bf4038a724
followup changes based on comments in #833
2015-05-21 12:23:31 -05:00
5876186909
Merge pull request #803 from knnniggett/mootools
...
Update Mootools
2015-05-21 13:15:13 -04:00
b7890ec923
Merge pull request #833 from knnniggett/slang
...
add translate function
2015-05-21 13:14:44 -04:00
82f5ab5175
Fix use of DEFINED. It takes a string not a constant. When COOKIE is not set or has changed, set it
2015-05-11 16:22:14 -04:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
8a1625463c
Merge pull request #823 from ZoneMinder/fix_session_concurrency
...
close the session before requiring the page contents to fix the concurre...
2015-05-09 17:50:18 -05:00
69ccd53653
rollback mootools-core to 1.4.5-compat
2015-05-09 17:23:01 -05:00
9ecc934927
add the new js files for classic flat skins
2015-05-01 16:50:44 -04:00
013009f127
fix the css .js file name
2015-05-01 16:50:29 -04:00
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
73cc4e5cab
move the window size definitions into a separate file for each css version flat or classic
2015-05-01 16:02:55 -04:00
0e7fa89dd1
Fix: typo in options_libvlc
...
Fixed typo in the OPTIONS_LIBVLC help.
2015-04-22 15:26:33 +03:00
01af58018b
close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session.
2015-04-20 13:06:34 -04:00
81eaf44595
Fix a bad SLANG key in monitor.php
2015-04-18 19:37:56 +02:00
e92fb40c84
Set date and time format in french lang file
2015-04-18 19:08:03 +02:00
216348274b
Remove a remaining hardcoded string
2015-04-18 18:14:36 +02:00
955237d6ac
Translate new strings in french file
2015-04-18 17:51:08 +02:00
ac8ace33f8
Remove hardcoded localized strings and update lang files
2015-04-18 17:14:14 +02:00
5d0d5dadc7
Fix translations after first review
2015-04-17 22:58:51 +02:00
0f09dddf9c
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into fix_french_lang_file
2015-04-16 22:38:25 +02:00
1674675da4
Translation of a bunch of english text
2015-04-16 22:32:47 +02:00
b2f6bfb5fc
upgrade bundled jQuery ( Closes : #785 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-15 11:39:29 +10:00
38f6eb8b5f
Update mootools to 1.5.1
2015-04-12 17:52:01 -05:00
98d91ded90
Found some introduced short tags
2015-04-08 20:13:27 +10:00
45fd7f1eca
Found some old open tags left over
2015-04-08 20:11:26 +10:00
750420d42f
Update de_de.php
2015-04-05 09:52:34 +02:00
35ba2a2107
Update de_de.php
2015-04-05 09:03:41 +02:00
2522537184
Update de_de.php
2015-04-04 22:38:12 +02:00
4aa9b0e802
Update de_de.php
2015-04-04 18:03:25 +02:00
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
da48b0ea4a
Update de_de.php
2015-04-04 09:21:43 +02:00
5c35bc5acb
Update de_de.php
2015-04-03 21:04:24 +02:00
2a3fdf3695
Update de_de.php
2015-04-03 19:12:15 +02:00
039cf09da9
Fix bad translations (first checking before tests)
2015-03-30 21:16:33 +02:00
c0b41ed6a8
Readd translations from Jypy
2015-03-30 20:50:42 +02:00
ca041a3ce5
Revert "Update fr_fr.php"
...
This reverts commit 3b9c3f0776
2015-03-30 20:06:59 +02:00
20107ac1e6
remove NETPBM dependency from autotools
2015-03-01 10:51:04 -06:00
1a17c820f2
Merge pull request #730 from ljack/master
...
Fix image and css import paths for style/skin named "flat"
2015-02-25 11:51:42 -05:00
e9384d445a
fix .upBtn and .downBtn also for "flat" css
2015-02-25 18:10:40 +02:00
8616fdb33d
fix import path
2015-02-25 18:09:23 +02:00
6233432559
fix import path
2015-02-25 18:08:41 +02:00
48950f3f1c
Update control.css
...
Update paths for .upBtn and .downBtn too
2015-02-25 09:24:19 +02:00
362153cb3a
Also fix video.pho which has the same problem.
2015-02-23 14:34:13 -05:00
bff26154b0
Also fix video.pho which has the same problem.
2015-02-23 14:31:15 -05:00
c9f109bc27
also fix timeline which has the same problem
2015-02-23 14:27:35 -05:00
dd714665bd
use explode instead of preg_split
2015-02-23 14:18:10 -05:00
bd3a9806b8
Fix sql query when user is limited to specific monitors
2015-02-23 14:16:04 -05:00
851a246cf2
Revert "Fix sql query when user is limited to specific monitors"
...
This reverts commit 41b581552e
2015-02-23 14:10:53 -05:00
41b581552e
Fix sql query when user is limited to specific monitors
2015-02-23 14:10:18 -05:00
9b0c8085eb
Merge pull request #720 from knnniggett/zmonvif
...
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 15:50:07 -05:00
7ef503ff59
User configurable arp tool
2015-02-21 13:08:04 -06:00
b000b997e9
Merge pull request #709 from ZoneMinder/find_arp
...
try harder to find arp.
2015-02-21 11:53:26 -06:00
4182fb3295
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 11:12:07 -06:00
3b9c3f0776
Update fr_fr.php
2015-02-20 12:30:33 +01:00
0af7d0cc0b
check defined(ZM_DEFAULT_SKIN) otherwise php will turn it into a string
2015-02-19 16:04:06 -05:00
b159f6ce9e
Fatal->Error since Fatal is fatal
2015-02-19 15:57:37 -05:00
438456ce93
include output if can't find arp
2015-02-19 15:43:34 -05:00
8eb8cacd56
Check to make sure that skin and css are valid.
2015-02-19 14:17:33 -05:00
c3f96ad8ca
fix path to the zone point gif
2015-02-19 11:11:01 -05:00
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
13c6be548d
If type -p doesn't work, try which, and if that doesn't work just try /usr/sbin/arp. Also don't bother with escapeshellcmd because these are not user inputs.
2015-02-17 15:39:59 -05:00
2b53e439b9
Add Capture Resolution to replace Capture Width and Capture Height
2015-02-11 13:14:51 -05:00
8657d0a243
Merge pull request #696 from ZoneMinder/improve_deleteEvent
...
Improve delete event
2015-02-09 07:15:27 -06:00
4524a61a50
prevent error message in log when Enabled is not checked
2015-02-06 14:15:26 -05:00
fed6748c6d
fixes to format date into zero padding and year as 2 digit
2015-02-06 13:00:55 -05:00
dbac099223
we don't use EndTime so don't load it
2015-02-06 11:50:23 -05:00
bcdac0104f
pass a minimum event hash instead of the event id to deleteEvent
2015-02-06 11:50:07 -05:00
9a1e210849
add comment
2015-02-06 11:46:35 -05:00
02a6c78182
make deleteEvent take either an event object or an eid.
...
load the relevant event data if passed an eid.
Use the StartTime to get to the event files instead of globbing the entire events path under the monitor.
2015-02-06 11:41:37 -05:00
2b00ebd02c
if path results in an empty string, set it to something so that the link is there when type is vlc
2015-02-03 10:52:49 -05:00
bf688f2d39
trival quoting changes and missing semi colons
2015-02-02 19:06:45 -05:00
690a2f083e
fix montage layout broken by my skin merging
2015-02-02 19:06:20 -05:00
2328ae8792
remove 50% width so that header auto-fits
2015-01-28 14:05:29 -05:00
d787ad3f7a
Merge pull request #666 from ZoneMinder/kill_zmcontrol
...
Kill zmcontrol
2015-01-07 17:28:08 -06:00
74929236e3
put the sendControlCommand(quit) into the right place
2015-01-07 16:56:10 -05:00
d0138af00c
use new sendControlCommand function to send normal commands as well as send the quit command on monitor edit.
2015-01-07 16:24:34 -05:00
2e48c2ba3d
add sendControlCommand function to do the heavy work of sending zmcontrol a command
2015-01-07 16:24:07 -05:00
4508c541ef
Update et_ee.php
...
Fixing Some problems
Parse error: syntax error, unexpected 'Parameters' (T_STRING) in /usr/share/zoneminder/lang/et_ee.php
2015-01-06 17:10:58 +02:00
a44f83cb7d
#658 Fix error message for finding arp path
2015-01-05 07:58:39 +11:00
1cfec7e3e7
Move require of config.php and logger up higher
2015-01-04 11:50:24 -05:00
ac80649e26
Merge pull request #657 from ZoneMinder/log_export_use_PATH_SWAP
...
Make the log export use ZM_PATH_SWAP and report the full path on error
2015-01-03 14:28:18 -06:00
3f64f9d919
Make the log export use ZM_PATH_SWAP and report the full path on error
2015-01-03 15:16:19 -05:00
8350ddac7c
replace getLoad() / getDiskPercent() with PHP native functions
2015-01-03 19:22:19 +01:00
ddae55a1c9
Merge pull request #645 from ZoneMinder/skin_css_default
...
Skin css default
2014-12-29 12:00:44 -05:00
1131809c92
format duration into HH:MM:SS
2014-12-19 10:18:27 -05:00
05206279df
add missing commas
2014-12-18 09:44:04 -05:00
478c9bc630
add custom lines for loading the available skins and css options
2014-12-18 09:34:14 -05:00
50e6784779
this adds two config options to System tab to set the default skin and css
2014-12-17 16:45:41 -05:00
45feac3d36
Merge pull request #640 from jrd288/offer_login
...
Offer login prompt instead of throwing error
2014-12-16 09:35:08 -05:00
c28206e8d1
Merge pull request #632 from ZoneMinder/better_security
...
better fix for the view=console security flaw.
2014-12-16 08:34:14 -06:00
52d3ec7142
Fixed autotools build to reflect file name change
...
postlogin.js -> postlolgin.js.php
2014-12-15 18:11:06 -05:00
f4289cd253
postlogin.js replaced by postlogin.js.php
2014-12-15 17:38:18 -05:00
10dba9b4c2
Offer login instead of error
...
When a user accesses a view but receives an error, and is not logged
on, he is offered a login prompt instead. The login prompt saves the
original query URL in a hidden field, and postlogin redirects back to
the original URL once the user has logged on.
If the user is logged in and there is an error, no login prompt is
shown.
This allows the user to click an event link in an e-mail and then log
in before being shown the event, instead of requiring going back
through the front ZM page to log in.
2014-12-15 17:17:03 -05:00
3c8153c9b4
better fix for the view=console security flaw.
...
This does it in index.php,so it guards all pages, and also just changes the view to login, so instead of giving an error, it presents you with the login, which I think is better.
2014-12-12 09:38:54 -05:00
b1aa349f11
add check to see if user has rights to view this monitor
2014-12-12 09:32:03 -05:00
74da3e9c02
fix auth requirement by checking for user when AUTH is on
2014-12-11 17:09:18 -05:00
fafef86298
Merge branch 'control_improvements'
2014-12-08 16:52:52 -05:00
27b9001eb4
default MoveRoot to empty to quiet an error in logs
2014-12-08 16:52:10 -05:00
5abc58ea14
Merge pull request #620 from SteveGilvarry/11-php-short-tags
...
Replace PHP Short Open Tags - Fixes #11
Works for me too.
2014-12-08 14:39:24 -05:00
2c1e4a9965
fix the paths so that the ptzControls are visible
2014-12-08 10:34:25 -05:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
f57f903aa6
Add views subdir
2014-12-01 16:10:01 -05:00
af0d9a1065
bug fix for listing the css options.
...
use SELECTED="SELECTED" instead of just SELECTED
2014-12-01 15:58:00 -05:00
fed12291be
add flat to the subdirs
2014-12-01 15:57:44 -05:00
9f7d31949d
remove the flat subdir
2014-12-01 15:55:22 -05:00
82c01479c6
move flat css files into the classic skin.
...
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
2014-12-01 15:44:01 -05:00
d7e08559d6
Merge pull request #582 from hanzese/patch-1
...
Update et_ee.php
2014-12-01 15:34:53 -05:00
e60919f19a
Update et_ee.php
...
Translating some code comments.
2014-11-27 03:51:40 +02:00
92b65c553e
Update et_ee.php
...
Changing back charset-utf-8.
2014-11-27 03:43:59 +02:00
ebe602616b
needs this one too
2014-11-26 14:30:53 -05:00
593f0781d6
this css directory was moved under /web/skins/classic/css/views so we don't need to have it in the SUBDIRS
2014-11-26 11:57:35 -05:00
641c94d5be
add CSSDescription which is used on the options tab for skin
2014-11-26 11:57:01 -05:00
193cb71b71
Add option for setting css to use with the skin. Also happens to add missing elements of the table for the skins tab and cleans up some spacing. Also, use a variable to tell whether to reload the page or not, which is required after you change the skin or css.
2014-11-26 11:55:53 -05:00
a412799003
Move the skins/classic/views/css dir under skins/classic/css/classic/views and update Makefile.am's to match
2014-11-26 11:29:04 -05:00
5bf34de07b
Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use.
2014-11-26 11:26:29 -05:00
bf3ec7b490
Since the css files are in subdirectories now, thise just needs to reference them
2014-11-26 11:24:55 -05:00
ebb31f12d2
Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use.
2014-11-26 11:23:06 -05:00
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
4c864aec35
fix saving groups
2014-11-25 14:29:15 -05:00
4e9c3494b8
Convert french lang file to UTF-8
2014-11-20 20:51:49 +01:00
993a186d06
Update et_ee.php
...
ZoneMinder Estonian Translation by Hannes
2014-11-19 10:25:35 +02:00
db86ac7b40
Update et_ee.php
...
ZoneMinder Estonian Translation by Hannes
2014-11-17 18:06:37 +02:00
79ca3dd736
Update et_ee.php
...
ZoneMinder Estonian Translation
2014-11-17 02:53:50 +02:00
35530c627a
Initial commit of Logs MVC
2014-11-15 19:03:40 +00:00
0129ca5f74
Rework the ConfigParser component.
2014-11-15 19:03:10 +00:00
e7d726bf75
Don't print out the Config string to the file system.
2014-11-15 19:02:54 +00:00
Isaac Connor
Andrew Bauer
Pliable Pixels
Andrew Bauer
Isaac Connor
Pliable Pixels
Ubuntu
Sebastian Kaminski
seebaer1976
Lihis
Emmanuel Papin
Dmitry Smirnov
SteveGilvarry
ljack
Jean-Philippe Bouillot
Hannes
Steve Gilvarry
Günter Grodotzki
jrd288
Kyle Johnson