ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,629 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

1928 Commits

Author SHA1 Message Date
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
Isaac Connor 75f6da3526 Merge branch 'multi-server' into storageareas 2016-01-04 14:53:52 -05:00
Isaac Connor 6ae1597671 Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server 2016-01-04 14:51:47 -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 69ddc7d34c Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-01-04 14:38:37 -05:00
Isaac Connor b9f17a18d6 Merge branch 'multi-server' into storageareas 2016-01-04 14:09:41 -05:00
Isaac Connor f5db14d823 return empty for the non multi-server case 2016-01-04 13:46:05 -05:00
Isaac Connor 5144d3befb Merge branch 'rotate_dimensions_when_image_is_rotated' into storageareas 2016-01-04 13:19:09 -05:00
Isaac Connor 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
Isaac Connor f72260733c Only do CORSHeaders if there is more than 1 server 2016-01-04 09:38:24 -05:00
Isaac Connor d256530896 return early if no servers are defined instead of logging a warning 2016-01-04 09:36:45 -05:00
Isaac Connor 33b8405e0d Merge branch 'multi-server' into storageareas 2016-01-03 11:57:07 -05:00
Isaac Connor c639822d62 When Server is not set, us ZM_BASE_PATH 2016-01-03 11:55:53 -05:00
Isaac Connor bf2195828f Merge branch 'multi-server' into storageareas 
Conflicts:
	docs/installationguide/index.rst
 2016-01-02 14:42:47 -05:00
Isaac Connor 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
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