Isaac Connor
|
660ce5bf8c
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-13 10:12:51 -04:00 |
|
Isaac Connor
|
532dc98e9e
|
fix zms
|
2016-05-11 11:38:53 -04:00 |
|
Isaac Connor
|
b44cee4a81
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-11 09:16:20 -04:00 |
Isaac Connor
|
cfd986de44
|
Merge branch 'master' into storageareas
|
2016-05-10 08:43:46 -04:00 |
|
Isaac Connor
|
4d20d35f8d
|
add back missing depends for perl modules which are needed both for building and installing
|
2016-05-10 08:43:38 -04:00 |
|
Isaac Connor
|
f609b838cd
|
Merge branch 'master' into storageareas
|
2016-05-09 21:34:25 -04:00 |
|
Isaac Connor
|
5566d1881d
|
add perl dbd mysql to build depends. Seems to need it.
|
2016-05-09 21:34:12 -04:00 |
|
Isaac Connor
|
566f18c9ae
|
bump
|
2016-05-09 21:09:43 -04:00 |
|
Isaac Connor
|
b88861e145
|
add back ffmpeg libs
|
2016-05-09 19:42:14 -04:00 |
|
Isaac Connor
|
beebe74e7b
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-09 12:26:17 -04:00 |
|
Isaac Connor
|
5b8f713037
|
fix libavutils -> libavutil
|
2016-05-07 11:28:53 -04:00 |
|
Isaac Connor
|
5158bbc670
|
add non-ffmpeg versions of libraries to depends list. ubunutu1604 doesn't seem to list them with the ffmpeg specification
|
2016-05-07 09:43:30 -04:00 |
|
Isaac Connor
|
f9a24d7171
|
bump today's release
|
2016-05-05 14:51:57 -04:00 |
|
Isaac Connor
|
79572270d3
|
bump version
|
2016-05-02 10:46:23 -04:00 |
|
Isaac Connor
|
00f38cdd1b
|
version bump
|
2016-05-02 10:39:41 -04:00 |
Steve Gilvarry
|
97a4cf0852
|
Add the changes...doh
|
2016-05-01 15:06:45 +10:00 |
|
Steve Gilvarry
|
d7f7a0f074
|
Rename ubuntu1504, which is unsupported, to ubuntu 1604. Fix control file
to current libav packages and php virtual packages. Update debian build
script to use new folder for any non-trusty build.
|
2016-05-01 13:46:09 +10:00 |
|
Isaac Connor
|
d06a0cf2a4
|
2016042801 build
|
2016-04-28 12:58:09 -04:00 |
|
Steve Gilvarry
|
6549f7bf29
|
Merge pull request #1403 from ZoneMinder/fix_grant
Fix grant
|
2016-04-28 21:49:21 +10:00 |
|
Isaac Connor
|
386afc3546
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-26 20:02:04 -04:00 |
|
Isaac Connor
|
6a31966781
|
shift to match debian
|
2016-04-22 13:35:20 -04:00 |
|
Isaac Connor
|
8b96872efe
|
shoudl be php-mysql for php7
|
2016-04-20 15:04:50 -04:00 |
|
Isaac Connor
|
e218e91e24
|
add php7 versions for 1604
|
2016-04-20 14:58:18 -04:00 |
|
Isaac Connor
|
c626baae14
|
Merge branch 'fix_grant' into storageareas
|
2016-04-20 14:39:06 -04:00 |
|
Isaac Connor
|
02a56b811b
|
Don't be recursive when chowning /var/cache/zoneminder
|
2016-04-20 14:38:51 -04:00 |
|
Isaac Connor
|
060df90ff3
|
bump versions
|
2016-04-20 09:38:07 -04:00 |
|
Isaac Connor
|
7e1a80658b
|
Merge branch 'master' into storageareas
|
2016-04-17 09:30:33 -04:00 |
|
Isaac Connor
|
d424a297c4
|
need php5-gd
|
2016-04-17 09:29:55 -04:00 |
|
Isaac Connor
|
3f27f4893c
|
Merge branch 'fix_grant' into storageareas
|
2016-04-15 12:55:13 -04:00 |
|
Isaac Connor
|
78c6e14e0c
|
Merge branch 'master' into storageareas
|
2016-04-09 14:52:28 -04:00 |
Andy Bauer
|
dafdf1a289
|
rpm specfile changes
|
2016-04-08 19:22:27 -05:00 |
|
Isaac Connor
|
e473839704
|
substitute ZM_DB_NAME,ZM_DB_USER and ZM_DB_PASS from zm.conf for defaults
|
2016-04-06 15:50:51 -04:00 |
|
Isaac Connor
|
3dd010b40a
|
User and and instead of defaults
|
2016-04-06 15:44:56 -04:00 |
|
Isaac Connor
|
6cdbcfc9e6
|
add back identified by
|
2016-04-06 13:55:18 -04:00 |
|
Isaac Connor
|
6199a54838
|
more work, check for local db, check for existence of mysql, sync up between debian ubuntu1204 ubuntu1504
|
2016-04-06 13:45:46 -04:00 |
|
Isaac Connor
|
699b6458d5
|
bring up to date with debian postinst. Will not install the db, create the user and will run zmupdate.
|
2016-04-06 13:08:30 -04:00 |
|
Isaac Connor
|
cf76360ecb
|
bring up to date with the one in debian
|
2016-04-06 13:03:24 -04:00 |
|
Isaac Connor
|
fb05e1baad
|
grant requires rights regardless of password
|
2016-04-06 13:01:20 -04:00 |
|
Isaac Connor
|
59a8b37df2
|
Merge branch 'master' into storageareas
|
2016-04-06 11:47:20 -04:00 |
|
Isaac Connor
|
765f79a87f
|
Merge branch 'icon_video' into storageareas
|
2016-04-06 11:16:38 -04:00 |
|
Isaac Connor
|
3e5a4b6481
|
remove autotools builds, replace them with cmake versions
|
2016-04-06 08:43:20 -04:00 |
|
Isaac Connor
|
9a795432cf
|
merge all the commits from the messed up iconnor_video branch
|
2016-04-05 17:14:46 -04:00 |
|
Isaac Connor
|
60642c1fff
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-05 12:32:33 -04:00 |
|
Isaac Connor
|
f73d8be765
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-05 09:43:34 -04:00 |
|
Isaac Connor
|
238a25a302
|
Merge branch 'master' into iconnor_video
|
2016-04-05 09:38:59 -04:00 |
|
Isaac Connor
|
0f1a530891
|
ciontrol files need spaces on multi-line lines
|
2016-04-05 09:03:37 -04:00 |
|
SteveGilvarry
|
4d7ded5ef0
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
|
2016-04-05 22:06:14 +10:00 |
|
Andy Bauer
|
7ff8d36598
|
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
|
2016-04-04 20:44:53 -05:00 |
|
Isaac Connor
|
82b32578ec
|
Merge branch 'master' into iconnor_video
|
2016-04-01 12:54:09 -04:00 |
|
Isaac Connor
|
abcf48b65c
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-01 08:53:45 -04:00 |