27fe468868
Don't do csrf for view=video because the output buffering will make it run out of ram
2017-08-09 11:15:00 -04:00
b9addeecfd
update deleting the events when deleting a monitor
2017-08-08 15:02:40 -04:00
b203e10c65
remove some newlines that shouldn't be there. Fix some logic when flushing audio encoder
2017-08-04 14:14:25 -04:00
7cb4090d7d
can't use jquery like that
2017-08-03 12:41:43 -04:00
00533fc624
potentially fix memleaks
2017-08-03 12:41:26 -04:00
3467b29a0c
fix setting of packet stream index
2017-08-02 16:15:38 -04:00
6d46b36c80
Hide close button if not in a popup
2017-08-01 14:21:50 -04:00
259b7f7655
fix memleak
2017-07-31 15:49:27 -04:00
792d8640c2
use the analyze file if exists as thumbnail
2017-07-28 09:54:33 -04:00
1f8871639a
only complain about losing the dbh connection, if we can't reconnect
2017-07-27 09:56:07 -04:00
33ce55584f
Merge branch 'master' into storageareas
2017-07-26 10:48:42 -04:00
30057ddffe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-26 10:38:25 -04:00
49319990fa
Don't keep setting the event_file unnecessarily. Add some code comments
2017-07-26 10:38:18 -04:00
1cfd657168
put back the preg_replace that strips usernames and passwords from monitor source
2017-07-26 10:22:57 -04:00
342aacd94f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-26 10:19:44 -04:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
3bd9d96027
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-21 10:54:57 -04:00
efb02f3368
fix indent
2017-07-21 10:54:48 -04:00
457d909c88
fix quotes
2017-07-21 10:54:33 -04:00
ee7d714d59
refuse and log attempt to delete an event without full info
2017-07-21 10:54:09 -04:00
91ccba137f
Don't create symlinks in ZoneMinder webroot ( #1923 )
...
* don't create symlinks during rpm packaging
* don't use symlinks when pacakging debs
* change default values for zm_dir_events and zm_dir_images
* remove zm_contentdir cmake var from debian packaging
* change default for zm_config_subdir
* update INSTALL documentation
2017-07-21 08:18:13 -04:00
d931945619
Update zoneminder.spec
...
we have to tell rpm what permission zmcustom.conf has to prevent the build from failing on el6
2017-07-20 17:53:06 -05:00
4bca799d43
reorganize zm config files ( #1937 )
...
* reogranize config files
* process 01-system-paths.conf.in
* exclude .in files in install directive
2017-07-17 09:11:36 -04:00
1264f0601f
update to storageareas version, which changes the sql to use subqueries instead of JOINs
2017-07-14 15:55:08 -04:00
5cf2be528a
Merge pull request #1950 from connortechnology/fix_api_logs
...
fix path to logs for api
2017-07-14 13:19:12 -05:00
c98255dd75
Merge pull request #1948 from connortechnology/fix_empty_monitor_source_column
...
Fix empty monitor source column
2017-07-14 13:10:52 -05:00
e247efcd42
Merge pull request #1951 from connortechnology/fix_api_conf_d
...
updates bootstrap.php.in to match config.php's conf.d loading
2017-07-14 12:44:44 -05:00
b030fee429
don't do csrf checks for control commands
2017-07-14 12:29:24 -04:00
240a990c7f
fix writing to config
2017-07-14 12:19:43 -04:00
e203064bf7
updates bootstrap.php.in to match config.php's conf.d loading
2017-07-14 12:03:00 -04:00
13a72b7a99
fix path to logs for api
2017-07-14 11:58:15 -04:00
1a8638f3dd
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-07-14 11:50:01 -04:00
9824049c0c
fix conf.d loading in api
2017-07-14 11:46:36 -04:00
89bcfc4e28
fix incorrect gpl license text mailing address
2017-07-14 10:39:50 -05:00
2002e863a9
Update zoneminder.service.in
2017-07-14 10:26:41 -05:00
76f1d1a3aa
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2017-07-14 10:16:54 -05:00
1822510909
rpm packaging - consolidate zoneminder apache config file
2017-07-14 10:15:12 -05:00
b3984ea2da
Merge branch 'master' into storageareas
2017-07-14 10:38:20 -04:00
94db0a3f02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-14 10:32:19 -04:00
801d978898
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-14 10:30:25 -04:00
a07f8961d1
add another zmDbConnect at the bottom of the while(1) loop which will ping and reconnect to db if neccessary.
2017-07-14 10:30:12 -04:00
d5a4aaca5d
fix braces, spacing, move pod docs to bottom
2017-07-14 10:28:31 -04:00
e9d1474a4d
fix braces, spacing, move pod docs to bottom
2017-07-14 10:27:27 -04:00
d634d8967b
Merge ../ZoneMinder.master into fix_empty_monitor_source_column
2017-07-14 10:04:24 -04:00
d13d7e9050
recode the bit that outputs the link under source so that it defaults to Monitor # under all situations
2017-07-14 09:57:25 -04:00
99bb12dcc9
Update zoneminder.spec
...
changes from rpmfusion feedback
2017-07-14 08:33:08 -05:00
0e54d4e69a
imposing a height on the textpanel causes the text to overflow
2017-07-14 09:26:56 -04:00
df0497b3a7
always use onmouseover, as we can now pull images fairly quickly from the mp4
2017-07-14 09:25:53 -04:00
c294e25dbc
rpm packaging - migrate cakephp htaccess parms into main apache config
2017-07-14 07:23:35 -05:00
8567ea9613
Merge pull request #1945 from connortechnology/fix_zmonvif
...
make code more robust by handling an undefined get_VideoEncoderConfig
2017-07-14 07:09:22 -05:00
Isaac Connor
Andrew Bauer