Commit graph

4,803 commits

Author SHA1 Message Date
Matias Alejo Garcia
8ddcd519d3 Merge pull request #2612 from cmgustavo/bug/wp8-sidebar
Removes background when opening sidebar to optimize the slider animation
2015-04-24 04:03:37 -03:00
Gustavo Maximiliano Cortez
c0d61c82f4 Removes background when opening sidebar to opmitize the slider 2015-04-24 04:04:49 -03:00
Matias Alejo Garcia
993c263bff Merge pull request #2611 from cmgustavo/bug/backHome-wallet-incomplete
Fix goHome from "add" if focused wallet is incomplete
2015-04-24 03:57:31 -03:00
Gustavo Maximiliano Cortez
ad89c6e9e5
Fix goHome from "add" if focused wallet is incomplete 2015-04-24 03:50:05 -03:00
Gustavo Maximiliano Cortez
508e784a6f Merge pull request #2610 from matiu/feat/join
fix error handler for join
2015-04-24 03:48:47 -03:00
Matias Alejo Garcia
06343f6fca rm error box from receive 2015-04-24 03:43:57 -03:00
Matias Alejo Garcia
460ddfa3bc fix error handler for join 2015-04-24 03:37:18 -03:00
Gustavo Maximiliano Cortez
25e4930730 Merge pull request #2609 from matiu/bug/notif3
Bug/notif3
2015-04-24 03:33:40 -03:00
Matias Alejo Garcia
dae6f96709 fix error at copayers 2015-04-24 03:27:51 -03:00
Matias Alejo Garcia
dc0e0bb91f Merge pull request #172 from cmgustavo/matias/bug/notif3-layout-pending
Clean pendingForUs when change wallet. Fix root.go
2015-04-24 03:19:36 -03:00
Gustavo Maximiliano Cortez
17f7483ec5 goHome after close preferences or add wallet 2015-04-24 03:22:06 -03:00
Matias Alejo Garcia
d7be9caf29 better import notif 2015-04-24 03:14:18 -03:00
Matias Alejo Garcia
7098a8627f better create profile notif 2015-04-24 03:12:38 -03:00
Matias Alejo Garcia
a927c34dd9 rm old file 2015-04-24 03:10:45 -03:00
Matias Alejo Garcia
7463e1e718 better join notification 2015-04-24 03:10:01 -03:00
Matias Alejo Garcia
f6a0afa6f6 better create wallet notif 2015-04-24 03:08:04 -03:00
Matias Alejo Garcia
ceca507fa5 better loading 2015-04-24 03:01:26 -03:00
Gustavo Maximiliano Cortez
68678613b7 Clean pendingForUs when change wallet. Fix root.go 2015-04-24 02:46:29 -03:00
Matias Alejo Garcia
67d140e981 fix changing wallet / form reset 2015-04-24 02:42:17 -03:00
Gustavo Maximiliano Cortez
fead9403a6 . 2015-04-24 02:21:03 -03:00
Matias Alejo Garcia
7f92b4125b Merge pull request #171 from cmgustavo/matias/bug/notif3-scroll
Matias/bug/notif3 scroll
2015-04-24 02:18:47 -03:00
Gustavo Maximiliano Cortez
183202aeb3 Fix scroll for all pages 2015-04-24 02:17:54 -03:00
Matias Alejo Garcia
6ce46fd0ca fix notif for offline 2015-04-24 00:34:52 -03:00
Matias Alejo Garcia
1c2432316a Revert "Revert "WIP: Bug/notif2""
This reverts commit cd867d0171.

Conflicts:
	src/css/main.css
2015-04-23 23:51:21 -03:00
Matias Alejo Garcia
370dfa942a add $apply 2015-04-23 23:50:22 -03:00
Matias Alejo Garcia
5554edf376 Merge pull request #2606 from cmgustavo/bug/scroll-noti
Fixes scroll and notification
2015-04-23 23:02:03 -03:00
Matias Alejo Garcia
839fdc61a3 Merge pull request #2608 from bitpay/revert-2605-bug/notif2
Revert "WIP: Bug/notif2"
2015-04-23 23:01:55 -03:00
Matias Alejo Garcia
cd867d0171 Revert "WIP: Bug/notif2" 2015-04-23 23:01:46 -03:00
Matias Alejo Garcia
9a271af966 Merge pull request #2607 from Kirvx/patch-3
Update fr.po
2015-04-23 23:01:28 -03:00
Matias Alejo Garcia
e2b5e74664 Merge pull request #2605 from matiu/bug/notif2
WIP: Bug/notif2
2015-04-23 23:00:18 -03:00
Kirvx
11f77fdaeb Update fr.po 2015-04-24 01:27:11 +02:00
Gustavo Maximiliano Cortez
9bb67790bd
Undo walletHome 2015-04-23 19:16:04 -03:00
Gustavo Maximiliano Cortez
7f2ce5d56c
Fixes scroll and notification 2015-04-23 19:11:41 -03:00
Matias Alejo Garcia
816901378e fix error notifications 2015-04-23 19:05:44 -03:00
Matias Alejo Garcia
30eb9bf0c5 error notifications 2015-04-23 18:28:35 -03:00
Matias Alejo Garcia
2782baadb6 Merge pull request #2604 from cmgustavo/bug/pref-01
Fix preferences animation
2015-04-23 18:26:40 -03:00
Gustavo Maximiliano Cortez
eaa3247479 Fix preferences animation 2015-04-23 18:29:25 -03:00
Gustavo Maximiliano Cortez
a096c9ad85 Merge pull request #2603 from matiu/bug/fastclick
Revert "rm fastclick"
2015-04-23 18:10:05 -03:00
Matias Alejo Garcia
1f403468e6 attack fastclick 2015-04-23 18:05:31 -03:00
Matias Alejo Garcia
3c00a4a06c Revert "rm fastclick"
This reverts commit ea7484512f.

Conflicts:
	src/js/controllers/index.js
2015-04-23 17:45:32 -03:00
Gustavo Maximiliano Cortez
67b68d3302 Merge pull request #2601 from bechi/layout-details-10
status notifications
2015-04-23 17:08:35 -03:00
bechi
1a5dc6a468 status notifications 2015-04-23 16:54:19 -03:00
Gustavo Maximiliano Cortez
3bf7202831 Merge pull request #2597 from matiu/feat/one-view
one page
2015-04-23 16:35:53 -03:00
Matias Alejo Garcia
eaa57083e9 Merge pull request #2600 from bitpay/revert-2599-layout-details-09
Revert "status notifications"
2015-04-23 16:34:13 -03:00
Matias Alejo Garcia
6a4c083f7a Revert "status notifications" 2015-04-23 16:33:36 -03:00
Matias Alejo Garcia
cd901f5b3e only show matching network wallet in payment intents 2015-04-23 16:17:18 -03:00
Matias Alejo Garcia
736a3c1f99 Merge pull request #2599 from bechi/layout-details-09
status notifications
2015-04-23 15:55:03 -03:00
bechi
823324c2f4 status notifications 2015-04-23 15:46:43 -03:00
Matias Alejo Garcia
c769f69c4e fix send 2015-04-23 15:32:11 -03:00
Matias Alejo Garcia
1515b9446f fix send 2015-04-23 15:25:27 -03:00