eacf6cd415
Restyle login page, move recaptcha js to <head>
...
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
2016-11-10 21:46:55 -07:00
1607ae1210
Load bootstrap css
2016-11-10 21:45:46 -07:00
2c93f61622
Add bootstrap 3.3.7
2016-11-10 21:45:18 -07:00
9f43825b92
prevent the end user from slecting an invalid configuration on the PT… ( #1676 )
...
* prevent the end user from slecting an invalid configuration on the PTZ control configuraion "Move" tab
* change to console.php should not be in this pr
2016-11-08 22:10:51 -05:00
8c41781a9f
Fix event.stop error in watch.js See #1672 ( #1678 )
2016-11-08 18:53:06 -05:00
735d2df3c9
event is redefined before being passed to deleteEvent. Fixes #1671
2016-11-04 23:23:40 -06:00
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
bd47439056
Merge pull request #1639 from connortechnology/cookie_scale
...
store the scale value for watch and event views in a cookie, differen…
2016-11-03 12:35:15 -06:00
099cca210b
fix monitorId to MonitorId
2016-11-03 14:34:17 -04:00
d504043a9e
Update ru_ru.php
...
Remote extra line
2016-11-01 00:32:46 +11:00
a7c1231b46
fix WatchScale -> EventScale
2016-10-26 14:53:24 -04:00
0409ae5582
Merge pull request #1652 from connortechnology/fix_popup
...
handle when window.open fails
2016-10-20 05:17:44 +11:00
11cc73f55d
Merge pull request #1651 from connortechnology/fix_disable_monitor
...
Fix logic when disabling a monitor
2016-10-20 05:16:22 +11:00
c78a543e8e
Merge pull request #1475 from connortechnology/htmlselect
...
introduce htmlselect as an alternative to buildselect
2016-10-20 05:05:59 +11:00
192d0dbb45
added TimeZone get API
2016-10-18 14:07:31 -04:00
aaf8f6c98b
add the missing case for ServerId in Filter processing.
2016-10-18 10:14:19 -04:00
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
7c8b99af23
fix bracket problems
2016-10-11 12:43:13 -04:00
c02b840274
Fix logic when disabling a monitor
2016-10-11 12:10:47 -04:00
ded1e0ea73
handle when window.open fails
2016-10-11 11:48:29 -04:00
3801d9e43e
Disabled autocorrect, autocapitalize, spellcheck on username field for login form
2016-10-10 11:27:36 -07:00
7b574e0d41
Merge pull request #1645 from connortechnology/fix_onvif
...
Fix onvif
2016-10-04 16:34:58 -05:00
ac24865647
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:51 -04:00
6814bcc791
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:38 -04:00
09c5e3012a
username and password don't actually have to be specified
2016-10-04 14:09:32 -04:00
21a94a6200
better error message
2016-10-04 10:29:37 -04:00
6c3a3d3d50
store the scale value for watch and event views in a cookie, differentiated by monitorId.
2016-09-27 09:46:04 -04:00
92d7cad5f1
enabled utf8
2016-09-21 11:53:34 -04:00
5f46b8f942
Merge pull request #1621 from connortechnology/fix_1620
...
ptzControl expects a monitor object instead of a dbrow array.
2016-09-15 10:18:26 -04:00
db8cada380
fix merge
2016-09-13 15:01:02 -04:00
54db9f2e3a
ptzControl expects a monitor object instead of a dbrow array.
2016-09-12 21:36:03 -04:00
563f4a9d46
Merge pull request #1505 from ZoneMinder/fix_filter_actions
...
Confirmed check box status is now retained after save and changing filters.
2016-09-11 14:13:51 +10:00
e35ef3ce83
Merge pull request #1617 from coracis/master
...
Update German translation
2016-09-09 08:55:19 -05:00
321deb5506
Merge pull request #1599 from sabbath88/master
...
add some more translation
2016-09-09 08:40:05 -05:00
070051d06a
Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9'
...
For easy pull-requesting
2016-09-09 14:20:03 +02:00
6fab2e97b1
Update German translation of Buffer
2016-09-09 13:32:20 +02:00
b10c79b4f7
Add translation for 'Montage Review'
2016-09-09 13:26:19 +02:00
6b18184e4a
Remove confusing link to web console
2016-09-09 12:38:30 +02:00
4dc6fc03b3
Add a missing translate()-call
2016-09-09 12:35:34 +02:00
430ecd8e32
Fix some too direct translations into German
2016-09-09 11:51:53 +02:00
d017138550
Fix a 'false friend' in German translation
2016-09-09 11:25:12 +02:00
1440dd9265
retab
2016-09-03 15:02:32 -04:00
7bf0b3c423
readded forMonitor - removed by mistake
2016-09-03 14:51:24 -04:00
9a4330eb59
#1537 Zones Controller not returning all zones
2016-09-03 14:46:47 -04:00
d6852e10b7
Merge pull request #1609 from connortechnology/fix_1606
...
implement suggested code to stop the monitor when Function is set to …
2016-09-01 22:57:57 -06:00
55f5db55dd
implement suggested code to stop the monitor when Function is set to None
2016-09-01 11:43:20 -04:00
2d44531d1f
add some more translation
2016-08-25 14:24:14 +02:00
7d48b2c6c5
Merge pull request #1577 from ZoneMinder/fix_zmaControl
...
fix error in calling zmaControl
2016-08-17 08:36:51 -05:00
ea34f3d69a
Merge pull request #1576 from ZoneMinder/show_other_zones
...
include polygons for the other zones.
2016-08-15 20:36:16 -05:00
31cb86046c
Merge pull request #1592 from connortechnology/fix_analysis_frame
...
Fix analysis frame
2016-08-14 10:54:46 -05:00
a0bc30d3fe
fix the order of analyse/capture being passed
2016-08-12 15:40:47 -04:00
240336e3ec
silence error when Event has no StorageId set
2016-08-12 15:20:21 -04:00
9106675842
pass capture or analyse to getImageSrc
2016-08-12 15:17:13 -04:00
bcb7dd1ba4
take optional show= to specify the analyse image or the capture image
2016-08-12 15:16:05 -04:00
3dadcc8d32
add ability to pass show=capture or show=analyse to getImageSrc
2016-08-12 15:14:51 -04:00
bc4923b555
use instead of for the frame object and pass to getImageSrc which expects an array
2016-08-12 13:50:18 -04:00
24d471f452
Merge pull request #1503 from ZoneMinder/id_on_console
...
add option to show monitor ID on console
2016-08-06 10:59:03 -05:00
9d65ef3bb2
Merge pull request #1556 from knnniggett/banner
...
custom banner text on web console
2016-08-06 10:59:53 -04:00
382896dc0d
Merge pull request #1498 from josh4trunks/mysql_port_socket
...
Add support for MySQL Port / Unix Socket
2016-08-06 09:32:32 -05:00
aa78b403a1
zmaControl can take an id #, so need to move the check for local server test down.
2016-08-02 12:33:41 -04:00
8093470a2e
make only the editing polygon have a border. Set default for Type when creating a new zone
2016-08-02 12:19:55 -04:00
b522371080
include polygons for the other zones.
2016-08-02 12:02:07 -04:00
cd43d1fa7a
Rough in Event disk space reporting
2016-07-19 17:34:01 -04:00
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05:00
3eccdcd3e2
Merge pull request #1524 from ZoneMinder/add_api_auth
...
if user=&pass= are in request, use them for auth in api
2016-06-29 21:47:44 +10:00
f3779d543c
Merge pull request #1521 from ZoneMinder/fix_zone_edit
...
update area when points move
2016-06-29 21:46:28 +10:00
bdd0790106
Merge pull request #1522 from ZoneMinder/video_session
...
Move the session start down to where it is actually needed so that we…
2016-06-29 21:45:12 +10:00
b4aec41d3d
fix warnings and move User import up higher to where it needs to be
2016-06-21 09:09:58 -04:00
0c82e82ae2
Don't update x in updateY and don't update y in updateX as they are not defined.
2016-06-16 12:00:00 -04:00
d0e08b32f5
Merge pull request #1506 from Disassembler0/master
...
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-06-17 00:01:08 +10:00
f804f7739d
Adjust download file path to swap path to match the file generated.
2016-06-14 20:49:38 +10:00
83ac4cd061
change the input handler from onchange to oninput. Disable form submit when hitting enter
2016-06-13 09:40:04 -04:00
632ec38d7d
Put back in neccessary callt o updateArea
2016-06-12 16:10:24 -04:00
4f2e0edb44
remove unnecssary updateAreas
...
remove unnecessary updateZoneImage
2016-06-07 21:23:30 -04:00
dbdd1ae51e
remove debug logging
2016-06-07 16:26:58 -04:00
f26c9168c4
if user=&pass= are in request, use them for auth
2016-06-07 16:25:35 -04:00
593fe2b0c5
update area when points move
2016-06-07 11:40:53 -04:00
1930b18100
Move the session start down to where it is actually needed so that we don't hold it open while generating videos
2016-06-07 10:38:37 -04:00
a57a3d3186
Merge pull request #1501 from ZoneMinder/fix_zone_edit
...
Fix zone edit
2016-05-31 10:33:31 -05:00
883b323528
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-05-29 22:16:00 +02:00
9f6f5100fe
also copy Name from the request on update and only show delete button if it has a name
2016-05-29 11:32:18 -04:00
101c93d422
When the filter is not being loaded, copy the auto fields in the request params into the dbFilter object
2016-05-27 12:45:36 -04:00
c4e5299943
sync up auto to Auto
2016-05-27 12:45:04 -04:00
65e33d6c19
synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter
2016-05-27 11:11:30 -04:00
7277283659
rename AttrServerId to AttrServer, because that is the text that is returned
2016-05-27 10:12:46 -04:00
f461bc1e80
get rid of extra )
2016-05-26 12:18:58 -04:00
f969186abb
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
2016-05-26 11:15:13 -04:00
730abc9789
make zones unclickable when zm is not running
2016-05-26 09:35:36 -05:00
1972c4116b
Merge pull request #1486 from connortechnology/update_image_view
...
Update image view
2016-05-26 09:05:14 -05:00
ceaacf91bf
Merge pull request #1470 from connortechnology/api_improvements
...
Api improvements
2016-05-25 12:45:03 -05:00
575f8ec265
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
...
Hide rtspdescribe
2016-05-25 08:44:17 -05:00
8f1596d683
use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr
2016-05-25 09:08:28 -04:00
7cfa2a5eaa
Replace the server attribute with a server entry, populated with a dropdown.Makes things more friendly and less error-prone
2016-05-24 16:46:34 -04:00
277fdafa85
Remove entry for Server Name, making Server Id just say Server. The filters will be populated with a dropdown, so no need to go by Id or Name
2016-05-24 16:45:55 -04:00
a8e407172a
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
2016-05-24 15:50:22 -04:00
89f58daf89
Merge branch 'master' into fix_zone_edit
2016-05-24 15:30:56 -04:00
0052bb080c
unlink only if file exists
2016-05-24 12:13:17 -05:00
00abd36af8
fix the other case of the wrong case of rtsp
2016-05-24 12:19:31 -04:00
056eed6df9
fix to show RTSP describe option when switching back to rtsp
2016-05-24 12:15:59 -04:00
bc49aa6aa6
add missing ; and remove extra )
2016-05-24 09:34:36 -04:00
5eac0559e2
Merge branch 'master' into hide_rtspdescribe
2016-05-24 09:32:41 -04:00
bec14bf111
Merge pull request #1478 from ZoneMinder/fix_montage_server_refs
...
pass in the server url into the monitor object to use instead of the …
2016-05-23 20:14:35 -05:00
2ab79820a1
Add back changes
2016-05-22 08:08:12 -07:00
4018cab743
don't pass partial data to daemoncontrol
2016-05-19 14:53:16 -04:00
20c4d07a00
Merge branch 'master' into hide_rtspdescribe
2016-05-16 14:40:04 -04:00
0faa28d058
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-05-16 14:38:49 -04:00
6084e2d00f
improve error message. The unrecognized action error happens above, so this error should just mention permissions
2016-05-16 14:38:40 -04:00
df8964c1f9
use eid= & fid= instead of path to frame image. The use of view=image also provides more security.
2016-05-16 10:33:21 -04:00
235095ed5f
fix URL to image view
2016-05-16 10:32:43 -04:00
8cb2692bbb
pass in the server url into the monitor object to use instead of the portal url
2016-05-13 11:09:12 -04:00
ed3e975e5a
take fid and eid as alternate parameters
2016-05-12 11:55:48 -04:00
1530096560
whitespace/google code style
2016-05-12 10:17:41 -04:00
aba80f0935
introduce htmlselect as an alternative to buildselect
2016-05-12 09:43:37 -04:00
b513bcef82
icon's gonna kill me
2016-05-10 20:09:41 -04:00
af3cae578e
fixed verbose handling bug for status command on zmu
2016-05-10 20:07:28 -04:00
8d5f2a8e5d
added iconnor's change back
2016-05-10 19:17:09 -04:00
df830a5190
resolved merge conflicts
2016-05-10 19:15:00 -04:00
2888142e68
added status command to retrieve alarmed status of monitor in addition to on/of
2016-05-10 16:55:43 -04:00
c0d3d69bec
Merge pull request #1420 from connortechnology/fix_event_menubars
...
remove set height on the menu bars, fixing flow issues
2016-05-10 16:55:06 +10:00
b03d2660cb
Merge pull request #1455 from ZoneMinder/api_servers
...
rough in Server object support
2016-05-10 08:00:58 +10:00
cffcbc6357
Merge pull request #1462 from ZoneMinder/merge_storageareas
...
Merge object model classes from storageareas
2016-05-10 07:59:25 +10:00
41776547cb
Merge branch 'master' into fix_zone_edit
2016-05-09 12:33:05 -04:00
e12160456b
Support user defined MySQL Port/Socket in API
2016-05-09 00:24:08 -07:00
966a9dcd8d
Merge pull request #1467 from ZoneMinder/api_fixes
...
Don't pass request data as a monitor array to daemonControl
2016-05-07 18:25:35 -04:00
e35b0a1eb2
Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames
...
added alarmed frames filter
2016-05-07 17:06:37 -04:00
be329e1e0d
switched to named param format, more flexible, in line with other APIs
2016-05-07 16:28:25 -04:00
8347b69b09
added alarmed frames filter
2016-05-07 14:26:09 -04:00
6d991a1c6c
Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off
...
added alarm enable/disable
2016-05-07 11:26:49 -04:00
6f9cc0f19f
to be safe, lets add system edit permissions, so rogue users can't turn alarms OFF
2016-05-07 11:01:03 -04:00
15977f1a3c
Don't pass request data as a monitor array to daemonControl
2016-05-07 10:56:38 -04:00
0280ae4dd5
added alarm enable/disable
2016-05-07 10:37:42 -04:00
c050969141
Merge object model classes from storageareas
2016-05-05 15:33:28 -04:00
01aa2c9319
change permissions to stream permissions for view
2016-05-02 19:48:24 -04:00
75f9fde920
rough in Server object support
2016-05-02 10:41:25 -04:00
ce69f24bdd
use zm.conf values for database connection
2016-04-30 08:11:39 -04:00
532fb77ecb
As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes
2016-04-30 08:09:56 -04:00
be5f0cd4a9
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
2016-04-29 10:44:46 -04:00
513d1568d0
Merge pull request #1444 from ZoneMinder/handle_disk_free_space_error
...
handle disk_free_space error
2016-04-29 21:36:29 +10:00
c4410c512a
Merge branch 'master' into fix_event_menubars
2016-04-28 09:35:58 -04:00
5e20831030
Don't return of disk_free_space returns false, just log it.
2016-04-28 09:29:40 -04:00
ac5fdb8956
Merge pull request #1421 from connortechnology/fix_events_pagination
...
remove the if(pages>1) so that the if > line always happens
2016-04-28 21:43:54 +10:00
d847d66e99
handle disk_free_space error
2016-04-26 14:40:40 -04:00
fe9cb4b7ec
Merge pull request #1442 from ZoneMinder/fix_rotate
...
Fix rotate
2016-04-26 09:54:01 -05:00
85798932ee
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
2016-04-25 14:10:26 -04:00
fed575bdb4
add some missing () on class method calls. Remove some no longer needed global 's and some empty lines
2016-04-25 08:56:21 -04:00
81757a0465
Merge pull request #1418 from pliablepixels/1417-clone-monitor
...
Clone feature added
2016-04-20 13:02:10 -05:00
b2d02a64f4
reload stream after error
2016-04-19 12:02:58 -04:00
50f2747bb4
remove the if(pages>1) so that the if > line always happens
2016-04-15 16:11:53 -04:00
2b05815bfa
remove set height on the menu bars, fixing flow issues
2016-04-15 15:44:35 -04:00
804ac1de81
Clone feature added
2016-04-14 13:53:10 -04:00
851a81eff7
Merge pull request #1406 from ZoneMinder/svg_zones
...
replace the static zone image with a stream, and use SVG to draw the zones
2016-04-11 11:14:11 -04:00
5542788a45
make cannot write to content dir an error, rather than fatal
2016-04-10 18:45:38 -05:00
39a30ff51b
refresh parent when cancel is clicked
2016-04-10 15:59:13 -05:00
e5bf2d245c
quit the stream in zones.php when zone.php is called
2016-04-10 15:33:55 -05:00
fbb2a527e6
remove setButtonState. it is not needed.
2016-04-10 07:55:45 -05:00
988d611d03
remove unused code
2016-04-09 21:37:00 -05:00
e7d35d16bc
add monitor alarm state and fps to zone edit view
2016-04-09 21:34:30 -05:00
c0c543e029
change quotes to prevent php7 complaint
2016-04-09 11:25:56 -04:00
0c8e0ac220
change quotes to prevent php7 complaint
2016-04-09 11:24:59 -04:00
feb7b36f11
use a local variable to prevent modifying the arguments
2016-04-09 11:23:52 -04:00
ce6f8da098
Use PDO::error_string instead of mysql_error
2016-04-09 11:23:35 -04:00
e90024c0d0
Better Error logging on disk_total_space failure
2016-04-09 09:27:12 -04:00
6d27a857aa
put a zones class on the svg
2016-04-08 14:38:50 -04:00
c73e768f1f
put in the onclick for the zone to open the edit page
2016-04-08 14:25:19 -04:00
b10c6ee093
fix Monitor capitalisation
2016-04-08 14:23:44 -04:00
758a0341ce
convert monitor to object
2016-04-08 14:09:59 -04:00
bbd33cc159
add monitor class so we don't have to everywhere else
2016-04-08 13:56:49 -04:00
22f207602b
add css for the svg zones
2016-04-08 13:43:00 -04:00
f749ff47ea
convert to monitor object
2016-04-08 13:40:32 -04:00
0ce85137dc
remove points. Don't need them here
2016-04-08 13:39:31 -04:00
f20945bf84
update zone points in SVG
2016-04-08 13:13:10 -04:00
7da6e1e5a1
use stream for image, add SVG polygon
2016-04-08 12:36:09 -04:00
256df08af4
update SVG polygon points on point update
2016-04-08 12:32:26 -04:00
45d58c3ad6
convert points to circles, because squares are not centered on the point.. but a circle is
2016-04-08 11:17:16 -04:00
79552e5393
use new getStreamHTML
2016-04-08 11:11:09 -04:00
3056069f3f
introduce getStreamHTML which returns the required HTML to give you a live image
2016-04-08 11:06:34 -04:00
3be3a3ada2
convert the monitor variable to a Monitor object, replace the static zone image with a stream, and use SVG to draw the zones
2016-04-08 10:46:51 -04:00
a0e6c004a2
Merge pull request #1388 from ZoneMinder/reload_stream_on_error
...
try to reload the image stream on error.
2016-04-04 20:57:48 -05:00
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
ab6758de45
Merge pull request #1387 from ZoneMinder/reload_stream_on_scale
...
reload stream on scale change
2016-04-04 20:32:53 -05:00
711343a5cc
fix ZM_SERVER_ID instead of ZM_SERVER
2016-04-04 16:34:21 -04:00
123a1a898a
try to reload the image stream on error.
2016-04-04 15:04:09 -04:00
0b13f9d76f
reload stream on scale change
2016-04-04 14:58:07 -04:00
02eb36040a
fix bad code
2016-04-04 12:01:37 -04:00
ad912a6c6b
Improve test multiserver restart camera. (FIX)
...
Check if the server is correctly before restart cam and multiserver is activate.
2016-03-31 09:45:13 -03:00
2f27818e5b
Improve test multiserver restart cam.
...
Test if correct server from camera edit settings.
2016-03-31 09:23:01 -03:00
247cb3d0b2
Merge pull request #1360 from schrorg/monitornames-spaces
...
Allow spaces in monitor names
2016-03-30 09:17:57 -04:00
c8c0586c66
Trim monitor names
2016-03-29 11:40:14 +02:00
ab05d52a0a
Update en_gb.php
...
typo
2016-03-28 08:35:34 -05:00
6eda3eff72
do not set maxfps fields during onvif probe
2016-03-26 08:38:28 -05:00
af68fd20a8
Some Translations for Monitor names with spaces
2016-03-24 14:51:24 +01:00
71db9b84e6
Allow spaces in monitor names
2016-03-24 14:37:24 +01:00
9c98ccbb75
Fix spelling in ffmpeg options help: s/verbosiy/verbosity/
2016-03-20 16:13:53 +00:00
020731a89e
Fix typo in ffmpeg options help: s/passwd/passed/
2016-03-20 16:10:49 +00:00
8a47241e18
address issue #1335
2016-03-12 08:07:25 -05:00
77f7a3642c
remove check for "selected" property
2016-03-09 10:34:06 -06:00
3280aff876
disable save button when nothing slected. fixes #1322
2016-03-09 09:43:44 -06:00
466f2b2ae3
change multi-server error message text
2016-03-01 11:12:54 -06:00
84801fcb86
typo in function name
2016-02-27 13:06:33 -05:00
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
4837585601
Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
...
Conflicts:
src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
7c7d7b245c
Remove the XML skin folder
2016-02-26 22:30:20 +11:00
e6d57da0d4
Remove the mobile skin folder
2016-02-26 22:29:41 +11:00
5ff427d9e9
Removed Autotools Makefile.am
...
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
b294f210dc
Update to CakePHP 2.8.0 copy in lib folder
2016-02-25 23:25:24 +11:00
632e9c8e53
Upgrade bundled jQuery ( Closes : #1263 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-18 00:28:30 +11:00
172a4c6bd4
Add montagereview.php to autotools build.
2016-02-16 09:29:49 -05:00
5f217b48e0
When Protocol is HTTP, hide the RTSPDescribe line. Make it appear when Protocol is changed to RTSP
2016-02-12 13:52:59 -05:00
0b2a309014
Merge pull request #961 from Linwood-F/960-montage-review-new-feature
...
960 montage review new feature
2016-02-08 20:40:04 -06:00
d3755611c5
Merge pull request #1247 from bodegard/master
...
Corrected DB update version comments, fixed typos, and skin font modification
2016-02-04 11:54:02 -05:00
ab7b4ab3e6
Merge pull request #1221 from ZoneMinder/rotate_dimensions_when_image_is_rotated
...
implement Width and Height functions, and test for image rotation and…
2016-02-04 10:17:19 -06:00
1c142a48a6
Merge pull request #1212 from RBxx/patch-1
...
Convert ru_ru.php to UTF-8
2016-02-04 10:16:24 -06:00
cbe88d0a3f
Merge pull request #1239 from ZoneMinder/trim_when_saving
...
use trim on values when saving.
2016-02-04 08:29:02 -06:00
2f80f26f92
Merge pull request #1232 from ZoneMinder/remove_google_fonts
...
remove Google open Sans external import
2016-01-23 10:24:49 -06:00
54a11175ff
Reduce default size of body font in Flat skin
2016-01-22 13:56:41 -06:00
1ca9ace84d
Fixed missing semicolons
2016-01-22 13:31:02 -06:00
4520902dd2
use trim on values when saving.
2016-01-14 09:37:41 -05:00
3ebeaec8ab
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-01-10 20:59:01 -05:00
2d86e7713d
increase height of logout popup to fit content
2016-01-08 12:14:01 -05:00
d48ec1cfbe
Add AddNewServer and Hostname entries
2016-01-08 10:15:41 -05:00
99dfaa97fa
User Name instead of ServerName and Hostname instead of ServerHostname
2016-01-08 10:15:21 -05:00
d13829c6f3
Add Hostname to list of servers, since we have the space for it.
2016-01-08 10:15:06 -05:00
53bd342f85
remove Google open Sans external import
2016-01-08 09:46:14 -05:00
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
6ae1597671
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2016-01-04 14:51:47 -05:00
273ab6c5c6
Only show Server column when more than 1 Servers are defined
2016-01-04 14:51:24 -05:00
f5db14d823
return empty for the non multi-server case
2016-01-04 13:46:05 -05:00
45fc689203
implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220
2016-01-04 13:15:50 -05:00
f72260733c
Only do CORSHeaders if there is more than 1 server
2016-01-04 09:38:24 -05:00
d256530896
return early if no servers are defined instead of logging a warning
2016-01-04 09:36:45 -05:00
c639822d62
When Server is not set, us ZM_BASE_PATH
2016-01-03 11:55:53 -05:00
bd71c4999d
test for Server in servers_by_Id as well as just having a value for ServerId. Fixup export as well.
2016-01-02 14:36:37 -05:00
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
468f997e4c
Soft error, with logging when the filter element doesn't exist
2016-01-01 16:36:29 -05:00
ec7504f925
Translate ServerId to Server in Log record before sending back
2016-01-01 16:33:28 -05:00
12ee147bc7
Add a find_all function to return an array of Server objects
2015-12-31 10:13:48 -05:00
bfe4175fdf
Add Server to filters and log results
2015-12-31 10:13:25 -05:00
31ba0221ed
Add Server to filters and log results
2015-12-31 10:13:03 -05:00
983b47f6dc
Add Server columns
2015-12-31 09:09:57 -05:00
0ccce76ef8
Convert ru_ru.php to UTF-8
...
In koi8-r encoding, some menu items are not displayed in the web interface. With UTF-8 encoding all displayed correctly.
2015-12-31 16:58:56 +03:00
6df1425897
Slight update to allow the instantiation with no row or Id
2015-12-22 09:52:33 -05:00
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
658e130d33
sync up to c39 version
2015-12-22 09:44:46 -05:00
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
6f5c70dd5d
Add Attr lines for ServerId and ServerName
2015-12-21 10:10:11 -05:00
b626712a2f
Add ServerId and ServerName to fields that we can filter on
2015-12-21 10:03:48 -05:00
37212dcf2e
Merge pull request #1196 from pliablepixels/api-more-security
...
Api more security
2015-12-20 10:22:40 -05:00
6e606aa74b
removed issue #
2015-12-19 19:04:27 -05:00
38b4785557
PP - Gone,flitted away, Taken the starts from the night and sun, From the day! Gone, and a cloud in my heart. - Tennyson
2015-12-19 18:36:38 -05:00
Kyle Johnson
Andrew Bauer
Isaac Connor
Steve Gilvarry
Pliable Pixels
Jeff Vogt
Isaac Connor
corax
David Sabbath Grits
Disassembler
Andrew Bauer
Isaac Connor
josh4trunks
Isaac Connor
Laercio Motta
Robin Daermann
Jon Burgess
Dmitry Smirnov
Brandon Odegard
Isaac Connor
RBxx