Commit Graph

7893 Commits

Author SHA1 Message Date
Matias Alejo Garcia e6f0295386
fix nested views 2016-08-18 17:24:44 -03:00
Matias Alejo Garcia 7b42c2e11a
Merge branch 'ref/design' of github.com:matiu/copay into ref/design 2016-08-18 14:57:00 -03:00
Matias Alejo Garcia 2b5a3bb5a2
send send 2016-08-18 14:51:35 -03:00
Matias Alejo Garcia b3fe66aeaf Merge pull request #196 from JDonadio/design/join
Fix Join UI
2016-08-18 13:33:03 -03:00
Javier 48ad93b8ae fix UI 2016-08-18 13:20:49 -03:00
Matias Alejo Garcia 02c8cb44d6
. 2016-08-18 11:45:30 -03:00
Matias Alejo Garcia 1f5e55efae
Merge branch 'ref/design' of github.com:matiu/copay into ref/design 2016-08-18 10:13:00 -03:00
Matias Alejo Garcia 09425dc344
approve 2016-08-18 10:08:23 -03:00
Matias Alejo Garcia 0105ce4c13 Merge pull request #194 from cmgustavo/ref/design-05
Ref/design 05
2016-08-18 00:59:11 -03:00
Matias Alejo Garcia a2834532d0 Merge pull request #195 from cmgustavo/ref/design-06
Create-Join-Import
2016-08-18 00:58:52 -03:00
Gustavo Maximiliano Cortez 855b22a113
Create-Join-Import 2016-08-18 00:27:23 -03:00
Gustavo Maximiliano Cortez 1032aa202f
Fix undefined variable on device 2016-08-17 19:35:07 -03:00
Gustavo Maximiliano Cortez 89b0fca5cb
QR Scanner for bitcoin URI 2016-08-17 19:25:07 -03:00
Matias Alejo Garcia 78b51ff938
Merge branch 'ref/design' of github.com:matiu/copay into ref/design 2016-08-17 17:31:58 -03:00
Matias Alejo Garcia 7d0870aea0
send 2016-08-17 17:31:45 -03:00
Matias Alejo Garcia 4ee69ce0a1 Merge pull request #192 from gabrielbazan7/ref/preferences
delete fc from preferences
2016-08-17 15:57:59 -03:00
Gabriel Bazán 4e599c38e7 delete fc from preferences 2016-08-17 15:53:17 -03:00
Matias Alejo Garcia eb733c5d3c
Merge branch 'ref/design' of github.com:matiu/copay into ref/design 2016-08-17 15:36:24 -03:00
Matias Alejo Garcia 985c0af780
. 2016-08-17 15:36:19 -03:00
Matias Alejo Garcia 2f0daa50aa Merge pull request #191 from cmgustavo/ref/design-04
Adds scan tab. Fix grunt ios
2016-08-17 15:35:10 -03:00
Gustavo Maximiliano Cortez 70ba150e60
Adds scan tab. Fix grunt ios 2016-08-17 15:23:17 -03:00
Matias Alejo Garcia ce777ff087
. 2016-08-17 13:34:31 -03:00
Matias Alejo Garcia 752fa1e432
. 2016-08-17 13:32:41 -03:00
Matias Alejo Garcia 8297839c40
mmore fixes 2016-08-17 13:23:18 -03:00
Matias Alejo Garcia 83a1fd3816
fix receive / send 2016-08-17 13:17:23 -03:00
Matias Alejo Garcia 3cb0676815
fix copayers 2016-08-17 13:16:06 -03:00
Matias Alejo Garcia 926325ae72 Merge pull request #190 from gabrielbazan7/fix/params
adding wallet id on url
2016-08-17 13:10:19 -03:00
Gabriel Bazán 965619740b adding wallet id on url 2016-08-17 13:07:48 -03:00
Matias Alejo Garcia 28d9d76f93 Merge pull request #189 from cmgustavo/ref/design-03
Css classes that are missing
2016-08-16 19:33:02 -03:00
Gustavo Maximiliano Cortez 00425fe191
Css classes that are missing 2016-08-16 19:27:48 -03:00
Matias Alejo Garcia b5023ae9e7
send 2016-08-16 18:38:18 -03:00
Matias Alejo Garcia 8072082f4f Merge pull request #188 from cmgustavo/ref/design-02
Add/create/import/join. Main sass file
2016-08-16 17:57:23 -03:00
Gustavo Maximiliano Cortez df0f77b383
Add/create/import/join. Main sass file 2016-08-16 17:45:20 -03:00
Matias Alejo Garcia 51befe7afd Merge pull request #187 from gabrielbazan7/ref/designWalletSettings
refactor wallet settings
2016-08-16 17:38:21 -03:00
Gabriel Bazán ac7ce0af23 refactor wallet settings 2016-08-16 16:47:51 -03:00
Matias Alejo Garcia fb83bbba34
fix search 2016-08-15 18:11:36 -03:00
Matias Alejo Garcia 1b8492f0dd Merge pull request #186 from gabrielbazan7/ref/designSettings
refactor settings tab
2016-08-15 17:50:46 -03:00
Gabriel Bazán 41cc509d47 refactor settings tab 2016-08-15 17:47:57 -03:00
Matias Alejo Garcia 9e70821c4c
fix copayers 2016-08-15 16:07:30 -03:00
Matias Alejo Garcia 6dba17937f
handle error / incomplete on receive 2016-08-15 11:56:59 -03:00
Matias Alejo Garcia e00fb50674 Merge pull request #185 from cmgustavo/ref/design-01
Ref Gruntfile. Removes foundation dependencies
2016-08-15 11:42:35 -03:00
Gustavo Maximiliano Cortez ed9531fa46
Ref Gruntfile. Removes foundation dependencies 2016-08-15 11:37:15 -03:00
Matias Alejo Garcia 5357f30a0e
Merge branch 'ref/design' of github.com:matiu/copay into ref/design 2016-08-15 10:26:35 -03:00
Matias Alejo Garcia bc208e09d3
fix gitignore 2016-08-15 10:26:18 -03:00
Matias Alejo Garcia 9f039d8c34
balances working 2016-08-15 10:25:43 -03:00
Matias Alejo Garcia 3ea67582b1 Merge pull request #184 from JDonadio/ref/new-index
Send flow
2016-08-15 10:10:43 -03:00
Matias Alejo Garcia fc90520201 Merge pull request #183 from gabrielbazan7/ref/designReceive
new design refactor receive tab
2016-08-15 10:10:36 -03:00
Javier a260fcf8b7 fix calculator ui - resume send view ui 2016-08-13 01:27:06 -03:00
Javier cdd8628cfe filter contact list 2016-08-12 16:34:15 -03:00
Javier f28b14a9d9 show data 2016-08-12 16:05:58 -03:00