mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-20 23:02:08 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,444 Commits 80 Branches 104 Tags
a2ae29dfbe9da71b1f15ff6df0b9de7b080cf4e2
Commit Graph

1872 Commits

Author SHA1 Message Date
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
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
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
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
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
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
f5db14d823 return empty for the non multi-server case 2016-01-04 13:46:05 -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
c639822d62 When Server is not set, us ZM_BASE_PATH 2016-01-03 11:55:53 -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
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
ec7504f925 Translate ServerId to Server in Log record before sending back 2016-01-01 16:33:28 -05:00
Isaac Connor
12ee147bc7 Add a find_all function to return an array of Server objects 2015-12-31 10:13:48 -05:00
Isaac Connor
bfe4175fdf Add Server to filters and log results 2015-12-31 10:13:25 -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
RBxx
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
Isaac Connor
6df1425897 Slight update to allow the instantiation with no row or Id 2015-12-22 09:52:33 -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
658e130d33 sync up to c39 version 2015-12-22 09:44:46 -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
6f5c70dd5d Add Attr lines for ServerId and ServerName 2015-12-21 10:10:11 -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
37212dcf2e Merge pull request #1196 from pliablepixels/api-more-security 
Api more security
 2015-12-20 10:22:40 -05:00
arjunrc
6e606aa74b removed issue # 2015-12-19 19:04:27 -05:00
arjunrc
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
arjunrc
c4461c328e initial user role support 2015-12-19 17:45:03 -05:00
arjunrc
b4fdaa9b4d initial user role support 2015-12-19 17:44:46 -05:00
arjunrc
e812398fb9 initial user role support 2015-12-19 17:44:39 -05:00
arjunrc
f56688e7c2 initial user role support 2015-12-19 17:44:16 -05:00
arjunrc
028c9b956c check for opt_use_api, also pull in user roles support 2015-12-19 17:44:02 -05: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
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
aaa9f3bcc9 Handle case where parameter is not passed to constuctor 2015-12-15 11:19:50 -05:00