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 |
|
JCentinel
|
2653620852
|
More minor formatting
|
2016-07-26 11:04:02 -04:00 |
|
JCentinel
|
9c168e86a1
|
Minor formatting tweaks.
|
2016-07-26 11:02:53 -04:00 |
|
JCentinel
|
0a27d62e80
|
Published "A Day in the Shoes of a Venezuelan"
|
2016-07-26 11:01:15 -04:00 |
|
JCentinel
|
7e450b0c35
|
venezuelan blog cover upload
|
2016-07-26 11:00:47 -04:00 |
|
Jeremy Kauffman
|
273816ce78
|
bounties begin
|
2016-07-25 17:28:06 -04:00 |
|
Alex Grintsvayg
|
1df58418bf
|
security++
|
2016-07-25 13:56:49 -04:00 |
|
Jeremy Kauffman
|
65978bd90a
|
Merge pull request #57 from lbryio/finer9-patch-1
Update mining-credits.md
|
2016-07-25 13:53:05 -04:00 |
|
Josh Finer
|
24180a953e
|
Update mining-credits.md
|
2016-07-24 17:26:56 -04:00 |
|
Alex Grin
|
c3330c4017
|
Create README.md
|
2016-07-24 17:24:32 -04:00 |
|
Alex Grin
|
5f0bdc2860
|
Merge pull request #53 from lbryio/finer9-patch-1
Update mining-credits.md
|
2016-07-24 17:23:43 -04:00 |
|
Alex Grin
|
81563715a1
|
Update mining-credits.md
|
2016-07-24 17:23:35 -04:00 |
|
Alex Grin
|
8b9df40bd3
|
Merge pull request #54 from lbryio/finer9-patch-2
Update how-to-check-hashrate.md
|
2016-07-24 17:21:33 -04:00 |
|
Alex Grin
|
b6e5e08b01
|
Merge pull request #55 from lbryio/finer9-patch-3
Update mining-pools.md
|
2016-07-24 17:21:15 -04:00 |
|
Alex Grin
|
5e46b4b19d
|
Merge pull request #56 from lbryio/finer9-patch-4
Update block-rewards.md
|
2016-07-24 17:20:57 -04:00 |
|
Josh Finer
|
62215c13f2
|
Update block-rewards.md
|
2016-07-24 17:17:29 -04:00 |
|
Josh Finer
|
d358253e63
|
Update mining-pools.md
|
2016-07-24 17:12:38 -04:00 |
|
Josh Finer
|
88ab84bb1d
|
Update how-to-check-hashrate.md
|
2016-07-24 17:11:36 -04:00 |
|
Josh Finer
|
6ffdf0d96b
|
Update mining-credits.md
|
2016-07-24 17:10:22 -04:00 |
|
Jeremy Kauffman
|
76a7a1cd50
|
minor phrasing tweak
|
2016-07-24 17:02:20 -04:00 |
|
Jeremy Kauffman
|
ab9e7ecdbd
|
fix extra whitespace by disabling scrollbar fix
|
2016-07-24 16:58:51 -04:00 |
|
Jeremy Kauffman
|
0442911414
|
more publish clean up/tweaks, add to /get
|
2016-07-24 16:49:22 -04:00 |
|
Jeremy Kauffman
|
6f713b5662
|
remove folder
|
2016-07-24 16:05:35 -04:00 |
|
Jeremy Kauffman
|
4a7038149b
|
remove unused code
|
2016-07-24 16:00:38 -04:00 |
|
Jeremy Kauffman
|
26c0d4d697
|
minor tweaks to publish content
|
2016-07-24 15:28:03 -04:00 |
|
Jeremy Kauffman
|
9457ebb420
|
Merge remote-tracking branch 'origin/master' into i18n
|
2016-07-24 15:04:22 -04:00 |
|
Alex Grin
|
6de3e70002
|
Merge pull request #52 from lbryio/finer9-patch-1
Update mining-pools.md
|
2016-07-24 13:58:36 -04:00 |
|
Josh Finer
|
e074c3aaae
|
Update mining-pools.md
added 2 pools
|
2016-07-24 12:46:06 -04:00 |
|
JCentinel
|
5be86ed325
|
Update 24-our-christmas-surprise.md
Replaced missing embedded video.
|
2016-07-22 14:23:05 -04:00 |
|
Bruno
|
1fd6f813b9
|
Merge branch 'master' into i18n
Conflicts:
view/template/content/faq.php
view/template/content/home.php
view/template/content/news.php
view/template/download/get.php
view/template/page/learn.php
view/template/page/publish.php
view/template/page/team.php
view/template/page/what.php
|
2016-07-21 15:35:29 -04:00 |
|
Bruno
|
eee4fed3cf
|
added Portuguese translation
|
2016-07-21 14:26:49 -04:00 |
|
Alex Grintsvayg
|
25845bfae4
|
fix prefinery
|
2016-07-21 11:16:20 -04:00 |
|
Jeremy Kauffman
|
c808a9857c
|
fix kinsella urls
|
2016-07-21 10:53:36 -04:00 |
|
JCentinel
|
3e42207488
|
Update 51-launch-a-disaster.md
|
2016-07-20 16:33:47 -04:00 |
|