Commit graph

310 commits

Author SHA1 Message Date
Jeremy Kauffman
67c1ec531e first attempt at merge 2017-09-06 18:03:09 -04:00
Jeremy Kauffman
38ed9985b7 Merge branch 'btzr/relative-time' 2017-09-03 12:35:49 -04:00
Jeremy Kauffman
2b77c16cdd add datetime component, show date of publishes, store block history in redux 2017-09-03 12:35:01 -04:00
Jeremy Kauffman
1916589553 clarify auth token is equivalent to a password 2017-09-03 11:29:59 -04:00
btzr-io
8c033d6fef display published date
Fix #59
2017-09-01 21:59:25 -06:00
Jeremy Kauffman
4b759412c1 fix imports, remove unused code 2017-08-30 13:57:42 -04:00
Jeremy Kauffman
339945018d Fix bugs in history navigation in stack ordering and loss of scrolling
and refactor history
2017-08-30 13:40:51 -04:00
Jeremy Kauffman
7e23b62c7b CHANGELOG fix, remove settings, abstract interval setting 2017-08-30 12:43:35 -04:00
Jeremy Kauffman
c7522dc0a5 better?
merging is hard

releasable?
2017-08-29 17:42:11 -04:00
Jeremy Kauffman
8c012bc087 negative progress 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
2013da3fac decent progress 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
2b8296fcc3 rewards refactor to support types, add list 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
31fb723d87 invites basics 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
1cbc96533b refactor wallet area 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
a31e064c3e fix pagination of channels 2017-08-24 17:12:32 -04:00
Baltazar Gomez
03b04ad9b0 Merge branch 'master' into master 2017-08-24 12:28:05 -06:00
Jeremy Kauffman
3de3dd2544 Merge branch 'i18n' 2017-08-24 13:43:16 -04:00
Jeremy Kauffman
68e0eb66d2 save setting, fix warning 2017-08-24 13:33:41 -04:00
btzr-io
c257691b57 move getThemes -> settings -> componentWillMount 2017-08-24 10:29:54 -06:00
Akinwale Ariwodola
48b02567a0 fixed locale change bug 2017-08-23 00:50:59 +01:00
Jeremy Kauffman
6e61a9f73c further improvements to backup wallet content 2017-08-22 17:28:01 -04: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
btzr-io
58496c1d3c init fix for last review 2017-08-19 13:04:45 -06:00
Jeremy Kauffman
cefc882474 more i18n progress 2017-08-19 14:03:51 -04:00
Akinwale Ariwodola
970539ffae fixed merge conflicts with latest master 2017-08-19 09:01:31 +01:00
Baltazar Gomez
d2c735717c Merge branch 'master' into master 2017-08-18 15:54:18 -06:00
Jeremy Kauffman
5bec6accc2 mostly done
refactor modals and settings, clean-up CHANGELOG
2017-08-18 17:47:30 -04:00
Baltazar Gomez
ba35ac81aa Merge branch 'master' into master 2017-08-17 22:45:08 -06:00
Jeremy Kauffman
622f1aaa37 backup help 2017-08-15 17:42:48 -04:00
hackrush
aefda6398b Added wallet backup guide referance.
It also displays the current wallet path so user doesn't have to "go
places"

Could use a different/better msg though, this was more of a place
holder.
2017-08-15 17:20:38 -04:00
btzr-io
c9c50349b8 implement initial fallback for missing theme
load last theme selected
2017-08-12 12:46:10 -06:00
Baltazar Gomez
6842d844de add class for pagination break 2017-08-08 22:16:25 -06:00
Akinwale Ariwodola
d591886df5 reduxify pull request 325 2017-08-08 10:36:14 +01:00
btzr-io
0873cb76b0 fix react warning 2017-08-06 21:01:10 -06:00
Baltazar Gomez
da92061ee9 Merge branch 'master' into master 2017-08-06 18:58:50 -06:00
btzr-io
694f02dc59 implement getThemes action 2017-08-06 18:55:31 -06:00
Jeremy Kauffman
a299ca2ddd significant additional form changes and cleanup 2017-08-06 18:27:37 -04:00
hackrush
9c3d63353d Created a more generic PriceForm component
- [ ] Fixes #426

Modifying form to use single onChange event.

ONLY MEANT FOR TESTING, NOT MERGING.
2017-08-06 18:27:08 -04:00
btzr-io
b7781f0e40 fix var names 2017-08-06 12:17:16 -06:00
btzr-io
4bbab4befc set default theme 2017-08-04 20:11:07 -06:00
btzr-io
977d116f40 remove debug 2017-08-04 19:42:38 -06:00
btzr-io
5bf9ac9fe6 implement theme-system 2017-08-04 19:36:36 -06:00
Jeremy Kauffman
e39afb3a59 fix case of null user in auth 2017-08-02 19:17:28 -04:00
Jeremy Kauffman
a83aee1452 flow for failed authentication 2017-08-02 18:55:58 -04:00
Jeremy Kauffman
b6d3a52f5d featured icon for reward content 2017-07-29 18:56:08 -04:00
Alex Liebowitz
230d2a451c Indicate content eligible for Hot Right Now reward 2017-07-29 17:54:05 -04:00
Jeremy Kauffman
16c2eb9479 pagination styles 2017-07-29 15:35:16 -04:00
6ea86b96
d7ceeb15cf Add pagination
Some bad pagination CSS
2017-07-29 15:35:14 -04:00
Jeremy Kauffman
00f2413597 some css cleanup 2017-07-29 14:14:09 -04:00