Isaac Connor
|
e7303ccb08
|
change styles from table constructs to class constructs
|
2016-03-01 09:56:57 -05:00 |
Isaac Connor
|
0d8c16bb56
|
move console styles to view/console
|
2016-03-01 09:56:36 -05:00 |
Isaac Connor
|
86c223668d
|
Merge branch 'master' into storageareas
|
2016-02-25 19:11:38 -05:00 |
SteveGilvarry
|
b294f210dc
|
Update to CakePHP 2.8.0 copy in lib folder
|
2016-02-25 23:25:24 +11:00 |
Isaac Connor
|
131d0daefe
|
fix syntax
|
2016-02-19 11:47:18 -05:00 |
Isaac Connor
|
afb0cf2a7e
|
Merge branch 'master' into storageareas
|
2016-02-19 11:09:18 -05:00 |
Isaac Connor
|
5a2a4baa89
|
Must load StorageId as well when loading event
|
2016-02-19 09:47:19 -05:00 |
Isaac Connor
|
e2d892961b
|
use storage area paths in getting analyze images and frame stills
|
2016-02-19 09:46:56 -05:00 |
Isaac Connor
|
68babd783b
|
Merge branch 'master' into storageareas
|
2016-02-17 09:46:56 -05:00 |
Dmitry Smirnov
|
632e9c8e53
|
Upgrade bundled jQuery (Closes: #1263)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
|
2016-02-18 00:28:30 +11:00 |
Isaac Connor
|
172a4c6bd4
|
Add montagereview.php to autotools build.
|
2016-02-16 09:29:49 -05:00 |
Isaac Connor
|
292e3a141f
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-02-12 13:53:34 -05:00 |
Isaac Connor
|
5da8df45a7
|
Merge branch 'hide_rtspdescribe' into storageareas
|
2016-02-12 13:53:09 -05:00 |
Isaac Connor
|
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 |
Isaac Connor
|
b7256a6891
|
Merge branch 'master' into storageareas
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
|
2016-02-10 09:17:40 -05:00 |
Andrew Bauer
|
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 |
Isaac Connor
|
e106a86f5e
|
Add Concurrent
|
2016-02-05 11:59:05 -05:00 |
Isaac Connor
|
e67f247374
|
add ConcurrentFilter translation
|
2016-02-05 11:58:20 -05:00 |
Isaac Connor
|
51d814ad46
|
add concurrent to save filter
|
2016-02-05 11:58:05 -05:00 |
Isaac Connor
|
0674fa2d7a
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-02-04 12:21:33 -05:00 |
Isaac Connor
|
89cff287cd
|
Merge branch 'master' into storageareas
|
2016-02-04 12:14:16 -05:00 |
Isaac Connor
|
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 |
Andrew Bauer
|
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 |
Andrew Bauer
|
1c142a48a6
|
Merge pull request #1212 from RBxx/patch-1
Convert ru_ru.php to UTF-8
|
2016-02-04 10:16:24 -06:00 |
Andrew Bauer
|
cbe88d0a3f
|
Merge pull request #1239 from ZoneMinder/trim_when_saving
use trim on values when saving.
|
2016-02-04 08:29:02 -06:00 |
Isaac Connor
|
08858685c5
|
add find_all function to Storage
|
2016-02-03 09:43:02 -05:00 |
Isaac Connor
|
555904c588
|
Add Storage column to console
|
2016-02-03 09:42:50 -05:00 |
Isaac Connor
|
48283191ec
|
Merge branch 'master' into storageareas
|
2016-02-01 15:47:08 -05:00 |
Isaac Connor
|
cc2c1405ed
|
include Event.php
|
2016-02-01 14:59:06 -05:00 |
Isaac Connor
|
4e9e01836f
|
Use Event->Path instead of ZM_DIR_EVENTS
|
2016-02-01 13:41:57 -05:00 |
Isaac Connor
|
9543a8a364
|
Add Event.php to autoconf build
|
2016-02-01 13:08:48 -05:00 |
Andrew Bauer
|
2f80f26f92
|
Merge pull request #1232 from ZoneMinder/remove_google_fonts
remove Google open Sans external import
|
2016-01-23 10:24:49 -06:00 |
Brandon Odegard
|
54a11175ff
|
Reduce default size of body font in Flat skin
|
2016-01-22 13:56:41 -06:00 |
Brandon Odegard
|
1ca9ace84d
|
Fixed missing semicolons
|
2016-01-22 13:31:02 -06:00 |
Isaac Connor
|
baa805ae60
|
alternatively, accept and eid and fid to specify the frame
|
2016-01-14 13:35:30 -05:00 |
Isaac Connor
|
e057d8d722
|
rough in an Event object.
|
2016-01-14 13:34:51 -05:00 |
Isaac Connor
|
f16fb5c5f6
|
use eid and fid instead of specifying the path to the image
|
2016-01-14 13:34:12 -05:00 |
Isaac Connor
|
02f8fb80da
|
Put the monitor Id in the title so that it appears on mouseover.
|
2016-01-14 11:05:05 -05:00 |
Isaac Connor
|
7ce049dad1
|
add a title to each monitor with the name so that the mouseover will show it
|
2016-01-14 10:50:42 -05:00 |
Isaac Connor
|
ddf7b1ad43
|
Merge branch 'master' into storageareas
Conflicts:
web/skins/classic/js/dark.js
web/skins/classic/js/flat.js
|
2016-01-14 09:41:24 -05:00 |
Isaac Connor
|
4520902dd2
|
use trim on values when saving.
|
2016-01-14 09:37:41 -05:00 |
Isaac Connor
|
3ebeaec8ab
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-01-10 20:59:01 -05:00 |
Isaac Connor
|
2d86e7713d
|
increase height of logout popup to fit content
|
2016-01-08 12:14:01 -05:00 |
Isaac Connor
|
818cd614eb
|
Merge branch 'multi-server' into storageareas
|
2016-01-08 10:17:37 -05:00 |
Isaac Connor
|
d48ec1cfbe
|
Add AddNewServer and Hostname entries
|
2016-01-08 10:15:41 -05:00 |
Isaac Connor
|
99dfaa97fa
|
User Name instead of ServerName and Hostname instead of ServerHostname
|
2016-01-08 10:15:21 -05:00 |
Isaac Connor
|
d13829c6f3
|
Add Hostname to list of servers, since we have the space for it.
|
2016-01-08 10:15:06 -05:00 |
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 |