Commit graph

15 commits

Author SHA1 Message Date
Jeremy Kauffman 4cc9f46934 more settings progress 2017-09-06 21:53:42 -04:00
Jeremy Kauffman 67c1ec531e first attempt at merge 2017-09-06 18:03:09 -04:00
Jeremy Kauffman b07682ef9d wallet changes
finish rebase
2017-08-29 17:42:09 -04:00
Jeremy Kauffman 7b5e752e90 properly split welcome modal logic 2017-08-29 14:40:30 -04:00
Baltazar Gomez 03b04ad9b0 Merge branch 'master' into master 2017-08-24 12:28:05 -06:00
Akinwale Ariwodola 48b02567a0 fixed locale change bug 2017-08-23 00:50:59 +01:00
btzr-io 2db24b059f rewrite action -> doSetTheme 2017-08-19 17:59:48 -06:00
btzr-io c87bcb8383 rewrite themes-system -> action / reducer 2017-08-19 15:34:45 -06:00
Jeremy Kauffman cefc882474 more i18n progress 2017-08-19 14:03:51 -04:00
Akinwale Ariwodola d591886df5 reduxify pull request 325 2017-08-08 10:36:14 +01:00
Fillerino d733a7b1b4 Trying to get redux stuff to work... 2017-07-07 15:15:45 +02:00
6ea86b96 500fdd282c
Move client settings into redux 2017-06-28 14:12:01 +07:00
Jeremy Kauffman 2172555096 change prettier options 2017-06-06 17:19:12 -04:00
Sean Yesmunt c8b949f020 format with prettier 2017-06-05 21:21:55 -07:00
Jeremy Kauffman 3fa4d0dfe7 progress towards fixing settings and costs 2017-05-17 17:52:45 -04:00