Commit Graph

3545 Commits

Author SHA1 Message Date
Ivan Socolsky dcb561a2b0 fixed small bug in getPendingTxProposals 2014-11-21 10:57:40 -03:00
Matias Alejo Garcia 5e9c72bdf1 Merge pull request #1852 from cmgustavo/bug/mobile-with-cordova
fix generation of Android and iOS packages
2014-11-20 22:38:16 -03:00
Matias Alejo Garcia da5afe4e07 Merge pull request #1851 from heisler3030/spelling
grammar improvement
2014-11-20 22:37:59 -03:00
Gustavo Maximiliano Cortez db009f3874 fix generation of Android and iOS packages. The purpose is testing. 2014-11-20 22:09:28 -03:00
Hamish Eisler c8d9527c68 grammar improvement
"Existing" is preferable to "existent" in this context
2014-11-20 16:40:18 -08:00
Matias Alejo Garcia 2ad7535467 Merge pull request #1849 from isocolsky/history_pagination
using paginated version of insight-api addrs/txs
2014-11-20 18:22:27 -03:00
Ivan Socolsky 18deef115a using paginated version of insight-api addrs/txs 2014-11-20 18:05:54 -03:00
Matias Alejo Garcia 9b27c30679 Merge pull request #1848 from cmgustavo/ux/paypro
Ux/paypro
2014-11-20 11:49:52 -03:00
Gustavo Maximiliano Cortez 29a4bd32e3 add paypro info to history 2014-11-20 11:43:21 -03:00
Gustavo Maximiliano Cortez cfb7383b2d Cancel/clear form when using payment protocol 2014-11-20 11:42:56 -03:00
Gustavo Maximiliano Cortez 445a4e3ca9 little fix tables 2014-11-20 11:42:05 -03:00
Gustavo Maximiliano Cortez b1b6261b2d Merge pull request #1846 from matiu/bug/paypro-broadcast
Bug/paypro broadcast
2014-11-20 10:17:37 -03:00
Matias Alejo Garcia 088a616736 add merchant data in tx proposals 2014-11-20 03:10:43 -03:00
Matias Alejo Garcia d4a0f5c008 notifications 2014-11-20 02:06:59 -03:00
Matias Alejo Garcia 0b136cef34 send form 2014-11-20 02:06:59 -03:00
Matias Alejo Garcia 3a0a1a2f23 fix paypro broadcast. add merchant info 2014-11-20 02:06:59 -03:00
Matias Alejo Garcia 33dd93ad6a Merge pull request #1840 from bechi/bugs/layout
Bugs/layout
2014-11-19 22:32:43 -03:00
Matias Alejo Garcia 19afe4d72f Merge pull request #1837 from bechi/feature/loading-screen
fix loading screen & spinner
2014-11-19 22:32:34 -03:00
Matias Alejo Garcia ce305e92b7 Merge pull request #1839 from matiaspando/feature/autoFocus
Added a directive to focus the first input fields
2014-11-19 22:32:23 -03:00
Matias Pando 527c3beab1 Added a directive to focus the first input fields 2014-11-19 17:49:45 -03:00
bechi 14feb7e4e7 fix table shadow 2014-11-19 17:16:04 -03:00
bechi 513aedc423 fix join-wallet form 2014-11-19 17:10:52 -03:00
bechi df1859bb62 add photo-container on copayers 2014-11-19 17:09:16 -03:00
Matias Alejo Garcia b554c4c7ea Merge pull request #1838 from matiaspando/addSignersToCSV
Added column signers to CSV file
2014-11-19 16:14:42 -03:00
bechi 55b31e64cd fix loading screen & spinner 2014-11-19 15:50:49 -03:00
Matias Pando a72ae412a2 Added column signers to CSV file 2014-11-19 15:47:28 -03:00
Matias Alejo Garcia b7401985cf Merge pull request #1835 from bechi/bugs/notification
fix join form notification
2014-11-19 15:33:08 -03:00
bechi 7c35a745cb fix inputs bugs 2014-11-19 11:48:36 -03:00
Matias Alejo Garcia 8491308cac Merge pull request #1836 from matiaspando/existingProfile
Existing profile
2014-11-19 11:30:13 -03:00
Matias Pando 551da51c41 Import profile now checks if profile exists 2014-11-19 11:15:09 -03:00
bechi d893003ac0 fix label margin 2014-11-19 10:49:53 -03:00
bechi 0e750836e8 fix join form notification 2014-11-19 10:32:40 -03:00
Matias Alejo Garcia 2dd2baebc3 Merge pull request #1809 from bechi/notification
WIP: Notification
2014-11-18 19:46:22 -03:00
Matias Alejo Garcia 27ff17c86e Merge pull request #1827 from matiaspando/feature/checkProfile
Add error checking when importing a wallet from a corrupt file
2014-11-18 17:02:41 -03:00
bechi 04d2d7b536 fix all form notification 2014-11-18 17:01:43 -03:00
Juan Ignacio Sosa Lopez 1e740e469a Merge pull request #1825 from marianorod/new-logo-copay
the logos
2014-11-18 15:39:46 -03:00
bechi 1b8c001aa4 fix new profile 2014-11-18 15:33:22 -03:00
bechi c594885e3f fix color 2014-11-18 15:33:22 -03:00
bechi ee2f2ffb82 notification & form-erro on setting 2014-11-18 15:33:22 -03:00
Ivan Socolsky af6c066c3f fixing import of existing profile 2014-11-18 12:12:09 -03:00
Matias Pando 05c8200749 Add error checking when importing a wallet from a corrupt file 2014-11-17 17:44:38 -03:00
Matias Alejo Garcia cfb29e8e8f Merge pull request #1826 from matiaspando/error/importProfile
Fixes importing profile with a wallet that is not ready
2014-11-17 11:54:14 -03:00
Matias Pando b9fd442ffd Fixes importing profile with a wallet that is not ready 2014-11-17 11:46:15 -03:00
Mariano Rodriguez 13b6a0044c the logos 2014-11-17 09:54:58 -03:00
Matias Alejo Garcia b49d6b9c01 Merge pull request #1824 from cmgustavo/ux/import-open-profile
Ux/import open profile
2014-11-17 08:41:23 -03:00
Gustavo Maximiliano Cortez 89b476e00f UX: Import with the same style than the other pages. 2014-11-17 00:37:58 -03:00
Gustavo Maximiliano Cortez fcdaddd358 If there is an error, reset global variable "starting" 2014-11-17 00:36:41 -03:00
Gustavo Maximiliano Cortez 4a6c258f68 remove unnecessary div 2014-11-17 00:35:24 -03:00
Matias Alejo Garcia fe5f9610fc Merge pull request #1819 from cmgustavo/ux/history-layout
Fix history for small devices (was broken)
2014-11-15 14:17:39 -03:00
Gustavo Maximiliano Cortez 187fb65ff7 Fix history for small devices (was broken) 2014-11-15 12:46:14 -03:00