Commit Graph

4781 Commits

Author SHA1 Message Date
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
Matias Alejo Garcia 4f60626710 fixes one-page 2015-04-23 15:25:26 -03:00
Matias Alejo Garcia 62a600dd16 Merge pull request #170 from cmgustavo/one-view-02
scroll
2015-04-23 15:25:19 -03:00
Gustavo Maximiliano Cortez 5404f8f53d scroll 2015-04-23 15:23:21 -03:00
Gustavo Maximiliano Cortez e899eb9696 Fix wallethome 2015-04-23 14:37:36 -03:00
Matias Alejo Garcia 0e44e331e7 Merge pull request #169 from cmgustavo/one-view-01
Fix wallethome
2015-04-23 14:37:07 -03:00
Matias Alejo Garcia ea7484512f rm fastclick 2015-04-23 14:12:32 -03:00
Matias Alejo Garcia faea6dfb6d rm ng class 2015-04-23 13:12:30 -03:00
Matias Alejo Garcia 867c4b20bd add 3d transform 2015-04-23 12:58:08 -03:00
Matias Alejo Garcia 589200b455 one page 2015-04-23 12:27:57 -03:00
Matias Pando 19ccec1da4 Merge pull request #2596 from cmgustavo/bug/fastclick-again
Fastclick again
2015-04-23 12:10:36 -03:00
Gustavo Maximiliano Cortez 0dc7f41145 Fastclick again 2015-04-23 12:05:26 -03:00
Matias Alejo Garcia 302c6e8949 Merge pull request #2592 from cmgustavo/feat/translation-02
Bug fixes and setting language option
2015-04-23 10:21:18 -03:00
Gustavo Maximiliano Cortez 140440b224 Fix translate option 2015-04-22 18:41:30 -03:00
Gustavo Maximiliano Cortez 764caffd74 Fix preferencesLanguage 2015-04-22 15:54:44 -03:00
Gustavo Maximiliano Cortez 93e61b66df Update translation. Removed old files 2015-04-22 15:54:44 -03:00
Gustavo Maximiliano Cortez dd31f0c551 Fix test. Dummy test 2015-04-22 15:54:44 -03:00
Gustavo Maximiliano Cortez f7b1074941 Update template.pot. Enables auto-detect languages 2015-04-22 15:54:44 -03:00
Gustavo Maximiliano Cortez 80d305fe80 Hide menu only for mobile 2015-04-22 15:54:44 -03:00
Gustavo Maximiliano Cortez 401490df5e Bug fixes 2015-04-22 15:52:01 -03:00
Matias Alejo Garcia f86a75160f Merge pull request #2595 from bechi/layout-details-08
WIP: onGoing Process style
2015-04-22 15:32:45 -03:00
bechi 4475ff1757 onGoing Process style 2015-04-22 15:24:45 -03:00
Juan Ignacio Sosa Lopez c95db3405b Merge pull request #2593 from matiu/feat/walletHome-anim
walletHome animations
2015-04-22 14:05:57 -03:00