575180ba5e
introduce new function that recursively deletes empty directories. Call it on each monitor dir
2016-06-03 11:35:28 -04:00
ef9c0ca33a
Debug the SQL on execute, not on parse
2016-06-03 11:15:40 -04:00
f0ec2a65ee
Merge branch 'fix_errors_when_event_not_found' into storageareas
2016-06-03 10:47:47 -04:00
380b86614f
put quotes around integer values that will be empty strings if the event is not found
2016-06-03 10:46:21 -04:00
4045211b36
Have cmake take the version from the version file
2016-06-03 09:51:50 -04:00
b8c406f969
Merge branch 'master' into storageareas
2016-06-03 09:32:55 -04:00
2385575c56
fix +1 being outside bind()
2016-06-02 16:23:04 -04:00
6a097393ba
Run Docker db/apache setup once, not on every startup; kill mysql cleanly
2016-06-02 12:06:21 +10:00
d2e83d197d
Improve Docker build; reduce image size & layer count
...
Reducing layer count improves Docker performance, and is best-practice.
Avoid packing & sending .git tree into Docker build system.
Clean up apt archives to reduce image size.
2016-06-02 10:51:41 +10:00
74a011fb4d
Update version
...
This needs to stay at 1.29.0 until we release!
2016-06-01 08:05:45 -05:00
40c5e5c4b9
bump version file to 1.30
2016-06-01 08:54:33 -04:00
58e1a9ac4a
rpm README changes
2016-06-01 07:30:41 -05:00
6950e3385a
bump project to 1.30.0
2016-05-31 19:41:17 -05:00
060988c05c
set margin and padding on montage.alert and imageFeed.alert because bootstrap declares a generic .alert style with large margins and padding
2016-05-31 16:02:37 -04:00
a57a3d3186
Merge pull request #1501 from ZoneMinder/fix_zone_edit
...
Fix zone edit
2016-05-31 10:33:31 -05:00
b8cf7c04c1
Fix messed up SQL. die when the selectFrameData sql doesn't execute
2016-05-31 09:14:50 -04:00
8a14d6f4d2
Don't not load the event if it was videod before
2016-05-30 14:57:46 -04:00
409545b386
Add concat to the usage line and format it better
2016-05-30 14:08:38 -04:00
326c4f1fee
Check for existence of libraries specified in LD_PRELOAD and warn about them not existing
2016-05-30 14:08:08 -04:00
4469f909fa
Add support for DefaultVideo to video generation
2016-05-30 14:07:40 -04:00
07878e3e13
Put back the code that makes getDiskPercent look in the storagearea
2016-05-30 10:43:51 -04:00
f86c7735e3
Merge branch 'filter_id' into storageareas
2016-05-30 10:28:40 -04:00
06e14c63c2
Add Id column as Primary key to Filters
2016-05-30 10:25:30 -04:00
886d88b184
Merge branch 'improve_filter' into storageareas
2016-05-30 09:30:18 -04:00
2da709848a
remove extra comma screwing up the sql
2016-05-30 09:30:02 -04:00
63ac75b440
use ::Database::dbh instead of 3013self{dbh}
2016-05-30 09:27:36 -04:00
2663781adc
put back missing my =__git_main[0];
2016-05-30 09:13:39 -04:00
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
8eee25795a
Remove deprecated register_globals from Apache/PHP configs
2016-05-30 14:02:46 +02:00
883b323528
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-05-29 22:16:00 +02:00
df86843dfe
Merge branch 'improve_filter' into storageareas
2016-05-29 11:39:12 -04:00
7bc95561ad
fix
2016-05-29 11:37:32 -04:00
1add5a954a
Merge branch 'fix_filter_actions' into storageareas
2016-05-29 11:37:08 -04:00
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
7725109917
Merge branch 'fix_filter_actions' into storageareas
2016-05-27 12:47:32 -04:00
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
c4e5299943
sync up auto to Auto
2016-05-27 12:45:04 -04:00
c25b680799
Merge branch 'fix_filter_actions' into storageareas
2016-05-27 11:12:18 -04:00
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
408646ea4d
remove extra s
2016-05-27 10:52:59 -04:00
7277283659
rename AttrServerId to AttrServer, because that is the text that is returned
2016-05-27 10:12:46 -04:00
d52a6f9a95
Merge branch 'improve_filter' into storageareas
2016-05-27 09:57:05 -04:00
f8f8dbe9fe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-05-27 09:01:09 -04:00
1983f106f4
Add a missing sth->finish
2016-05-27 09:01:01 -04:00
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
419e67caa1
Put back the code that populates ZM_SERVER_ID
2016-05-26 12:42:22 -04:00
3058dd9463
Merge branch 'id_on_console' into storageareas
2016-05-26 12:19:33 -04:00
f461bc1e80
get rid of extra )
2016-05-26 12:18:58 -04:00
05709f3084
Merge branch 'id_on_console' into storageareas
2016-05-26 11:17:41 -04:00
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
Isaac Connor
Toby
Andrew Bauer
Isaac Connor
Isaac Connor
Disassembler