AMStrix
|
4c026f5645
|
Merge pull request #252 from grant-project/admin-users
Admin users
|
2019-02-23 15:21:59 -06:00 |
William O'Beirne
|
076bcc67bf
|
Merge branch 'develop' into admin-users
|
2019-02-23 16:08:06 -05:00 |
William O'Beirne
|
c35b62b6c4
|
Email subscription fixes (#243)
* Lookup user email subscription settings by email instead of hoping a user is passed.
* Functioning unsubscribe URLs
|
2019-02-23 15:33:19 -05:00 |
William O'Beirne
|
ae62b726ce
|
Rip sprout out. (#254)
|
2019-02-23 15:19:33 -05:00 |
Aaron
|
a71f65a387
|
admin: add allow_stale option to throw_on_2fa_not_allowed
|
2019-02-22 11:55:45 -06:00 |
Aaron
|
165950f803
|
admin: tsc fix
|
2019-02-22 10:27:00 -06:00 |
Aaron
|
9071f07443
|
admin MFAuth refactoring & cosmetics
|
2019-02-22 10:14:07 -06:00 |
Aaron
|
e3fd6aa398
|
clean recovery codes before saving and checking
|
2019-02-22 10:13:29 -06:00 |
Aaron
|
35661a0672
|
admin Settings & reset MFA
|
2019-02-21 23:22:16 -06:00 |
Aaron
|
3f7c90a381
|
admin: require email verification for admin login/setup
|
2019-02-21 19:39:37 -06:00 |
Aaron
|
64740b9f37
|
merge fixes: migration & admin/views
|
2019-02-21 18:56:00 -06:00 |
Aaron
|
43ee574899
|
Merge branch 'develop' into admin-users
# Conflicts:
# backend/grant/admin/views.py
|
2019-02-21 18:44:58 -06:00 |
Aaron
|
e1572de3f6
|
fix tests and add 2fa setup flow test
|
2019-02-21 18:39:41 -06:00 |
Aaron
|
c30fa69152
|
2fa admin setup + login process
|
2019-02-21 16:23:46 -06:00 |
William O'Beirne
|
b93348820c
|
Redirect to proposal if you try to edit and its not in draft state. (#242)
|
2019-02-21 17:07:55 -05:00 |
Daniel Ternyak
|
acb16771bc
|
Merge pull request #231 from grant-project/refund-flow
Failed proposal refunds
|
2019-02-21 13:50:52 -06:00 |
Will O'Beirne
|
772b3529fa
|
Fix stake confirmed test.
|
2019-02-21 13:43:20 -05:00 |
Will O'Beirne
|
6994bd9a67
|
Fix staking, fix being unable to edit contributions while staking.
|
2019-02-21 13:21:46 -05:00 |
Will O'Beirne
|
733a664cc6
|
Exclude staking contributions from funding amount or contribution lists.
|
2019-02-21 13:07:11 -05:00 |
Will O'Beirne
|
a65c061f1d
|
Add staking column to contribution. Exclude staking contributions from refunds.
|
2019-02-21 13:02:29 -05:00 |
Will O'Beirne
|
6f50a7ae28
|
Merge develop in.
|
2019-02-21 12:17:48 -05:00 |
Aaron
|
f49b58dca4
|
totp basics + remove old admin env key stuff
|
2019-02-20 16:35:13 -06:00 |
Daniel Ternyak
|
a4c7f25442
|
Merge pull request #227 from grant-project/comment-moderation
Comment moderation
|
2019-02-20 15:52:05 -06:00 |
Daniel Ternyak
|
95c1f26153
|
Merge branch 'develop' into comment-moderation
|
2019-02-20 15:51:55 -06:00 |
Daniel Ternyak
|
825e7a84bc
|
Merge pull request #237 from grant-project/milestone-validation
Better Milestone Validation
|
2019-02-20 15:49:36 -06:00 |
Daniel Ternyak
|
d128d110e6
|
Merge branch 'develop' into milestone-validation
|
2019-02-20 15:44:30 -06:00 |
Will O'Beirne
|
05372e572b
|
PR feedback fixes.
|
2019-02-20 16:44:12 -05:00 |
Will O'Beirne
|
55687a81af
|
More granular milestone errors.
|
2019-02-20 16:34:05 -05:00 |
Aaron
|
cc07fb7797
|
admin: edit user admin status
|
2019-02-20 12:04:25 -06:00 |
Aaron
|
c067d3e9ad
|
user is_admin field with working migration
|
2019-02-20 11:35:47 -06:00 |
Aaron
|
135ff9fff3
|
Merge branch 'develop' into admin-users
|
2019-02-20 11:22:42 -06:00 |
Daniel Ternyak
|
5a7235ab49
|
Merge branch 'develop' into comment-moderation
|
2019-02-19 16:46:03 -06:00 |
Daniel Ternyak
|
95d57983e3
|
Merge pull request #236 from grant-project/proposal-unlink
Proposal RFP unlinking
|
2019-02-19 16:44:40 -06:00 |
Daniel Ternyak
|
58ebdeb9fa
|
Merge branch 'develop' into proposal-unlink
|
2019-02-19 16:36:59 -06:00 |
Daniel Ternyak
|
2ac66cb12a
|
Merge pull request #239 from grant-project/remove-dead-link
Remove dead link
|
2019-02-19 16:28:22 -06:00 |
Will O'Beirne
|
e05b210b29
|
Removes non-existent help link.
|
2019-02-19 16:56:25 -05:00 |
Will O'Beirne
|
ebc4b8ceee
|
Stricter milestone validaiton. Dont try to be smart with percentages.
|
2019-02-19 16:42:40 -05:00 |
Aaron
|
abcfc64dcc
|
filter out top-level comments via sql so pagination is not borked
|
2019-02-19 15:30:32 -06:00 |
Aaron
|
6749626249
|
prune "dead" comments during serialization
|
2019-02-19 15:01:25 -06:00 |
Aaron
|
7f260d0c3b
|
Merge branch 'comment-moderation' of https://github.com/dternyak/zcash-grant-system into comment-moderation
|
2019-02-19 14:56:58 -06:00 |
Daniel Ternyak
|
b94b8d475d
|
Merge pull request #234 from grant-project/handle-hydrated-rfp
Convert hydrated bounty to BN
|
2019-02-19 14:42:23 -06:00 |
Daniel Ternyak
|
f960351e10
|
Merge branch 'develop' into handle-hydrated-rfp
|
2019-02-19 14:42:15 -06:00 |
Will O'Beirne
|
5163d87172
|
Add link for unlinking proposals from requests.
|
2019-02-19 14:48:51 -05:00 |
Daniel Ternyak
|
d3beb1f099
|
Merge pull request #235 from grant-project/fix-body-more
Fix read more missing on SSR
|
2019-02-19 13:38:34 -06:00 |
Daniel Ternyak
|
9516d78190
|
Merge branch 'develop' into fix-body-more
|
2019-02-19 13:35:13 -06:00 |
Will O'Beirne
|
03865a9ff2
|
Use ref instead of random id
|
2019-02-19 14:08:27 -05:00 |
Daniel Ternyak
|
a77d7d5220
|
Merge branch 'develop' into comment-moderation
|
2019-02-19 13:07:21 -06:00 |
Will O'Beirne
|
c2182b951c
|
Remove
|
2019-02-19 14:00:55 -05:00 |
Will O'Beirne
|
4755949496
|
Convert hydrated bounty to BN
|
2019-02-19 13:58:18 -05:00 |
Aaron
|
054b49ecbb
|
Merge branch 'develop' into comment-moderation
|
2019-02-19 12:57:06 -06:00 |