Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

V20190416_0 #1428

Merged
merged 66 commits into from
Apr 16, 2019
Merged

V20190416_0 #1428

merged 66 commits into from
Apr 16, 2019

Conversation

ashkanx
Copy link
Contributor

@ashkanx ashkanx commented Apr 16, 2019

No description provided.

Aaron Imming added 30 commits March 21, 2019 10:24
Add integrations button to toolbar
251c10d
Add icon and create rules for integrations icon
ff1d369
Export loadWorkspace & loadBlocks functions and create common cleanBe…
4a40607 
…foreExport function
Create logic for cleanBeforeExport function
b39b9e5
Rename Save to SaveDialog, add LoadDialog + IntegrationsDialog
66b5514
Update import paths
2597c22
Create GoogleDriveIntegration component
2a97b7c
Create styling rules for load-dialog, save-dialog, integrations-dialog
cdcadb4
Logout Google account on logout, add binds for toolbox buttons
6524861
Rename class method
43c4a7b
Increase/decrease spacing for consistency
9aff001
Re-order imports
7c423f0
Catch rejected promise, do nothing
2facd4d
Update observer event name
e404cb3
Create styling rules for barspinner in button
a2e3f40
Show barspinner when making requests to Google Drive
6694d8c
Refactor closing dialogs when opening other dialogs
95a6201
Linting cleanup + Fixes
cb62b80
Remove unused closeOtherDialogs prop
acead10
Create common trackAndEmitError function, let rejected promises bubbl…
f43c549 
…e up
Initially hide Google Drive features
4130c91
Create Google Drive integration logic
1f00132
Change trackJs.console.error to trackJs.track for proper logging
ed3147a
Change trackJs.console.error to trackJs.track for proper logging
1112771
Assume user cancelled action when nothing was picked in FilePicker
d221771
Fix diversion
a074881
Reject if authorisation failed (restores button)
d51ef85
Make sure button is restored on cancel action
577b1c3
Sign out user from Google Drive if access to drive was revoked
640cf5a
Show an error when user doesn't grant permission
c40d324
Aaron and others added 28 commits April 4, 2019 13:43
Merge pull request #1390 from Khalidxx/underage
200a41d 
khalid/added 18+ underage sign to footer
index page responsive for all languages
504d924
Merge branch 'dev' of github.com:binary-com/binary-bot into language-…
3de52bd 
…responsive
deleted spaces
9e016fb
@ashkanx
Merge pull request #1400 from binary-com/dev
61c06d0 
dev to beta
@ashkanx
Merge pull request #1398 from Khalidxx/language-responsive
4d56108 
Language responsive
removed google+ from footer
674d425
Emit bot.running event when entering position
a9f7e80
Ensure correct status indicator is showing
dd30bfe
Ensure correct (stop) status indicator is showing
742a5d6
Merge pull request #1341 from aaron-binary/bot-running-stopping-indic…
29203f3 
…ator-bug

Status Indicator Bug
@ashkanx
Merge branch 'dev' into minus-google+
d03f637
@ashkanx
Merge pull request #1402 from Khalidxx/minus-google+
5c0b3e0 
khalid/minus google+
Update strings
944de0f
Minor fixes + eslint
01d1477
Cleanup
fb0d333
Update strings
6f6a8ca
Catch uncaught error
a9bc13a
Merge branch 'dev' into google-drive-integration
3049868
Delete bb.js
2107472
@ashkanx
Merge pull request #1339 from aaron-binary/google-drive-integration
14f007d 
Google Drive Integration
@ashkanx
Merge pull request #1413 from binary-com/dev
852de7f 
dev to beta
@cakasuma
update babel and jest and remove ws
05c2b34
@cakasuma
resolve issue with core js
4f75b9b
@cakasuma
fix proptypes
762ef4a
@ashkanx
Merge pull request #1419 from cakasuma/amam/update_jest
376c802 
Amam/update jest
@ashkanx
Merge pull request #1426 from binary-com/dev
98657a3 
dev to beta
@ashkanx
Merge branch 'master' into beta
fb32409
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.9%) to 72.609% when pulling fb32409 on beta into fffd2e8 on master.

@ashkanx ashkanx merged commit 30b9bb6 into master Apr 16, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ashkanx @coveralls @cakasuma