Commit graph

91 commits

Author SHA1 Message Date
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
Pierre Rudloff
d00c1dc91c Use PSR-7 streams for conversion 2016-04-14 12:42:13 +02:00
Pierre Rudloff
63ec60b4ad Slim now handles Content-Length correctly with HTTP streams 2016-04-13 10:44:30 +02:00
Pierre Rudloff
f7577b9825 Merge branch 'develop' into feature/stream
Conflicts:
	composer.json
	composer.lock
2016-04-13 10:33:51 +02:00
Pierre Rudloff
3e8cbe6cc8 Get rudloff/rtmpdump-bin from packagist 2016-04-12 21:21:18 +02:00
Pierre Rudloff
57a1674f4b Use local rtmpdump 2016-04-12 21:13:43 +02:00
Pierre Rudloff
ac16e68389 Merge branch 'develop' into feature/stream
Conflicts:
	composer.json
	composer.lock
2016-04-12 15:13:50 +02:00
Pierre Rudloff
8ba55cf5d4 We can't track ffmpeg builds version 2016-04-12 14:52:00 +02:00
Pierre Rudloff
b787b6d3a2 Use ProcessBuilder to create commands
Fix rtmp audio
2016-04-12 11:49:50 +02:00
Pierre Rudloff
b2b062703a Merge branch 'develop' into feature/stream
Conflicts:
	composer.lock
2016-04-12 11:05:54 +02:00
Pierre Rudloff
724f3bb31a Download only one file 2016-04-11 22:41:25 +02:00
Pierre Rudloff
f267bac3ba Merge branch 'develop' into feature/stream 2016-04-10 19:01:13 +02:00
Pierre Rudloff
1bdfcbeb09 rudloff/smarty-plugin-noscheme update
rudloff/smarty-plugin-noscheme autoload
2016-04-09 02:42:46 +02:00
Pierre Rudloff
df9f60339d WIP stream 2016-04-07 02:48:36 +02:00
Pierre Rudloff
7eef219128 noscheme on all URL 2016-04-06 13:19:27 +02:00
Pierre Rudloff
4a2a795131 youtube-dl update 2016-04-06 13:05:19 +02:00
Pierre Rudloff
589ac1aa67 mathmarques/smarty-view update 2016-04-01 00:45:44 +02:00
Pierre Rudloff
1d83c5c0b3 Use symfony/process (fixes #50) 2016-04-01 00:42:28 +02:00
Pierre Rudloff
55a250d60f Dependencies update 2016-04-01 00:19:25 +02:00