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

167 Commits

Author SHA1 Message Date
Andrew Bauer bacf65ae9a Migrate values from Options -> Paths to zm.conf (#1908) 
* initial commit to migrate contents of Options->Paths to zm.conf

* remove paths items from configdata.pm

* remove paths tab from options

* update deb packaging scripts with new cmake vars

* remove extraneous file

* save custom paths variables to config file before dB is freshened

* don't check configs if the dB version is >= 1.31.0
 2017-06-12 21:39:37 -04:00
Isaac Connor f3378207c0 make navbar static instead of fixed, sync up dark theme, and improve storage editing styles 2017-01-30 21:16:21 -05:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 9262d9d14e remove debug messages on css changing 2016-07-22 16:02:55 -04:00
Isaac Connor 02b5cd6b6c Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:17:10 -04:00
Isaac Connor 5d8eeb5b56 deprecate header, just the getNavBarHTML function 2016-05-06 15:16:48 -04:00
Isaac Connor 49dc917b2e Merge isaac:ZoneMinder.p1 into storageareas 2016-05-05 15:24:14 -04:00
Isaac Connor 4defe92911 Merge branch 'master' into updated-console 2016-05-03 14:22:37 -04:00
Isaac Connor 516bacdfd3 Merge branch 'updated-console' into storageareas 2016-05-03 13:38:57 -04:00
Kyle Johnson a1b4869ee6 Add state modal to options view 2016-05-03 13:33:22 -04:00
Isaac Connor 9d6a7541c8 add Id column to storage areas 2016-05-02 10:40:42 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor b3f0f5d0e8 Merge branch 'updated-console' into storageareas 2016-04-04 11:51:07 -04:00
Kyle Johnson 92e0552f8e Add side tab list to options page, and style it. 2016-04-01 14:02:19 -04:00
Isaac Connor 757740ede5 Move skin and css changing up above the include of header.php so that the set cookie call will work 2016-03-23 16:12:51 -04:00
Isaac Connor dd06db0bf0 remove duplication 2016-03-23 15:54:20 -04:00
Isaac Connor a66e97de09 Merge & fix new console & options 2016-03-23 09:48:57 -04:00
Kyle Johnson 897a0a995c Convert options layout to side-tabs, and improve readability 2016-03-15 15:21:28 -04:00
Kyle Johnson 183f58ad17 Restyle options view with horizontal form layout 2016-03-15 14:43:22 -04:00
Kyle Johnson 694ad0b539 Add styling to delete / save / add buttons in options.php 2016-03-15 14:08:01 -04:00
Kyle Johnson bd30d40522 Remove cancel button from options as it no longer makes sense. 2016-03-15 14:03:17 -04:00
Kyle Johnson 0004a1180e Update options.php to use bootstrap container 2016-03-15 13:56:54 -04:00
Kyle Johnson 49f46ac927 Move the header into its own file, and include it in options view. 2016-03-15 13:43:49 -04:00
Kyle Johnson 8acfe1b0d8 Update options styling 2016-03-12 22:44:11 -05:00
SteveGilvarry d40bf89b17 Remove Phone BW settings used with mobile skin 2016-02-26 22:43:37 +11:00
SteveGilvarry 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
Isaac Connor 818cd614eb Merge branch 'multi-server' into storageareas 2016-01-08 10:17:37 -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 20f9a01a66 Add a Storage tab, to provide a place to define your storage areas 2015-12-15 11:13:21 -05: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
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
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
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
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
Isaac Connor 05206279df add missing commas 2014-12-18 09:44:04 -05:00
Isaac Connor 478c9bc630 add custom lines for loading the available skins and css options 2014-12-18 09:34:14 -05:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
Isaac Connor af0d9a1065 bug fix for listing the css options. 
use SELECTED="SELECTED" instead of just SELECTED
 2014-12-01 15:58:00 -05:00
Isaac Connor 193cb71b71 Add option for setting css to use with the skin. Also happens to add missing elements of the table for the skins tab and cleans up some spacing. Also, use a variable to tell whether to reload the page or not, which is required after you change the skin or css. 2014-11-26 11:55:53 -05:00
Andrew Bauer 9a0eb63df2 Merge pull request #415 from m-bene/selectSkin 
make skin selection persistent
 2014-07-04 12:57:37 -05:00
Isaac Connor 11718f0559 The users tab should always be available. It is useful to configure users BEFORE turning on auth. 2014-06-25 13:39:31 -04:00
m-bene f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene de107f77ba fix option help text for overlooked languages 2014-05-17 04:51:01 +02:00
m-bene 9a71a0068a add help window for ffmpeg/libvlc options 2014-05-17 04:33:33 +02:00
m-bene b197f985e0 make expiry date relative (~10years) 2014-05-01 09:53:45 +02:00
m-bene ed7ca66045 make skin selection cookie persistent 2014-05-01 09:37:39 +02:00
m-bene f737af15b9 Fix reload loop on switching skins 2014-04-11 09:40:23 +02:00
stan b64c506659 Added SFTP upload option. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-23 14:10:20 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
jaidhar e3f8bdb6cd XML (eyeZm) plugin: Now renamed plugin to eyeZm, along with all database variables. Note that this must still reside in the skins/xml path until iPhone apps can be moved over at a later point in time 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3306 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-19 20:25:54 +00:00
stagecoach 79e24aef44 updated /web/skins/classic/views/options.php: 
added tab for skin selection
updated /web/lang/en_gb.php:
added Display entry and SkinDescription entry

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3206 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-24 01:35:12 +00:00
jaidhar 2d7979ac93 XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 05:25:43 +00:00
stan 63988218a7 Changed use of deprecated split function to explode 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3024 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-02-15 17:11:37 +00:00
stan 1fad2d7ec9 Changed query separator to &amp; and miscellaneous html fixes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2982 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-16 17:09:16 +00:00
stan 57f8127498 Slight revamp 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2782 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-19 14:17:33 +00:00
stan 3663ea922b Better handling of view only priveleges 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2658 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-09 09:15:53 +00:00
stan bec3dc9ff6 Fixed options issues including missing restart arning. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2636 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-29 08:55:25 +00:00
stan ef8f7b85fd Continuing development and bugfixes 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-26 09:47:20 +00:00
stan 45190dee61 Fixed options and user editing issues. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2621 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-01 14:05:06 +00:00
stan 106882c161 Updated copyright notices 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:48:16 +00:00
stan 03c66f87ef Fixed up tabs 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2574 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-18 14:53:44 +00:00
stan 44c54837c3 Fixed checkbox clearing not working and xhtml errors in layout. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2573 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-17 16:59:25 +00:00
stan f7c46aa838 Fixed OLANG issues 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2521 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-15 09:03:42 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00