Commit graph

9,718 commits

Author SHA1 Message Date
Jason Dreyzehner
c0980685b7 Merge pull request #5075 from msalcala11/androidStatusBar
context-specific status bar color for wallet details view on android
2016-11-17 15:21:05 -05:00
Marty Alcala
d7decbf3f5 set a context specific status bar color in wallet details view on android 2016-11-17 14:58:49 -05:00
Gustavo Maximiliano Cortez
15dabe859a Merge pull request #5074 from JDonadio/fix/import-from-file
Fix importing wallet from file
2016-11-17 16:12:47 -03:00
Javier
61c5f34b6a fix importing wallet from file 2016-11-17 16:07:06 -03:00
Jason Dreyzehner
0a4db7430d Merge pull request #5073 from bitjson/master
refactor(receive): beautify scss in tab-receive.scss
2016-11-17 13:38:47 -05:00
Gustavo Maximiliano Cortez
b49a5c663a Merge pull request #5072 from bitjson/master
fix(navBar): workaround nav-bar flashing during page transitions
2016-11-17 15:36:22 -03:00
Jason Dreyzehner
edcfc8a7af refactor(receive): beautify scss in tab-receive.scss 2016-11-17 13:28:23 -05:00
Jason Dreyzehner
044a60e8ee fix(navBar): workaround nav-bar flashing during page transitions 2016-11-17 13:18:08 -05:00
Jason Dreyzehner
3b9838ff82 Merge pull request #5071 from gabrielbazan7/fix/feedback06
remove skipped from send feedback controller
2016-11-17 12:56:25 -05:00
Gabriel Bazán
8b4b0c69c3 remove skipped from send feedback controller 2016-11-17 14:33:49 -03:00
Jason Dreyzehner
61d58af970 Merge pull request #5069 from bitjson/master
feat(share): add brief entry animation for the sharing view
2016-11-17 12:12:32 -05:00
Jason Dreyzehner
53fd1c7cc8 fix(send): use a placeholder instead of an identicon for "add a contact" 2016-11-17 12:05:06 -05:00
Jason Dreyzehner
7c780e5e34 fix(receive): minor spacing and sizing improvements 2016-11-17 11:25:47 -05:00
Jason Dreyzehner
d53f19bbbf feat(share): add brief entry animation for the sharing view 2016-11-17 11:13:41 -05:00
Jason Dreyzehner
b18dcc4734 Merge pull request #5066 from bitjson/master
fix(feedback): improve design of feedback flow, correct several logic issues
2016-11-17 10:52:25 -05:00
Jason Dreyzehner
43a5643eb3 Merge pull request #1 from cmgustavo/bug/share-app-back-button
Fix back button from share app
2016-11-17 10:40:57 -05:00
Gustavo Maximiliano Cortez
d8d565f1d3
Fix back button from share app 2016-11-17 11:06:22 -03:00
Jason Dreyzehner
63c7684259 fix(feedback): more feedback flow improvements and bug fixes 2016-11-17 00:56:12 -05:00
Jason Dreyzehner
8b7ab38f2b Merge branch 'master' of github.com:bitpay/copay 2016-11-16 18:21:25 -05:00
Jason Dreyzehner
f7e6f30d12 fix(feedback): improve design of feedback flow, correct several logic issues 2016-11-16 18:15:55 -05:00
Gustavo Maximiliano Cortez
dd3eef34a1 Merge pull request #5065 from gabrielbazan7/fix/feedback05
show top bar on share copay option
2016-11-16 18:55:36 -03:00
Gabriel Bazán
477a94b87d show top bar on share copay option 2016-11-16 18:32:12 -03:00
Jason Dreyzehner
e1a8f54413 Merge pull request #5063 from msalcala11/fixClickToPay
fix click to pay button to bottom of screen
2016-11-16 16:11:20 -05:00
Marty Alcala
e858462107 fix click to pay button to bottom of screen like the slide to pay component 2016-11-16 15:35:25 -05:00
Jason Dreyzehner
86d2b229c7 Merge pull request #5062 from gabrielbazan7/fix/feeback04
add new parameters
2016-11-16 15:16:39 -05:00
Gabriel Bazán
62ec55bf6d add new parameters 2016-11-16 17:15:41 -03:00
Jason Dreyzehner
57ab21dd55 Merge pull request #5061 from cmgustavo/feat/adds-share-app
Fix animation after send feedback (back). Adds Share BitPay option in…
2016-11-16 14:59:51 -05:00
Gustavo Maximiliano Cortez
96e6fc5345
Fix animation after send feedback (back). Adds Share BitPay option in settings 2016-11-16 16:57:36 -03:00
Jason Dreyzehner
58da84deff Merge pull request #5060 from bitjson/master
Improve design of sharing view
2016-11-16 14:03:15 -05:00
Jason Dreyzehner
b88738a7dd fix(share): pass download url properly to sharing plugin (facebook and twitter) 2016-11-16 13:56:46 -05:00
Jason Dreyzehner
2a30ab0fee fix(share): correct layout and design of share view 2016-11-16 13:54:38 -05:00
Gustavo Maximiliano Cortez
e514698ba6 Merge pull request #5059 from msalcala11/statusBarRouting
Status bar routing
2016-11-16 15:54:20 -03:00
Marty Alcala
c24d75e4eb better conditional 2016-11-16 13:31:18 -05:00
Marty Alcala
7ba83790ab simplify logic 2016-11-16 13:09:54 -05:00
Marty Alcala
c8e893f57f remove helper override 2016-11-16 13:06:39 -05:00
Marty Alcala
46a0303586 remove old status bar hiding code 2016-11-16 13:06:02 -05:00
Marty Alcala
1f91ba9e46 Merge branch 'master' of github.com:bitpay/copay into statusBarRouting 2016-11-16 12:44:23 -05:00
Marty Alcala
2ef2ce7046 add customConfig hideStatusBar to feedback routes 2016-11-16 12:44:05 -05:00
Jason Dreyzehner
7a597bf8e2 Merge pull request #5058 from cmgustavo/bug/textarea-transition
Fix shaking when transition to feedback
2016-11-16 12:42:57 -05:00
Gustavo Maximiliano Cortez
2b6d60f96f
Fix shaking when transition to feedback 2016-11-16 14:40:56 -03:00
Jason Dreyzehner
d4f153874f Merge pull request #5057 from gabrielbazan7/feat/feedback02
adding app version, device version and platform to spreadsheet post
2016-11-16 12:18:03 -05:00
Gabriel Bazán
2e7f144972 delete unused variables 2016-11-16 14:12:53 -03:00
Gabriel Bazán
13274527be adding app version, device version and platform to spreadsheet post 2016-11-16 14:11:18 -03:00
Jason Dreyzehner
ef03d01f23 Merge pull request #5056 from jameswalpole/updates
Update Help Center Link
2016-11-16 11:55:50 -05:00
James Walpole
094296ebd0 Update Help Center Link 2016-11-16 11:28:45 -05:00
Marty Alcala
fe5bdc1920 prelim status bar show/hide logic based on ui-router events 2016-11-16 11:24:25 -05:00
Gustavo Maximiliano Cortez
3965b92451 Merge pull request #5055 from gabrielbazan7/fix/feedback04
fix share buttons
2016-11-16 13:21:36 -03:00
Gabriel Bazán
826d9fe072 fix share buttons 2016-11-16 12:58:55 -03:00
Gustavo Maximiliano Cortez
af018f0a18 Merge pull request #5054 from ajp8164/bug/fix-parse-empty-bitpay-account-storage
Correct issue with parsing null returned from storage.
2016-11-16 12:20:56 -03:00
Andy Phillipson
288170fd33 Merge branch 'master' of https://github.com/bitpay/copay into bug/fix-parse-empty-bitpay-account-storage 2016-11-16 10:13:36 -05:00