Commit graph

109 commits

Author SHA1 Message Date
Pierre Rudloff
1a6e995262 Merge branch 'develop' into feature/stream
Conflicts:
	composer.lock
2016-12-26 15:14:23 +01:00
Pierre Rudloff
cc3f662cb7 Slim update 2016-12-26 15:14:01 +01:00
Pierre Rudloff
ce9f794395 Merge branch 'develop' into feature/stream
Conflicts:
	composer.lock
2016-12-26 14:11:23 +01:00
Pierre Rudloff
4ecb43fe0b youtube-dl update 2016-12-26 14:10:36 +01:00
Pierre Rudloff
342dad38e6 Merge branch 'develop' into feature/stream
Conflicts:
	composer.json
	composer.lock
	controllers/FrontController.php
2016-12-26 13:06:55 +01:00
Pierre Rudloff
46ac4eaede youtube-dl update 2016-12-22 13:14:02 +01:00
Pierre Rudloff
3eb0ca077e Fix Travis builds
Test on PHP 7 and 5.6
2016-12-18 23:24:00 +01:00
Pierre Rudloff
f43da1bc57 Fix Docker builds 2016-12-18 22:41:56 +01:00
Pierre Rudloff
734390e269 Dependencies update 2016-12-18 21:45:41 +01:00
Pierre Rudloff
a426f3297a Merge branch 'develop' of github.com:Rudloff/alltube into develop
Conflicts:
	composer.lock
2016-12-03 14:00:25 +01:00
Pierre Rudloff
d61ad24d25 Dependencies update 2016-12-03 13:59:53 +01:00
Pierre Rudloff
24c9684784 Allow downloading of youtube-dl without Git (fixes #82)) 2016-11-13 23:51:41 +01:00
Pierre Rudloff
4cb08ad40d Dependencies update 2016-11-07 17:15:20 +01:00
Pierre Rudloff
e34b01f2c4 Add support for password protected videos 2016-10-20 23:01:31 +02:00
Pierre Rudloff
621ccfb491 composer.lock update 2016-10-20 18:34:09 +02:00
Pierre Rudloff
201d7c3376 rtmpdump is not required as it can be installed elsewhere 2016-10-18 10:22:35 +02:00
Pierre Rudloff
0d2d1cd548 ffmpeg and youtube-dl should be dev dependencies as they can be installed from elsewhere 2016-10-18 09:17:16 +02:00
Pierre Rudloff
bb1ae65733 phpunit update 2016-10-13 17:08:51 +02:00
Pierre Rudloff
6e73398369 Merge branch 'develop' into feature/stream
Conflicts:
	composer.lock
2016-10-13 17:07:00 +02:00
Pierre Rudloff
74278c8b29 Dependencies update 2016-10-05 01:44:22 +02:00
Pierre Rudloff
5b2cd81420 phpunit update 2016-09-26 01:25:00 +02:00
Pierre Rudloff
acfbef4a0a myclabs/deep-copy update 2016-09-19 12:02:14 +02:00
Pierre Rudloff
fc04f6f34c phpcs update 2016-09-15 01:33:17 +02:00
Pierre Rudloff
dd67495ccb Merge branch 'develop' into feature/stream
Conflicts:
	composer.json
	composer.lock
	controllers/FrontController.php
2016-09-11 18:58:58 +02:00
Pierre Rudloff
fcfd64db4d youtube-dl update 2016-09-09 00:03:47 +02:00
Pierre Rudloff
f338b47bd2 Dependencies update 2016-09-09 00:00:26 +02:00
Pierre Rudloff
5cfe237dd4 jsonlint 2016-08-20 13:07:31 +02:00
Pierre Rudloff
ab08c8f563 phpunit update 2016-08-19 00:29:41 +02:00
Pierre Rudloff
e7924d584e Merge branch 'develop' into feature/stream
Conflicts:
	composer.lock
2016-08-18 23:23:36 +02:00
Pierre Rudloff
f32b376cdb Dependencies update 2016-08-18 23:22:08 +02:00
Pierre Rudloff
bee63b68c1 Dependencies update 2016-08-13 11:59:24 +02:00
Pierre Rudloff
b516cb6346 Use local phpunit 2016-08-01 12:28:35 +02:00
Pierre Rudloff
8c8c36acee Add PHPCS as a dependency 2016-08-01 03:16:33 +02:00
Pierre Rudloff
352d51ff43 Symfony update 2016-08-01 01:03:26 +02:00
Pierre Rudloff
29cf3160a0 Merge branch 'develop' into feature/stream
Conflicts:
	composer.lock
2016-07-27 13:21:18 +02:00
Pierre Rudloff
3283a26edc youtube-dl update 2016-07-27 02:42:12 +02:00
Pierre Rudloff
8144aab43d We don't need that anymore 2016-07-27 02:34:06 +02:00
Pierre Rudloff
aba3d0c9f5 Merge branch 'develop' into feature/stream
Conflicts:
	composer.json
	composer.lock
	controllers/FrontController.php
2016-07-27 02:31:47 +02:00
Pierre Rudloff
f8b08acd10 Avoid exact version constraint 2016-07-27 02:23:24 +02:00
Pierre Rudloff
e21b4caaf8 youtube-dl update 2016-07-27 02:22:51 +02:00
Pierre Rudloff
ed23275d27 Slim upgrade 2016-07-27 01:56:54 +02:00
Pierre Rudloff
4fb77e4663 youtube-dl update 2016-06-27 12:10:35 +02:00
Pierre Rudloff
242d7efef9 Dependencies update 2016-06-27 12:05:05 +02:00
Pierre Rudloff
2eacda48e3 Symfony update 2016-06-06 03:12:27 +02:00
Pierre Rudloff
fc6a6120be Avoid exact version constraint 2016-05-26 18:29:27 +02:00
Pierre Rudloff
c10115f9af popen streams have been merged in upstream Slim 2016-05-26 18:27:30 +02:00
Pierre Rudloff
3370695e9e Use https://github.com/slimphp/Slim/pull/1872 in order to support popen streams in Slim 2016-05-25 18:39:48 +02:00
Pierre Rudloff
fd3aa1d4aa Slim update
Symfony update
2016-05-25 18:20:01 +02:00
Pierre Rudloff
14116168af Merge branch 'develop' into feature/stream
Conflicts:
	composer.json
	composer.lock
2016-04-30 02:36:04 +02:00
Pierre Rudloff
bcf399a9d4 youtube-dl update 2016-04-14 19:43:38 +02:00