Alex Grintsvayg
1f6b477d24
use test stripe token when connected to api on localhost
2017-08-25 16:49:27 -04:00
Jeremy Kauffman
010534cc16
kill utils.js, reduce (set|get)(Local|Session) to just lbry.js
2017-08-25 16:26:09 -04:00
Jeremy Kauffman
b49318aead
Merge pull request #496 from lbryio/redux_volume
...
Issue #323 switch volume preference to use redux
2017-08-25 16:17:26 -04:00
Baltazar Gomez
c03c0de0a2
Fix for #461
...
show full price on confirmation
don't format full price
smart format for full price
2017-08-25 16:03:29 -04:00
Akinwale Ariwodola
faa1c4634b
Issue #323 switch volume preference to use redux
2017-08-25 20:05:00 +01:00
hackrush
5ae8129084
Fix the Mega Breaking change
2017-08-26 00:11:31 +05:30
hackrush
e8c5ba5536
Tipping UI is rendered in FilePage
2017-08-25 23:33:33 +05:30
hackrush
0054723ed6
Added Fee column
2017-08-25 18:56:43 +05:30
hackrush
a2cc9afe05
Displays additional fields in the transaction list
2017-08-20 15:21:57 +05:30
Akinwale Ariwodola
970539ffae
fixed merge conflicts with latest master
2017-08-19 09:01:31 +01:00
Jeremy Kauffman
5bec6accc2
mostly done
...
refactor modals and settings, clean-up CHANGELOG
2017-08-18 17:47:30 -04:00
6ea86b96
5df497182e
Working on history fix
2017-08-18 13:18:15 -04:00
Jeremy Kauffman
22fbf13715
attempt to disable back/forward buttons
2017-08-18 13:18:15 -04:00
Baltazar Gomez
86b4f8e82c
add forward button
...
add forward history
diseable conditionals
fix last commit
update CHANGELOG.md
2017-08-18 13:18:03 -04:00
Jeremy Kauffman
622f1aaa37
backup help
2017-08-15 17:42:48 -04:00
hackrush
aefda6398b
Added wallet backup guide referance.
...
It also displays the current wallet path so user doesn't have to "go
places"
Could use a different/better msg though, this was more of a place
holder.
2017-08-15 17:20:38 -04:00
hackrush
de40578608
Passing params directly w/o using redux store
2017-08-14 15:13:40 +05:30
Jeremy Kauffman
8598eab3b3
drop hard minimum checks
2017-08-12 18:21:53 -04:00
Baltazar Gomez
eac8b345d9
Show minimum LBC deposit amounts for Publish / Claims
...
set min bid for channel creation
remove unused function handleCreateChannelClick
lbryio/lbry-app#440
display claim min-bid
get bids from function
add better message error
prevent negative value in WalletSend > input
2017-08-12 18:21:52 -04:00
Jeremy Kauffman
91c041cfd8
will jeremy ever learn to not merge PRs by inspection? probably not
2017-08-12 16:30:44 -04:00
Jeremy Kauffman
ef4435954a
replace confusing placeholder email text
2017-08-12 16:24:21 -04:00
Baltazar Gomez
ec5709d9ed
prevent negative value in WalletSend > input
2017-08-12 11:39:51 -06:00
Jeremy Kauffman
db2ada9ec4
Merge pull request #459 from aayanl/patch-1
...
Update bid input field in view.jsx to not go past 0
2017-08-12 13:13:59 -04:00
Jeremy Kauffman
05783db1ba
set precision to 2, improve rendering of amounts below precision
2017-08-10 23:03:28 -04:00
Baltazar Gomez
da497aeaf3
init fix for #461
...
use `===` instead of `==`
don't format prices
increase price precision
2017-08-10 23:03:28 -04:00
hackrush
bd11952d41
Check for required fields during publishing
2017-08-10 02:33:06 +05:30
Procrastinator
dcf5844ff6
Update view.jsx
2017-08-09 12:07:49 -04:00
Akinwale Ariwodola
d591886df5
reduxify pull request 325
2017-08-08 10:36:14 +01:00
hackrush
03ee864af0
(WIP) Tip as support Functionality Only.
2017-08-08 03:56:43 +05:30
hackrush
4d60f96b85
The form now displays a help message.
2017-08-08 03:49:22 +05:30
hackrush
a701011245
Removed useless passing of claim arg in filePage
2017-08-08 03:49:22 +05:30
hackrush
7ce5d596b8
Displays snackBar for any successful trasaction.
...
Also, minor changes to tip form css, to increase gap between select box
and tip button.
2017-08-08 03:49:22 +05:30
hackrush
ba6d093d1c
Added new component form for price, also only tipping form is shown when
...
clicked.
2017-08-08 03:49:22 +05:30
hackrush
b8b3a6ffd2
Changed modals to use constants.
2017-08-08 03:49:22 +05:30
hackrush
a74d61d685
Added tip related code in different file.
2017-08-08 03:49:22 +05:30
hackrush
f54f8a4e10
Testing with tip link in different file.
2017-08-08 03:49:22 +05:30
hackrush
f403260598
(WIP) Adds tipping feature to app.
...
For issue #355
2017-08-08 03:49:22 +05:30
hackrush
05c38ec575
Using setState in formFieldPrice
2017-08-07 21:47:54 +05:30
hackrush
6ab77b5324
Showing "other currency" help tip in publish form now works.
...
Also removed old commit's(9c3d633
2017-08-07 07:51:20 +05:30
Jeremy Kauffman
a299ca2ddd
significant additional form changes and cleanup
2017-08-06 18:27:37 -04:00
hackrush
9c3d63353d
Created a more generic PriceForm component
...
- [ ] Fixes #426
Modifying form to use single onChange event.
ONLY MEANT FOR TESTING, NOT MERGING.
2017-08-06 18:27:08 -04:00
Jeremy Kauffman
6304d6b4b9
improve confirm identity flow
2017-08-02 19:37:38 -04:00
Jeremy Kauffman
a83aee1452
flow for failed authentication
2017-08-02 18:55:58 -04:00
Jeremy Kauffman
cec789b983
make featured content icon a rocket ship
2017-08-02 13:43:58 -04:00
hackrush
50d7b3ab70
(quickfix) Now displays quit button in IncompatibleDaemonModal.
...
Also display a Learn More link pointing to the appropriate faq.
2017-07-31 10:19:56 +05:30
Jeremy Kauffman
af34bdfff1
Add tooltips to header buttons, fixes #401
2017-07-30 17:24:46 -04:00
Jeremy Kauffman
72340475e3
Merge pull request #407 from akinwale/blocks-behind-grammar
...
Simple fix for cases where the status is 1 block behind
2017-07-30 16:29:41 -04:00
Jeremy Kauffman
64bebd9321
do not block play button on cost info
2017-07-30 15:57:22 -04:00
Jeremy Kauffman
8acccafe19
fix handling and display of errors on get API call
2017-07-30 15:37:44 -04:00
Jeremy Kauffman
d58990f240
fix incorrect file_list responses
2017-07-30 15:20:36 -04:00
Jeremy Kauffman
f4bdabd5d8
fix clicking play twice required on most videos
2017-07-30 13:57:21 -04:00
Akinwale Ariwodola
7aa69d4897
simple fix for cases where the status is 1 block behind
2017-07-30 16:27:50 +01:00
Jeremy Kauffman
b6d3a52f5d
featured icon for reward content
2017-07-29 18:56:08 -04:00
Alex Liebowitz
230d2a451c
Indicate content eligible for Hot Right Now reward
2017-07-29 17:54:05 -04:00
Jeremy Kauffman
1f588ff923
improve first run feedback
2017-07-29 17:52:32 -04:00
6ea86b96
d7ceeb15cf
Add pagination
...
Some bad pagination CSS
2017-07-29 15:35:14 -04:00
Jeremy Kauffman
687321d91b
rework welcome flow and copy again
2017-07-27 21:13:12 -04:00
Jeremy Kauffman
ad73e6f1ae
add zip code
2017-07-27 14:42:43 -04:00
Jeremy Kauffman
c972230df4
Merge pull request #388 from lbryio/file-actions-fix
...
Quick fix to stop an infinite loop
2017-07-26 07:36:57 -04:00
6ea86b96
12e0d99a95
Quick fix to stop an infinite loop
2017-07-26 15:44:05 +07:00
Jeremy Kauffman
edb9ad3f01
simplify config
2017-07-25 14:59:47 -04:00
6ea86b96
1f9fc456d3
Restart download monitoring in redux for pending downloads after
...
restart
2017-07-25 15:45:21 +07:00
Jeremy Kauffman
29553bc391
auth flow fixes
2017-07-24 18:59:26 -04:00
Jeremy Kauffman
ac34faea80
Merge remote-tracking branch 'origin/master' into rewards3
2017-07-24 18:09:37 -04:00
hackrush
0f4bc36bcd
The URL name is automatically suggested.
...
Fixes #347
minor clean up
2017-07-24 17:56:18 -04:00
Jeremy Kauffman
276aa5c27e
Merge pull request #381 from lbryio/no-progress-downloads
...
Display the download button for files that are not downloading and have 0 progress
2017-07-24 17:30:42 -04:00
6ea86b96
4745088eff
Display the download button for files that are not downloading and have
...
0 progress
2017-07-25 00:37:57 +07:00
Alex Grintsvayg
7ea5c615bd
remove confusing placeholder, add prompt to check email for code
2017-07-24 09:03:55 -04:00
6ea86b96
af96d40ead
Remove files from downloading list when they are deleted mid download
2017-07-22 10:54:15 +07:00
Jeremy Kauffman
5ea4bffe9d
production key
2017-07-21 18:13:13 -04:00
Jeremy Kauffman
343fadb462
fix modal showing for existing users, fix previous merge, remove console
2017-07-21 18:06:39 -04:00
Jeremy Kauffman
c67fe5aae6
update to master
2017-07-21 17:45:37 -04:00
6ea86b96
76a99cc576
Add a loading file info message.
2017-07-21 16:02:03 +07:00
Jeremy Kauffman
57a56c5313
remove unused logic
2017-07-20 17:35:56 -04:00
Jeremy Kauffman
c2a611f11c
more user flow improvements, possibly ready
2017-07-19 21:07:17 -04:00
Jeremy Kauffman
53168074e0
tweak styling
2017-07-19 18:13:19 -04:00
Jeremy Kauffman
9e1b78c044
Merge branch 'ui-discover-cards' of https://github.com/akinwale/lbry-app into akinwale-ui-discover-cards
2017-07-19 17:57:08 -04:00
Jeremy Kauffman
38fd451e72
add startup daemon version check, refactor daemon versioning to package.json
2017-07-19 17:05:08 -04:00
reillysmith
aff019bf56
clearer language
...
extended tool tip and changed identity to channel
2017-07-19 11:25:52 -04:00
Jeremy Kauffman
4632c4f919
update publish content url help text
2017-07-19 11:23:32 -04:00
Jeremy Kauffman
d7fdaa08e2
more progress
2017-07-19 11:09:40 -04:00
6ea86b96
739bf6adf5
Use history API to retain scrollY when navigating back
2017-07-19 16:20:51 +07:00
Jeremy Kauffman
ab9150fb27
end-to-end barebones
2017-07-18 19:00:13 -04:00
6ea86b96
969bc0bcbe
Fix hiding new channel fields on publish form
2017-07-18 13:55:20 +07:00
6ea86b96
95c5ddbfda
Fix hiding price input when free is checked on publish form
2017-07-18 13:45:00 +07:00
Akinwale Ariwodola
0854fb7004
Discover page UI tweaks
2017-07-17 15:50:07 +01:00
Jeremy Kauffman
16abedbf3a
moderate progress
2017-07-16 12:29:46 -04:00
Jeremy Kauffman
b3de4ceee9
beginnings of new flow
2017-07-15 15:25:39 -04:00
Jeremy Kauffman
e918e9b17d
fix search bug and update changelog
2017-07-14 15:34:53 -04:00
Akinwale Ariwodola
f1b0c272cb
CardMedia component
2017-07-14 00:18:28 +01:00
Jeremy Kauffman
3950f7e9b2
fix import case
2017-07-13 10:19:27 -04:00
6ea86b96
d1eb8f5de3
Stop old file infos from updated claims appearing in downloaded file list
2017-07-13 13:52:48 +07:00
6ea86b96
0419399dec
Disable markdown editor side-by-side mode
2017-07-13 13:52:48 +07:00
6ea86b96
cd9fcf550a
Remove console.log
2017-07-13 13:52:48 +07:00
6ea86b96
5e6d790bb3
Drop notice component
2017-07-13 13:52:48 +07:00
6ea86b96
103e4302d4
Disable publish button if bid is too low
2017-07-13 13:52:48 +07:00
6ea86b96
d0e3dd8f99
Extract TruncatedMarkdown component
2017-07-13 13:52:48 +07:00
6ea86b96
6f336c96c5
Remove unnecessary binds
2017-07-13 13:52:48 +07:00
6ea86b96
76fe44e519
Refactor back to lbry.js localStorage for pending publishes
2017-07-13 13:52:47 +07:00
6ea86b96
470f61da9d
commit little and often fail
2017-07-13 13:52:47 +07:00
6ea86b96
5012d44384
Start using claims instead of file info for published files
2017-07-13 13:52:47 +07:00
6ea86b96
253932113f
Fix adding new identities
2017-07-13 13:52:47 +07:00
6ea86b96
7c5187c4e4
Create publish form component, fix markdown editor, fix prefill
2017-07-13 13:52:47 +07:00
Le Long
b09d71ecff
Markdown Support
2017-07-13 13:52:47 +07:00
6ea86b96
8325828f6e
Progress towards working publish
2017-07-13 13:52:47 +07:00
Akinwale Ariwodola
0198c991e3
check that fileInfo outpoint is different before resetting media play state
2017-07-12 21:56:18 +01:00
Akinwale Ariwodola
877586a00a
Issue #333 media switch fix
2017-07-12 13:40:36 +01:00
Jeremy Kauffman
52393145ec
Merge pull request #320 from akinwale/issue253
...
Issue #253 mp3 audio seek fix
2017-07-11 16:46:36 -04:00
Jeremy Kauffman
a7d8d1a7b0
fix misnamed modal
2017-07-10 13:19:42 -04:00
Akinwale Ariwodola
95145b57e3
additional tweaks to renderAudio
2017-07-06 20:03:31 +01:00
Akinwale Ariwodola
913d642b52
removed additional unused code
2017-07-06 18:44:52 +01:00
Akinwale Ariwodola
f61a8a4372
removed unused code
2017-07-06 18:42:39 +01:00
Akinwale Ariwodola
ee002597fc
Merged with master to resolve conflicts
2017-07-06 18:39:35 +01:00
Akinwale Ariwodola
49b1399926
MP3 audio seek fix #2
2017-07-06 18:33:44 +01:00
Jeremy Kauffman
658ce9115f
Merge pull request #317 from akinwale/issue311
...
Issue #311 playback input improvements
2017-07-04 14:13:13 -04:00
Akinwale Ariwodola
398f3b9ee8
Prevent keydown event from preventing space input in omnibar
2017-07-02 19:33:07 +01:00
Jeremy Kauffman
8ea972200a
refactor remove file modal
2017-07-02 14:23:38 -04:00
6ea86b96
91359c2966
Add option to abandon claim when deleting published file
2017-07-02 13:48:53 -04:00
Jeremy Kauffman
1dea560cdf
switch volume to session
2017-07-02 11:36:24 -04:00
Akinwale Ariwodola
444f230877
Issue #310 video volume reset fix
2017-07-02 11:36:24 -04:00
Akinwale Ariwodola
c111af6579
Issue #253 mp3 audio seek fix
2017-07-02 11:09:26 +01:00
Akinwale Ariwodola
98e25bee45
Issue #308 hide menu in fullscreen mode on Windows
2017-07-02 09:00:22 +01:00
Akinwale Ariwodola
49900e0cdf
Added requested event handling changes
2017-07-01 22:57:14 +01:00
Akinwale Ariwodola
fb3785feed
Implemented the ability for the spacebar to initiate video playback
2017-07-01 21:48:12 +01:00
Akinwale Ariwodola
b43ed0b64f
Issue #311 playback input improvements
2017-07-01 21:33:23 +01:00
hackrush
80b54c27f8
Renamed links files.
...
Fixed some incorrectly named files.
2017-06-29 18:29:06 +05:30
Jeremy Kauffman
b815f78a50
more pending and publishing fixes
2017-06-28 18:08:16 -04:00
Jeremy Kauffman
bab2f7d53c
fix initial reward showing
2017-06-28 14:00:10 -04:00
6ea86b96
500fdd282c
Move client settings into redux
2017-06-28 14:12:01 +07:00
hackrush
e3bbb6fcef
"Fixed NSFW content showing on filePage"
...
NSFW content is obscured on show page and gives an overlay to inform
the user. Fixes #286
Added one additional format(epub) in lbry.js.
2017-06-27 14:18:30 -04:00
Jeremy Kauffman
ee1de52156
Merge pull request #280 from lbryio/player-classes
...
Use array to build classes in video view
2017-06-24 14:53:24 -04:00
6ea86b96
3a57363b8a
Use array to build classes in video view
2017-06-23 23:19:48 +07:00
Alex Grintsvayg
56aa4d2255
dont even make lock files
2017-06-23 11:30:17 -04:00
Jeremy Kauffman
ade2788d33
Merge pull request #276 from lbryio/trim-search-term
...
Trim search query
2017-06-23 09:42:31 -04:00
Jeremy Kauffman
5e6c2363bd
Merge pull request #275 from lbryio/fix-transaction-links
...
Fix links from transactions to block explorer
2017-06-23 09:41:33 -04:00
6ea86b96
e67a826314
Add claim ids to urls in downloaded/published files
2017-06-23 13:58:08 +07:00
6ea86b96
717e6c12bf
Trim search query
2017-06-23 13:21:37 +07:00
6ea86b96
23f99d2bb9
Fix links from transactions to block explorer
2017-06-23 13:00:59 +07:00
6ea86b96
c4827c853d
remove pointless nulls
2017-06-22 22:13:33 +07:00
6ea86b96
d53c3d4db6
Fix this.state.hovered null error
2017-06-22 21:17:01 +07:00
Alex Grintsvayg
89b5e20b15
iron out auth issues
2017-06-21 20:09:30 -04:00
Alex Grintsvayg
aaec1f3a48
prettify all the files
2017-06-20 08:08:52 -04:00
Mayesters
0540b3d3b8
welcome modal i18n simplification
2017-06-19 15:51:28 +02:00
Mayesters
95a37e3f88
fix components + pages
2017-06-19 14:58:39 +02:00
Mayesters
df19708a5c
fix components
2017-06-19 14:42:24 +02:00
6ea86b96
5595b5b5b2
Remove doCancelResolveUri, it deletes claims from the store
2017-06-16 09:51:02 +07:00
6ea86b96
5074b368ee
Fix loading state on file card and uri indicator when claim is already available
2017-06-16 09:48:55 +07:00
Jeremy Kauffman
f95853892b
disable availability check
2017-06-15 20:02:57 -04:00
Jeremy Kauffman
2cecd20c16
Merge pull request #239 from seanyesmunt/master
...
allow user to create new directory when choosing download directory
2017-06-15 09:37:26 -04:00
6ea86b96
1063d2fc9d
Always refresh claims/file info on downloaded/published pages
2017-06-15 19:46:27 +07:00
Sean Yesmunt
0798f60c70
allow user to create new directory when choosing download directory
2017-06-14 21:03:20 -07:00
6ea86b96
03f0c3ae8f
Prettier fixes
2017-06-11 00:17:55 +07:00
6ea86b96
afcdd2271e
Catch and render files with metadata at the end. Also notify if a file is
...
unplayable
2017-06-11 00:17:52 +07:00
Jeremy Kauffman
9418e78046
restore purecomponent, remove console.log
2017-06-08 20:10:53 -04:00
Jeremy Kauffman
241a0118a2
Merge remote-tracking branch 'origin/master' into tear_down_this_wall
2017-06-08 20:03:11 -04:00
Jeremy Kauffman
69bf1bdfea
two more pure components
2017-06-08 19:41:44 -04:00
Jeremy Kauffman
f21bf287d9
Merge branch 'master' into should-component-update
2017-06-08 19:36:17 -04:00
Jeremy Kauffman
f2cabfb07a
minor correction
2017-06-08 19:16:38 -04:00
Jeremy Kauffman
5d5badd567
Merge branch 'master' of https://github.com/seanyesmunt/lbry-app into seanyesmunt-master
2017-06-08 19:07:50 -04:00
Jeremy Kauffman
09ecae7e0d
reviewable
2017-06-08 17:15:34 -04:00
Sean Yesmunt
e13d7c2149
use React.PureComponent
2017-06-07 21:42:19 -07:00
Jeremy Kauffman
18a40defba
mostly done?
2017-06-07 20:56:52 -04:00
Jeremy Kauffman
cbf35014cd
previously uncommitted copy change
2017-06-07 12:11:47 -04:00
Jeremy Kauffman
4f65957287
not enough progress
2017-06-07 12:11:47 -04:00
Jeremy Kauffman
b6881c829c
uncommitted work from last night
2017-06-07 12:08:05 -04:00
Jeremy Kauffman
a17d19038e
good chunk of progress towards auth and rewards refactor / degating
2017-06-07 12:08:04 -04:00
Sean Yesmunt
11fa00504d
switch to BEM naming pattern
2017-06-07 09:06:14 -07:00
6ea86b96
eb170b9720
Working on rewards refactor
2017-06-07 12:04:39 -04:00
Jeremy Kauffman
e0b8afe028
midway through auth rewrite
2017-06-07 11:56:01 -04:00
Jeremy Kauffman
ddd01855b0
slight progress
2017-06-07 11:50:44 -04:00
Sean Yesmunt
0a7626fe49
remove un-necessary comment
2017-06-07 00:15:55 -07:00
Sean Yesmunt
46862a302e
style loading spinner
2017-06-06 23:32:38 -07:00
Sean Yesmunt
708efba091
fix prop name
2017-06-06 22:42:01 -07:00
Sean Yesmunt
7a467f3635
move video-player and video-player-button into their own file
2017-06-06 22:36:12 -07:00
Sean Yesmunt
57a7d1db97
add internal video loading screen component
2017-06-06 21:12:45 -07:00
6ea86b96
72137f51d2
Fix resolving uris in file tile
2017-06-07 08:34:13 +07:00
6ea86b96
c023a41a28
Stop cost info getting into an infinite loop
2017-06-07 08:32:41 +07:00
Jeremy Kauffman
2172555096
change prettier options
2017-06-06 17:19:12 -04:00
Sean Yesmunt
c8b949f020
format with prettier
2017-06-05 21:21:55 -07:00
Fillerino
a2ec397ff8
Quick fix for Issue #198 , not being able to go to SEND/RECEIVE page
...
This commit fixes the missing _ in one of the i18n translation labels.
fixes #198
2017-06-05 22:35:24 +02:00
Jeremy Kauffman
c348f552cd
Merge pull request #189 from 6ea86b96/play-more-file-types
...
Render all file types that render-media can handle
2017-06-05 11:40:11 -04:00
Mayesters
a539b58829
Include y18n without creating files + fix modal
2017-06-03 13:27:37 +02:00
Mayesters
4e86023bf1
Merge remote-tracking branch 'upstream/intnick-i18n' into i18n
2017-06-03 13:10:54 +02:00
6ea86b96
1fd1b3c064
Render all file types that render-media can handle
2017-06-03 01:29:08 +07:00
Jeremy Kauffman
f84c738018
changes to global declaration, eliminate translation files
2017-06-02 12:40:26 -04:00
Jeremy Kauffman
8ab629de01
Merge branch 'i18n' of https://github.com/intnick/lbry-app into intnick-i18n
2017-06-02 12:25:56 -04:00
Mayesters
81afbf8d70
Merge branch 'master' into i18n
2017-06-02 18:11:54 +02:00
6ea86b96
912933d4e7
Sync loading between file actions and video player
2017-06-02 14:40:40 +07:00
6ea86b96
8505959c22
Use render-media to render audio and images
2017-06-02 14:11:59 +07:00
6ea86b96
fa66f4e918
Fix download progress for recontructing files
2017-06-02 14:11:59 +07:00
Mayesters
c658211e2c
merge translations fixed
2017-06-01 17:49:07 +02:00
Mayesters
0153a6dab5
Merge branch 'master' into i18n
2017-06-01 17:41:49 +02:00
Intnick
02ed8145ca
Merge branch 'i18n' of github.com:intnick/lbry-app into i18n
2017-06-01 17:02:16 +02:00
Intnick
addf29f3bc
global i18n object defined in app.js; smaller translation improvements
2017-06-01 17:02:02 +02:00
Jeremy Kauffman
9f1e5489a1
fix multiple install ids
2017-05-31 18:19:48 -04:00
Mayesters
313cea5580
fix master merge translations
2017-05-31 12:55:32 +02:00
Mayesters
31190ea5b0
Merge branch 'master' into i18n
2017-05-31 12:48:49 +02:00
Mayesters
fe7b5eb4e0
removed unnecessary y
2017-05-31 12:34:39 +02:00
Jeremy Kauffman
7a8a2c4913
connection changes and changelog
2017-05-30 19:56:48 -04:00
Jeremy Kauffman
c3eb921685
Merge branch 'master' into autoplay
2017-05-30 17:18:04 -04:00
