Commit graph

2478 commits

Author SHA1 Message Date
jessopb
363c079433
Merge pull request #1073 from lbryio/staging
cuts release from staging
2020-06-11 12:45:13 -04:00
jessopb
8ca76a6de1
Merge pull request #1072 from lbryio/master
redirect fixes
2020-06-11 12:31:04 -04:00
jessopb
99c7b087d7
Merge pull request #1071 from lbryio/redirect2
prevent server side redirect
2020-06-11 12:30:31 -04:00
jessop
67e198db2f prevent server side redirect 2020-06-11 12:29:26 -04:00
jessopb
50805ad4ea
Merge pull request #1070 from lbryio/master
cut staging from master
2020-06-10 17:14:01 -04:00
jessopb
b410eb8c94
Merge pull request #1069 from lbryio/redirectTv
redirect content to lbry.tv
2020-06-10 17:12:46 -04:00
jessop
efc38529c7 redirect content to lbry.tv 2020-06-10 17:01:44 -04:00
Thomas Zarebczan
dfa6db6276
fix broken claims?
https://spee.ch/@Deterrence-Dispensed:2/AR22LR-MagazineKit-1.1
2020-06-05 16:46:39 -04:00
jessopb
5215bfbc4e
Merge pull request #1068 from lbryio/staging
cut release
2020-06-05 16:30:13 -04:00
jessopb
2b4a379638
Merge pull request #1067 from lbryio/master
cut staging
2020-06-05 16:27:37 -04:00
Thomas Zarebczan
9df4d29dda
Use only streams for channel
Maybe fix the repost bug where a channel won't load for now.
2020-06-04 21:14:42 -04:00
jessopb
68b6f484e4
Merge pull request #1066 from lbryio/staging
Staging
2020-05-16 11:08:51 -04:00
jessopb
7584d0c7e3
Merge pull request #1065 from lbryio/master
Merge pull request #1064 from lbryio/updateMessaging
2020-05-15 14:11:35 -04:00
jessopb
7940c61b17
Merge pull request #1064 from lbryio/updateMessaging
update messaging, disable publish and channels
2020-05-15 14:11:00 -04:00
jessopb
3d36f136f1
Merge pull request #1063 from lbryio/updateMessaging
Update messaging
2020-05-15 14:10:08 -04:00
jessop
5ed72b0e14 update messaging, disable publish and channels 2020-04-22 20:24:23 -04:00
Jeremy Kauffman
922a53cc30
Merge pull request #1055 from ykris45/patch-5
Update LICENSE
2020-02-03 15:00:34 -05:00
YULIUS KURNIAWAN KRISTIANTO
d11ba6225e
Update LICENSE
update year
2020-02-03 04:41:19 +07:00
jessopb
a8678f5d1f
Merge pull request #1054 from lbryio/staging
cuts release from master
2020-01-12 19:49:57 -05:00
jessopb
423c0c9311
Merge pull request #1053 from lbryio/master
cuts staging from master
2020-01-12 19:43:08 -05:00
jessopb
3d23635bf5
Merge pull request #1052 from lbryio/fixesJan20
pagination (thanks Tom)
2020-01-12 19:39:50 -05:00
jessop
707e144eff pagination (thanks Tom) 2020-01-12 19:34:16 -05:00
Thomas Zarebczan
ad87e2b8a7
Update README.md 2019-12-08 09:44:22 -05:00
jessopb
01ae90fc15
fix customize link 2019-12-07 11:15:24 -05:00
Thomas Zarebczan
1e6cb2a7c6
Merge pull request #1042 from StrikerRUS/patch-1
removed deprecated field in Travis
2019-10-15 11:53:56 -04:00
jessopb
2e7d4c5112
Merge pull request #1046 from lbryio/staging
Cuts Release from Staging
2019-10-14 11:16:23 -04:00
jessopb
15e4a97e6a
Merge pull request #1044 from lbryio/master
cuts staging from master
2019-10-10 22:20:57 -04:00
jessopb
5dc89f0a91
Merge pull request #1043 from lbryio/dmca-fix
Update report route
2019-10-10 18:11:57 -04:00
Thomas Zarebczan
0974e6d6b0
Update report route
+ pass claim id

Example: https://lbry.com/dmca/116d62d14d8efc311e1f8a9de92dcbc17deb259a
2019-10-10 13:42:29 -04:00
Nikita Titov
64d7afd278
removed deprecated field in Travis 2019-10-09 00:16:24 +03:00
jessopb
648639e6c6
Merge pull request #1041 from lbryio/cors2
applies open cors to publish routes
2019-10-08 09:45:53 -04:00
jessop
8ded28beb3 applies open cors to publish routes 2019-10-08 09:06:33 -04:00
jessopb
b1a9d8ee74
Merge pull request #1040 from lbryio/master
cuts staging from master
2019-10-01 15:52:45 -04:00
jessopb
9e76553f0a
Merge pull request #1039 from lbryio/speechCors
moves whitelist to config and catches errors
2019-10-01 15:39:38 -04:00
jessop
f4a50d0c85 moves whitelist to config and catches errors 2019-10-01 15:19:31 -04:00
jessopb
23953a32e8
Merge pull request #1037 from lbryio/cors
Cors
2019-09-29 15:06:43 -04:00
jessop
aa4a43a1a5 cors 2019-09-29 14:54:17 -04:00
Thomas Zarebczan
eba7fd596f
Merge pull request #1035 from lbryio/dependabot/npm_and_yarn/mixin-deep-1.3.2
Bump mixin-deep from 1.3.1 to 1.3.2
2019-09-18 11:45:54 -04:00
dependabot[bot]
9130b6f609
Bump mixin-deep from 1.3.1 to 1.3.2
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
2019-08-27 22:24:31 +00:00
jessopb
94f5f6dc69
Merge pull request #1032 from lbryio/staging
cuts release from staging
2019-08-13 21:13:37 -04:00
jessopb
269a2c57a7
Merge pull request #1031 from lbryio/master
cuts staging from master
2019-08-09 10:04:19 -04:00
jessopb
1fd0ec1fc2
Merge pull request #1030 from lbryio/revert-1025-dependabot/npm_and_yarn/sequelize-5.3.0
Revert "Bump sequelize from 4.41.1 to 5.3.0"
2019-08-09 09:55:15 -04:00
jessopb
53e0d2a0db
Revert "Bump sequelize from 4.41.1 to 5.3.0" 2019-08-09 09:51:45 -04:00
Jeremy Kauffman
aebaa4f954
Merge pull request #1029 from lbryio/master
cuts staging from master
2019-08-07 11:05:01 -04:00
jessopb
5b2108796c
Merge pull request #1025 from lbryio/dependabot/npm_and_yarn/sequelize-5.3.0
Bump sequelize from 4.41.1 to 5.3.0
2019-08-07 10:42:32 -04:00
jessopb
200903827a
Merge pull request #1022 from lbryio/dependabot/npm_and_yarn/lodash.mergewith-4.6.2
Bump lodash.mergewith from 4.6.1 to 4.6.2
2019-08-07 10:39:37 -04:00
jessopb
993b1d31e9
Merge pull request #1023 from lbryio/dependabot/npm_and_yarn/axios-0.18.1
Bump axios from 0.18.0 to 0.18.1
2019-08-07 10:39:22 -04:00
jessopb
8891f298ae
Merge pull request #1024 from lbryio/dependabot/npm_and_yarn/lodash-4.17.13
Bump lodash from 4.17.11 to 4.17.13
2019-08-07 10:39:11 -04:00
jessopb
9bd779775a
Merge pull request #1026 from lbryio/dependabot/npm_and_yarn/handlebars-4.1.2
Bump handlebars from 4.1.0 to 4.1.2
2019-08-07 10:38:27 -04:00
jessopb
322b8a147d
Merge pull request #1027 from lbryio/dependabot/npm_and_yarn/fstream-1.0.12
Bump fstream from 1.0.11 to 1.0.12
2019-08-07 10:38:14 -04:00