Isaac Connor
|
409545b386
|
Add concat to the usage line and format it better
|
2016-05-30 14:08:38 -04:00 |
|
Isaac Connor
|
326c4f1fee
|
Check for existence of libraries specified in LD_PRELOAD and warn about them not existing
|
2016-05-30 14:08:08 -04:00 |
|
Isaac Connor
|
4469f909fa
|
Add support for DefaultVideo to video generation
|
2016-05-30 14:07:40 -04:00 |
|
Isaac Connor
|
07878e3e13
|
Put back the code that makes getDiskPercent look in the storagearea
|
2016-05-30 10:43:51 -04:00 |
|
Isaac Connor
|
f86c7735e3
|
Merge branch 'filter_id' into storageareas
|
2016-05-30 10:28:40 -04:00 |
|
Isaac Connor
|
06e14c63c2
|
Add Id column as Primary key to Filters
|
2016-05-30 10:25:30 -04:00 |
|
Isaac Connor
|
886d88b184
|
Merge branch 'improve_filter' into storageareas
|
2016-05-30 09:30:18 -04:00 |
|
Isaac Connor
|
2da709848a
|
remove extra comma screwing up the sql
|
2016-05-30 09:30:02 -04:00 |
|
Isaac Connor
|
63ac75b440
|
use ::Database::dbh instead of 3013self{dbh}
|
2016-05-30 09:27:36 -04:00 |
|
Isaac Connor
|
2663781adc
|
put back missing my =__git_main[0];
|
2016-05-30 09:13:39 -04:00 |
Isaac Connor
|
cc949bb6fb
|
Merge pull request #1507 from Disassembler0/apache_php_register_globals
Remove deprecated register_globals from Apache/PHP configs
|
2016-05-30 08:49:32 -04:00 |
Disassembler
|
8eee25795a
|
Remove deprecated register_globals from Apache/PHP configs
|
2016-05-30 14:02:46 +02:00 |
|
Disassembler
|
883b323528
|
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
|
2016-05-29 22:16:00 +02:00 |
|
Isaac Connor
|
df86843dfe
|
Merge branch 'improve_filter' into storageareas
|
2016-05-29 11:39:12 -04:00 |
|
Isaac Connor
|
7bc95561ad
|
fix
|
2016-05-29 11:37:32 -04:00 |
|
Isaac Connor
|
1add5a954a
|
Merge branch 'fix_filter_actions' into storageareas
|
2016-05-29 11:37:08 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
7725109917
|
Merge branch 'fix_filter_actions' into storageareas
|
2016-05-27 12:47:32 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
c4e5299943
|
sync up auto to Auto
|
2016-05-27 12:45:04 -04:00 |
|
Isaac Connor
|
c25b680799
|
Merge branch 'fix_filter_actions' into storageareas
|
2016-05-27 11:12:18 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
408646ea4d
|
remove extra s
|
2016-05-27 10:52:59 -04:00 |
|
Isaac Connor
|
7277283659
|
rename AttrServerId to AttrServer, because that is the text that is returned
|
2016-05-27 10:12:46 -04:00 |
|
Isaac Connor
|
d52a6f9a95
|
Merge branch 'improve_filter' into storageareas
|
2016-05-27 09:57:05 -04:00 |
|
Isaac Connor
|
f8f8dbe9fe
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-05-27 09:01:09 -04:00 |
|
Isaac Connor
|
1983f106f4
|
Add a missing sth->finish
|
2016-05-27 09:01:01 -04:00 |
|
Isaac Connor
|
b0116f25e9
|
put back in the lines that populate ZM_SERVER_ID. They got lost somehow in the perl db undo
|
2016-05-27 08:59:46 -04:00 |
|
Isaac Connor
|
419e67caa1
|
Put back the code that populates ZM_SERVER_ID
|
2016-05-26 12:42:22 -04:00 |
|
Isaac Connor
|
3058dd9463
|
Merge branch 'id_on_console' into storageareas
|
2016-05-26 12:19:33 -04:00 |
|
Isaac Connor
|
f461bc1e80
|
get rid of extra )
|
2016-05-26 12:18:58 -04:00 |
|
Isaac Connor
|
05709f3084
|
Merge branch 'id_on_console' into storageareas
|
2016-05-26 11:17:41 -04:00 |
|
Isaac Connor
|
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 |
Andrew Bauer
|
730abc9789
|
make zones unclickable when zm is not running
|
2016-05-26 09:35:36 -05:00 |
Andrew Bauer
|
1972c4116b
|
Merge pull request #1486 from connortechnology/update_image_view
Update image view
|
2016-05-26 09:05:14 -05:00 |
|
Isaac Connor
|
b9322a02e8
|
Merge branch 'get_rid_of_ConfigAdmin' into storageareas
|
2016-05-26 09:56:16 -04:00 |
|
Isaac Connor
|
e329bacb78
|
remove deprecated ConfigAdmin
|
2016-05-26 09:51:48 -04:00 |
|
Andrew Bauer
|
ceaacf91bf
|
Merge pull request #1470 from connortechnology/api_improvements
Api improvements
|
2016-05-25 12:45:03 -05:00 |
|
Isaac Connor
|
b309837f02
|
put back zmDbRow use
|
2016-05-25 10:21:44 -04:00 |
|
Isaac Connor
|
7a08d4620f
|
Merge branch 'master' into storageareas
|
2016-05-25 10:17:46 -04:00 |
Isaac Connor
|
a0af99459a
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-25 10:12:22 -04:00 |
|
Andrew Bauer
|
575f8ec265
|
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
Hide rtspdescribe
|
2016-05-25 08:44:17 -05:00 |
|
Isaac Connor
|
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 |
Isaac Connor
|
aedba1bc7f
|
whitespace, google code style. Adds special cases for ServerId Attribute. ANd uses * to load all event fields instead of specifying each one.
|
2016-05-24 16:49:04 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
8fabeb78d3
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-05-24 15:55:49 -04:00 |
|
Isaac Connor
|
a8e407172a
|
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
|
2016-05-24 15:50:22 -04:00 |
|
Isaac Connor
|
89f58daf89
|
Merge branch 'master' into fix_zone_edit
|
2016-05-24 15:30:56 -04:00 |
|
Isaac Connor
|
ae1eb94f27
|
fix getStreamHTML when using helper
|
2016-05-24 15:10:37 -04:00 |