Isaac Connor
53bd342f85
remove Google open Sans external import
2016-01-08 09:46:14 -05:00
Isaac Connor
270c737f40
Merge branch 'master' into storageareas
2016-01-05 09:36:36 -05:00
Isaac Connor
44f3b99d24
change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet
2016-01-04 14:59:04 -05:00
Isaac Connor
75f6da3526
Merge branch 'multi-server' into storageareas
2016-01-04 14:53:52 -05:00
Isaac Connor
273ab6c5c6
Only show Server column when more than 1 Servers are defined
2016-01-04 14:51:24 -05:00
Isaac Connor
5c0e4aa172
Merge branch 'multi-server' into storageareas
2016-01-01 17:11:01 -05:00
Isaac Connor
cf7e168872
Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist
2016-01-01 17:10:37 -05:00
Isaac Connor
468f997e4c
Soft error, with logging when the filter element doesn't exist
2016-01-01 16:36:29 -05:00
Isaac Connor
93dbc3f0c1
Merge multi-server updates and bump version
2016-01-01 16:31:02 -05:00
Isaac Connor
31ba0221ed
Add Server to filters and log results
2015-12-31 10:13:03 -05:00
Isaac Connor
983b47f6dc
Add Server columns
2015-12-31 09:09:57 -05:00
Isaac Connor
492550b5ef
Merge branch 'storageareas' into newpointone
...
Conflicts:
scripts/zmaudit.pl.in
2015-12-24 12:36:40 -05:00
Isaac Connor
45987e92a9
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2015-12-24 12:34:55 -05:00
Isaac Connor
479e5df454
Add default events dir to dropdown
2015-12-22 10:53:39 -05:00
Isaac Connor
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
Isaac Connor
9d8455daea
fix size of filter popups
2015-12-21 15:18:05 -05:00
Isaac Connor
a840246849
Add Server dropdown for ServerId
2015-12-21 14:29:53 -05:00
Isaac Connor
aa9a6ddcc3
populate dropdown with the available storage areas when StorageId is selected
2015-12-21 14:12:33 -05:00
Isaac Connor
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
Isaac Connor
ca07b951cb
Merge branch 'master' into newpointone
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -05:00
Isaac Connor
872e5eff15
Merge branch 'multi-server' into newpointone
...
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
2015-12-21 11:35:16 -05:00
Isaac Connor
00c4eedb90
Add StorageId and StorageName to fields that we can filter on
2015-12-21 10:04:13 -05:00
Isaac Connor
b626712a2f
Add ServerId and ServerName to fields that we can filter on
2015-12-21 10:03:48 -05:00
Isaac Connor
27597c3401
Merge branch 'master' into storageareas
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-20 11:19:44 -05:00
SteveGilvarry
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
Andy Bauer
e5f243a9f8
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
2015-12-19 08:16:20 -06:00
Steve Gilvarry
e3d634e53e
Merge pull request #1182 from ZoneMinder/one_eighth
...
add a 1/8th scale option, which is useful for 1920x1080 streams
2015-12-19 14:07:18 +11:00
Isaac Connor
a0f8e8be4b
increase width and height of monitors popup to fit new fields
2015-12-18 13:43:16 -05:00
Isaac Connor
ee42174002
Merge branch 'master' into storageareas
2015-12-18 13:42:15 -05:00
Isaac Connor
983d87f69b
increase height and width of groups window to fit buttons in
2015-12-18 13:34:44 -05:00
Isaac Connor
ca45ac23fa
increase height of group edit window
2015-12-18 13:30:42 -05:00
Isaac Connor
fb1766f21f
Add storage.php
2015-12-18 11:39:42 -05:00
Isaac Connor
09c75e2363
add a storage area editing page
2015-12-15 14:08:34 -05:00
Isaac Connor
20f9a01a66
Add a Storage tab, to provide a place to define your storage areas
2015-12-15 11:13:21 -05:00
Isaac Connor
14dc447145
add a Storage Area dropdown to set where this monitor will storage it's events
2015-12-15 11:13:00 -05:00
Isaac Connor
14cde582cf
Merge branch 'multi-server' into multiserverplusstorage
...
Conflicts:
src/zm_monitor.h
2015-12-14 16:55:26 -05:00
Isaac Connor
b2b1afa8ad
Merge master
2015-12-14 15:49:32 -05:00
Isaac Connor
f2065e2fcb
Merge branch 'one_eighth' into multi-server
2015-12-08 08:47:35 -05:00
Isaac Connor
d6b2e1959f
add a 1/8th scale option, which is useful for 1920x1080 streams
2015-12-08 08:40:44 -05:00
Isaac Connor
3c86965760
Merge branch 'master' into multi-server
...
Conflicts:
web/skins/classic/js/flat.js
2015-12-04 15:31:30 -05:00
Isaac Connor
f54b8c27ee
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:32 -05:00
Isaac Connor
34f6590107
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:26 -05:00
Isaac Connor
aa91e69a9b
add monitorUrl to be used to target the recording server for the monitor
2015-12-01 15:17:49 -05:00
Isaac Connor
342326e159
append monitorUrl to thsiURL to get access to the recording server for the monitor stream
2015-12-01 15:17:25 -05:00
Isaac Connor
95f002c7d6
convert monitor hash accesses to function calls
2015-12-01 15:16:53 -05:00
Isaac Connor
382ad0f390
put () after property names of Monitor object
2015-12-01 14:30:24 -05:00
SteveGilvarry
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
Isaac Connor
c2a7e0c587
fix size of monitor popup in flat skin
2015-11-25 15:39:46 -05:00
Heng Liu
5ea11a8bfe
use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
...
also fixed bug which prevented seeking in timeline video preview
2015-11-18 21:21:56 -08:00
Isaac Connor
fc85ccbf5f
Set value for Hostname to avoid php warning. fix save button. Can't use it to pass action value because it gets translated.
2015-11-11 16:43:23 -05:00
Heng Liu
05a2445b7a
better way of detecting showing image or video in timeline and event view
...
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
2015-10-24 22:22:52 -07:00
SteveGilvarry
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
Isaac Connor
2237391876
white spacing, and fix loading of Server objects in monitor
2015-10-15 09:28:35 -04:00
Isaac Connor
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
Heng Liu
59b0675588
only expose monitor info which are being used in client
2015-10-02 20:04:10 -07:00
Isaac Connor
1d173a9bf0
Merge pull request #1083 from pliablepixels/1082-monitor-orange
...
fixed orange display for monitor mode
2015-10-06 08:36:35 -04:00
Isaac Connor
e12640ec73
Merge branch 'no_overwrite_zm_conf' into multi-server
2015-10-02 15:34:14 +00:00
Isaac Connor
cf5473836e
set default border on live streams so that when they alarm they don't jump around
2015-10-02 10:04:56 -04:00
Heng Liu
2fd6cbe742
fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)
2015-10-01 22:41:31 -07:00
Isaac Connor
ea87ffe66f
merge master, bump version to 1.28.108
2015-10-01 11:52:49 -04:00
Pliable Pixels
d9355064e7
fixed orange display for monitor mode
2015-10-01 11:35:38 -04:00
Isaac Connor
cb18adef5c
increase min height of zone edit popup so that buttons are visible
2015-09-28 13:01:07 -04:00
Isaac Connor
4e2ed00027
widen zone edit popup to fit the image
2015-09-28 12:54:54 -04:00
Isaac Connor
7d52c0b784
widen events popup to fit the thumbnail
2015-09-28 12:44:58 -04:00
Isaac Connor
e4d51e1819
Merge branch 'master' into multi-server
2015-09-28 10:04:23 -04:00
Pliable Pixels
727486d8f3
recaptcha now displays translated message if secret is wrong
2015-09-25 11:11:25 -04:00
Pliable Pixels
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -04:00
Isaac Connor
e4b0e74f69
merge master
2015-09-24 10:01:27 -04:00
Pliable Pixels
25ab1f6ddd
fixed recaptcha showing up pre DB update
2015-09-23 10:54:24 -04:00
Pliable Pixels
23d5e0e95b
fixed recaptcha showing up pre DB update
2015-09-23 10:50:15 -04:00
Dmitry Smirnov
333e7ec67b
header typo corrections
2015-09-19 17:39:54 +10:00
Isaac Connor
ba1100fc03
continue conversion from array to class of Monitor
2015-09-17 16:06:47 -04:00
Isaac Connor
aac45e54b8
monitor array to class
2015-09-17 15:35:38 -04:00
Isaac Connor
c415399043
add Hostname to Server
2015-09-17 15:35:27 -04:00
Isaac Connor
366c4ec676
monitor array to class
2015-09-17 15:35:09 -04:00
Isaac Connor
4a65ae1d2a
fix error in display of Server
2015-09-17 15:34:48 -04:00
Isaac Connor
0f181b72d1
include Server object and display the server column
2015-09-16 14:51:23 -04:00
Isaac Connor
e172911088
include Server object and fix Server dropdown
2015-09-16 14:51:05 -04:00
Isaac Connor
681718e908
init to avoid error message
2015-09-16 11:07:08 -04:00
Isaac Connor
535a760f26
Merge branch 'master' into multi-server
...
Conflicts:
configure.ac
2015-09-16 09:12:55 -04:00
Isaac Connor
4fa6948e5c
add form validation for server editing. Currently just requires a name
2015-09-16 09:12:21 -04:00
Andrew Bauer
04fcc253bd
Merge pull request #1048 from pliablepixels/1046-google-recaptcha
...
Google recaptcha
2015-09-01 08:18:54 -05:00
Pliable Pixels
2481c7a22e
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:43 -04:00
Isaac Connor
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -04:00
Pliable Pixels
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
Andy Bauer
395e628541
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-29 07:57:18 -05:00
Isaac Connor
b2699237c7
put back mootools
2015-08-27 11:35:47 -04:00
Isaac Connor
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
Isaac Connor
1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
Isaac Connor
6093587ff2
Merge pull request #1039 from pliablepixels/1038-fixing-state-mgmt-1030-isActive-fix
...
1038 fixing state mgmt 1030 is active fix
2015-08-27 09:08:50 -04:00
Robin Daermann
dc8a3769e7
Make the capture process restart if a Privacy zone got changed
2015-08-27 09:45:12 +02:00
Pliable Pixels
08d177185c
added oninput for text field handling
2015-08-26 11:22:09 -04:00
Pliable Pixels
02a6443c3b
Cleaned up button handling
2015-08-26 11:21:29 -04:00
Isaac Connor
c60d1cbeca
Merge pull request #1037 from pliablepixels/1036-flat-skin-grey-out-disabled-buttons
...
Grey color for disabled buttons
2015-08-25 12:50:50 -04:00
Pliable Pixels
a6f296d84e
Grey color for disabled buttons
2015-08-25 12:29:40 -04:00
Andrew Bauer
a995d72ebd
add warning and help text for maxfps fields
2015-08-22 12:36:49 -05:00
Andrew Bauer
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
Robin Daermann
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
Robin Daermann
b5fc6a9091
Make web correctly recognize new zone type
2015-08-20 15:09:02 +02:00
Isaac Connor
41637278c9
merge master
2015-08-19 16:08:12 -04:00
Isaac Connor
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
Isaac Connor
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
Andrew Bauer
fe3595bfa1
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 20:20:53 -05:00
Andrew Bauer
68adcc9e67
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 14:07:38 -05:00
Linwood-F
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
Linwood-F
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
Isaac Connor
3462b0e0ab
content for server edit popup
2015-08-17 12:42:20 -04:00
Isaac Connor
7eb07dbb65
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-17 12:30:54 -04:00
Robin Daermann
e390200824
Small dark CSS fixes in frames and timeline view
2015-08-17 14:39:41 +02:00
Robin Daermann
299c629a20
Merge remote-tracking branch 'upstream/master' into large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-17 13:42:36 +02:00
Andrew Bauer
c17de4a00f
add Exif checkbox to monitor
2015-08-16 17:56:03 -05:00
Andrew Bauer
32f6c92b02
replace php short open tag
2015-08-16 12:29:03 -05:00
Isaac Connor
4f07279d25
include server.php in autotools build
2015-08-16 12:25:23 -04:00
Isaac Connor
99d674ef78
remove code that put a * next to the server name. It was copied from the user list and indicated the logged in user.
2015-08-16 12:22:31 -04:00
Isaac Connor
b3240bbc8f
set name=action on submit tag, and remove stuff that we don't want right now
2015-08-16 12:21:52 -04:00
Isaac Connor
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
Isaac Connor
9117e2949a
add server.php.
2015-08-16 10:52:47 -04:00
Andrew Bauer
c53bb7f56f
change edit permission from system to groups
2015-08-15 13:45:43 -05:00
Andrew Bauer
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
Andrew Bauer
c051f3482b
add Groups to options again
2015-08-15 12:37:25 -05:00
Andrew Bauer
1d97e9d1f9
Add Groups column to options
2015-08-15 12:24:48 -05:00
Andrew Bauer
85e2b165b1
bump version to 1.28.101
2015-08-15 12:01:57 -05:00
Andrew Bauer
dff624a42c
Merge pull request #985 from ZoneMinder/fix_state_load
...
fix #948 1
2015-08-11 10:45:16 -05:00
Andrew Bauer
882bf76750
Merge pull request #986 from ZoneMinder/fix_948_3
...
quiet error when no Servers in Servers table
2015-08-11 10:45:04 -05:00
Robin Daermann
078e18e6c5
Add label size to monitor options (frontend part)
...
This commit adds the option "Font size" to monitor options in the
timestamp panel. Includes translations of "Font size" for german
(de_de), french (fr_fr) and spanish (es_es). All other language files
contain the english text.
2015-08-10 15:35:19 +02:00
Linwood-F
3b5638e54d
Fix omitted reference to gif file
2015-08-09 13:12:45 -04:00
Linwood-F
6425df76c7
Switch to the standard routine in web functions include for auth
2015-08-09 13:10:43 -04:00
Linwood-F
7a76cb3df1
Add security for those using authorization
2015-08-09 12:24:04 -04:00
Linwood-F
9d7dc0d81b
Safari compatibility changes
2015-08-07 23:27:26 -04:00
Linwood-F
bf655b6656
Corrections from askers testing.
2015-08-07 22:26:03 -04:00
Linwood-F
3ce365ea8c
Tweaks to live display to remove sliders in fit mode and general fixes
2015-08-06 15:42:04 -04:00
Robin Daermann
37e01b504b
Implemented #989 (highlight current row in tables) for dark CSS
2015-08-05 14:36:07 +02:00
Dmitry Smirnov
c4f78d634c
CSS[skins/classic]: highlight current row in tables.
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-08-05 10:43:02 +10:00
Isaac Connor
4c8d7d7f62
quiet error when no Servers in Servers table
2015-08-04 11:48:04 -04:00
Isaac Connor
e178e1b1d6
fix #948 1
2015-08-04 11:37:11 -04:00
Linwood-F
278434ec3f
Fix regression in last commit where ALL not working
2015-08-03 22:00:00 -04:00
Linwood-F
76c037f06a
Fix bug in scale calling to zms
2015-08-03 16:36:14 -04:00
Linwood-F
e7264a8167
Minox fixes, make live mode default, 1 hour default
2015-08-03 15:31:13 -04:00
Linwood-F
42f77377f2
Add a fit feature to fit all monitos on screen
2015-08-02 16:15:18 -04:00
Linwood-F
4354cbeecb
More minor changes, last in prelude of next version
2015-07-30 19:01:27 -04:00
Linwood-F
3e85d57710
New version with added live view
2015-07-30 12:06:52 -04:00
Andrew Bauer
42e021e652
Merge pull request #976 from SteveGilvarry/FrameImageGen
...
Dynamically create jpegs from video file for viewing in browser
2015-07-28 10:10:38 -05:00
Michael
5c44285f98
dynamically create jpegs from video file for viewing in browser
2015-07-29 00:24:05 +10:00
Michael
7502e5b3e3
added control for video playback rate
...
Conflicts:
web/skins/classic/views/event.php
2015-07-29 00:07:19 +10:00
Michael
477c34cc2c
Added missing brackets
2015-07-28 23:08:45 +10:00
Michael
6c8dbb8bea
Typo
...
added missing "
2015-07-28 23:08:10 +10:00
Michael
2d4c2bbe0a
Beautify!
...
Make the code somewhat readable.
2015-07-28 23:05:06 +10:00
user
46204c2768
local storage of video js plugin
2015-07-28 23:03:59 +10:00
user
2e8d88915b
removed redundant field in sql query
...
Conflicts:
web/skins/classic/views/event.php
2015-07-28 23:02:56 +10:00
user
05e82d2a96
proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate
...
Conflicts:
web/skins/classic/views/event.php
2015-07-28 22:55:27 +10:00
SteveGilvarry
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10:00
Robin Daermann
651cffd3b5
Small color corrections in tabList
2015-07-27 10:07:01 +02:00
Robin Daermann
14ebd937c7
Added missing javascript file to Makefile.am
2015-07-27 09:53:59 +02:00
Robin Daermann
5588406570
Add dark CSS for classic view
2015-07-27 09:53:59 +02:00
root
911f0fad28
Use destination color from CSS in transition effect in log view (instead
...
of #000000 )
2015-07-27 09:53:59 +02:00
Emmanuel Papin
1c8363cc29
Do not display 0.00 for AnalysisFPS
2015-07-24 00:27:47 +02:00
Emmanuel Papin
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
Linwood-F
a091ad16f3
Final cleanup before pull request
2015-07-23 15:36:21 -04:00
Linwood-F
b88403cd41
Minor corrections based on feedback to date
2015-07-23 15:01:53 -04:00
Emmanuel Papin
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
Linwood-F
84ed491765
Initial Montage Review for people to take a look at
2015-07-22 13:51:31 -04:00
Emmanuel Papin
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
Isaac Connor
02ee745167
parameter to defined should be in quotes
2015-07-17 10:09:22 -04:00
root
560a4cccbe
Show correct part of URL (hostname) for ffmpeg sources in console
2015-07-17 13:59:40 +02:00
Isaac Connor
cc5ca259ed
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-07-15 16:47:36 -04:00
Isaac Connor
ace8597b8d
Merge branch 'master' into multi-server
2015-07-14 16:10:51 -04:00
Isaac Connor
b12d72c68f
fix monitor popup size
2015-07-09 11:44:27 -04:00
Isaac Connor
04366e752a
add Servers to options, a server editing popup and a server selection to monitors
2015-07-09 11:41:46 -04:00
Pliable Pixels
1a0d4d2221
Console now shows custom run state in header (if applicable)
2015-06-21 09:31:21 -04:00
SteveGilvarry
b6af731400
Add translate options for h264 Storage options in Monitor and update en_gb file
2015-06-10 23:41:17 +10:00
SteveGilvarry
9b06b1399c
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
2015-06-10 23:09:30 +10: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
Andrew Bauer
bf4038a724
followup changes based on comments in #833
2015-05-21 12:23:31 -05:00
Andrew Bauer
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
Andrew Bauer
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
Isaac Connor
9ecc934927
add the new js files for classic flat skins
2015-05-01 16:50:44 -04:00
Isaac Connor
013009f127
fix the css .js file name
2015-05-01 16:50:29 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Emmanuel Papin
81eaf44595
Fix a bad SLANG key in monitor.php
2015-04-18 19:37:56 +02:00
Emmanuel Papin
216348274b
Remove a remaining hardcoded string
2015-04-18 18:14:36 +02:00
Emmanuel Papin
ac8ace33f8
Remove hardcoded localized strings and update lang files
2015-04-18 17:14:14 +02:00
Dmitry Smirnov
b2f6bfb5fc
upgrade bundled jQuery ( Closes : #785 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-15 11:39:29 +10:00
SteveGilvarry
98d91ded90
Found some introduced short tags
2015-04-08 20:13:27 +10:00
SteveGilvarry
45fd7f1eca
Found some old open tags left over
2015-04-08 20:11:26 +10:00
Dmitry Smirnov
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
SteveGilvarry
fd94d22b0e
Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors
2015-03-22 17:31:22 +11:00
SteveGilvarry
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +11:00
Isaac Connor
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
ljack
e9384d445a
fix .upBtn and .downBtn also for "flat" css
2015-02-25 18:10:40 +02:00
ljack
8616fdb33d
fix import path
2015-02-25 18:09:23 +02:00
ljack
6233432559
fix import path
2015-02-25 18:08:41 +02:00
ljack
48950f3f1c
Update control.css
...
Update paths for .upBtn and .downBtn too
2015-02-25 09:24:19 +02:00
Isaac Connor
362153cb3a
Also fix video.pho which has the same problem.
2015-02-23 14:34:13 -05:00
Isaac Connor
bff26154b0
Also fix video.pho which has the same problem.
2015-02-23 14:31:15 -05:00
Isaac Connor
c9f109bc27
also fix timeline which has the same problem
2015-02-23 14:27:35 -05:00
Isaac Connor
dd714665bd
use explode instead of preg_split
2015-02-23 14:18:10 -05:00
Isaac Connor
bd3a9806b8
Fix sql query when user is limited to specific monitors
2015-02-23 14:16:04 -05:00