Commit graph

4808 commits

Author SHA1 Message Date
JCentinel
040dcd80dc Added Slack to press kit 2016-08-04 09:14:39 -04:00
JCentinel
5b5bec4fff Updated press kit with beta release date 2016-08-04 09:11:09 -04:00
Jeremy Kauffman
841484bd99 Merge pull request #63 from kaykurokawa/claimtrie-implementation-faq
revision for claimtrie implementation FAQ
2016-08-03 15:49:54 -04:00
JCentinel
52daa37a2a removed unnecessary comma 2016-08-03 14:17:25 -04:00
JCentinel
06520e799e Corrected bullet point about 60% genesis block 2016-08-03 14:15:48 -04:00
Alex Grin
52aa583efe Merge pull request #64 from kimihiro64/kimihiro64-patch-1
Add Poloniex Exchange to Learn Page
2016-08-03 14:12:49 -04:00
Alex Grin
1e1bf9991b Update bounties.md 2016-08-03 12:52:28 -04:00
kimihiro64
79855f28d9 Add poloniex 2016-08-03 11:37:46 -05:00
kimihiro64
625b5f3dc1 Add poloniex 2016-08-03 11:36:04 -05:00
kkurokawa
1b4da9aa72 revision for claimtrie implementation FAQ 2016-08-03 11:51:50 -04:00
Jeremy Kauffman
7bab13881d bounty program 1.0 2016-08-03 10:03:05 -04:00
Jeremy Kauffman
369d72a9f5 Merge remote-tracking branch 'origin/master' into bounties 2016-08-03 06:59:24 -04:00
Jeremy Kauffman
485c6126bb Merge pull request #59 from kaykurokawa/claimtrie-implementation-faq
Adding claimtrie implementation FAQ document
2016-08-03 06:16:48 -04:00
Jeremy Kauffman
3e2b16dffb Merge pull request #61 from lbryio/i18n
A first version of i18n is complete.
2016-08-03 06:12:26 -04:00
Jeremy Kauffman
cbdf0f2374 remove unused file 2016-08-03 06:11:14 -04:00
Jeremy Kauffman
98efdfd2a0 minor i18n fixes 2016-08-03 06:08:03 -04:00
Jeremy Kauffman
ebd23c4810 Merge remote-tracking branch 'origin/master' into i18n 2016-08-03 05:41:07 -04:00
Jeremy Kauffman
fdb630cbb4 delete post consisting of no longer accessible video 2016-08-03 05:24:48 -04:00
Jeremy Kauffman
e5a6bff197 easy to remember download URLs 2016-08-02 22:21:19 -04:00
Bruno
e1a8da0889 Fixed two broken labels 2016-07-30 22:13:04 -04:00
Bruno
97d512607b i18n version 0.1 complete 2016-07-30 21:57:48 -04:00
Bruno
fc7e28a29a Merge branch 'master' into i18n 2016-07-30 20:23:40 -04:00
Jeremy Kauffman
7202690409 update referral and waitlist faq 2016-07-29 12:58:23 -04:00
Jeremy Kauffman
607b4a333d Merge pull request #58 from lbryio/credit_policy
first draft of credit policy and first quarterly report
2016-07-29 12:50:11 -04:00
Jeremy Kauffman
99471c6602 add same language to report 2016-07-29 10:44:27 -04:00
Jeremy Kauffman
da9ff0cb02 add sentence 2016-07-29 10:43:18 -04:00
Jeremy Kauffman
9a20ac886e jeremy learns to spell 2016-07-29 09:59:06 -04:00
Jeremy Kauffman
61adab6e24 Merge remote-tracking branch 'origin/master' into credit_policy 2016-07-29 09:43:29 -04:00
Jeremy Kauffman
640f350980 light car work before my body insisted type in a car is a bad idea 2016-07-29 09:43:14 -04:00
Bruno
f8210eeddd Merge branch 'master' into i18n 2016-07-28 18:12:33 -04:00
Bruno
7438592fe7 i18n of several PHP files 2016-07-28 18:11:06 -04:00
Alex Grintsvayg
69ce230107 actually enable secure cookies 2016-07-28 15:59:47 -04:00
Jeremy Kauffman
265fe2addb Merge remote-tracking branch 'origin/master' into bounties 2016-07-28 14:42:48 -04:00
Bruno
f22a17d0f9 Merge branch 'master' into i18n 2016-07-28 14:01:44 -04:00
Bruno
ad659d1e52 Reference to home.php moved from /content to /page 2016-07-27 19:13:58 -04:00
kkurokawa
38bcafac4b adding claimtrie implementation FAQ document 2016-07-26 19:28:38 -04:00
Jeremy Kauffman
6a464e0c25 first draft of credit policy and first quarterly report 2016-07-26 18:29:00 -04:00
JCentinel
030a953073 Minor copy update 2016-07-26 16:24:06 -04:00
Alex Grintsvayg
ed42da1e15 more accurate 2016-07-26 15:44:28 -04:00
Alex Grintsvayg
28633fab91 wrong credit num shown 2016-07-26 15:41:36 -04:00
Bruno Parga
76f0c6d396 Merge branch 'master' into i18n 2016-07-26 19:04:58 +00:00
Bruno Parga
42658b7035 Merge branch 'i18n' of https://github.com/lbryio/lbry.io into i18n 2016-07-26 19:04:07 +00:00
Bruno Parga
eef1c72609 Fixed unmerged files 2016-07-26 19:03:56 +00:00
Bruno Parga
515ae2ee89 Committing changes that were on the server to later merge it with master 2016-07-26 18:49:00 +00:00
Alex Grintsvayg
00a1a5f2d3 dont send ip if lbry.io email 2016-07-26 14:11:40 -04:00
Jeremy Kauffman
a374b311d6 improved credit disclaimer 2016-07-26 12:42:59 -04:00
Jeremy Kauffman
f6baa670e3 fix typo 2016-07-26 12:37:06 -04:00
Bruno
3c0077b990 Merge branch 'master' into i18n 2016-07-26 11:08:45 -04:00
Bruno
d3f1ece038 Merged four files 2016-07-26 11:07:13 -04:00
Bruno
6bc147de51 Merge branch 'master' into i18n
Conflicts:
	controller/Controller.class.php
	view/template/fund/fund-after.php
	view/template/fund/goals.php
	view/template/page/publish.php
2016-07-26 11:05:21 -04:00