400774c4d3
Remove unused endpoint / test, fix another test.
2019-03-04 17:20:47 -05:00
ae625cb3e1
Generate random ID for public facing entities.
2019-03-04 16:47:52 -05:00
4779299fb3
Reduce payload size for bootstrap. Fix invalid response to bootstrap. Bootstrap height now starts at N - min confs.
2019-03-04 14:40:37 -05:00
89da528c4a
Dont move to failed if it was canceled.
2019-03-04 14:24:13 -05:00
58ee787ab8
Remove print.
2019-03-04 13:56:57 -05:00
2cc5ade673
Sort homepage rfps by bounty. Fix admin views and some bounty logic.
2019-03-04 13:52:57 -05:00
3e65df3e5d
Merge branch 'develop' into various-fixes
2019-03-01 14:13:41 -06:00
f950e17397
Webargs Request Parsing ( #228 )
2019-03-01 14:11:03 -06:00
f5d721c0b4
Update template.txt
2019-03-01 11:23:13 -06:00
a52fda5c58
Set Admin Command ( #273 )
2019-02-28 18:26:38 -06:00
56b63eda6c
Merge branch 'various-fixes' of https://github.com/dternyak/zcash-grant-system into various-fixes
2019-02-27 21:44:09 -06:00
a3d1cbf427
replace fake address with real address
2019-02-27 21:28:12 -06:00
6aa6ea5624
Merge branch 'develop' into various-fixes
2019-02-27 17:15:12 -06:00
85ba0d7348
ensure comments are not greater than 1000 chars
2019-02-27 17:05:01 -06:00
8a193756b3
Fix unsafe behavior in marshmallow class for contributions.
2019-02-25 15:04:33 -05:00
5cb08a1f14
Only bootstrap with contributions made in the last 24h, to reduce payload size.
2019-02-25 15:03:52 -05:00
560f63847e
More considerations for anonymous contributions on the frontend.
2019-02-25 14:46:47 -05:00
31d458e067
Make contribution code handle not having a user in all cases.
2019-02-25 14:26:43 -05:00
6f7de989e7
Merge branch 'develop' into anonymous-contributions
2019-02-25 11:43:36 -05:00
77e25b1c7c
Various fixes ( #260 )
...
* remove linkedin social media option
* fix ProfileEdit social media button white-space
* fix default profile tab for non-authed user
* filter out non live proposal contributions for GET user/<id>
* admin: remove 255 char limit on reject_reason
2019-02-25 11:41:00 -05:00
06add917b5
Merge branch 'develop' into anonymous-contributions
2019-02-23 16:53:59 -05:00
8bf7013b0f
Cancel proposal ( #253 )
...
* Backend setup for proposal canceling.
* Cancelable in admin, update all states to properly reflect a canceled proposal.
* Replace REFUNDING stage with CANCELED and FAILED to distinguish between the 2
* Fix pending contributions showing up as needing refunds.
* Fix some refund cases.
* Dont show failed & canceled proposals on list view. Hide their filters.
* Show when proposal was canceled.
* Remove edit action, make cancel an explanation to contact support.
* Fix PR comments
* Fix issues from develop merge.
2019-02-23 16:38:06 -05:00
076bcc67bf
Merge branch 'develop' into admin-users
2019-02-23 16:08:06 -05:00
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
115b127962
Initial pass at anon contributions on frontend.
2019-02-23 15:31:07 -05:00
ae62b726ce
Rip sprout out. ( #254 )
2019-02-23 15:19:33 -05:00
a71f65a387
admin: add allow_stale option to throw_on_2fa_not_allowed
2019-02-22 11:55:45 -06:00
e3fd6aa398
clean recovery codes before saving and checking
2019-02-22 10:13:29 -06:00
35661a0672
admin Settings & reset MFA
2019-02-21 23:22:16 -06:00
3f7c90a381
admin: require email verification for admin login/setup
2019-02-21 19:39:37 -06:00
64740b9f37
merge fixes: migration & admin/views
2019-02-21 18:56:00 -06:00
43ee574899
Merge branch 'develop' into admin-users
...
# Conflicts:
# backend/grant/admin/views.py
2019-02-21 18:44:58 -06:00
e1572de3f6
fix tests and add 2fa setup flow test
2019-02-21 18:39:41 -06:00
c30fa69152
2fa admin setup + login process
2019-02-21 16:23:46 -06:00
6994bd9a67
Fix staking, fix being unable to edit contributions while staking.
2019-02-21 13:21:46 -05:00
733a664cc6
Exclude staking contributions from funding amount or contribution lists.
2019-02-21 13:07:11 -05:00
a65c061f1d
Add staking column to contribution. Exclude staking contributions from refunds.
2019-02-21 13:02:29 -05:00
6f50a7ae28
Merge develop in.
2019-02-21 12:17:48 -05:00
f49b58dca4
totp basics + remove old admin env key stuff
2019-02-20 16:35:13 -06:00
05372e572b
PR feedback fixes.
2019-02-20 16:44:12 -05:00
cc07fb7797
admin: edit user admin status
2019-02-20 12:04:25 -06:00
c067d3e9ad
user is_admin field with working migration
2019-02-20 11:35:47 -06:00
5a7235ab49
Merge branch 'develop' into comment-moderation
2019-02-19 16:46:03 -06:00
abcfc64dcc
filter out top-level comments via sql so pagination is not borked
2019-02-19 15:30:32 -06:00
6749626249
prune "dead" comments during serialization
2019-02-19 15:01:25 -06:00
5163d87172
Add link for unlinking proposals from requests.
2019-02-19 14:48:51 -05:00
58c0f8cfdc
Remove unused imports
2019-02-19 12:20:17 -05:00
af7bc08828
Simplify logic.
2019-02-19 12:19:47 -05:00
ea35f7874c
Fail emails and task.
2019-02-19 12:13:13 -05:00
10d70ec4f6
fix UserCommentSchema
2019-02-18 17:59:22 -06:00
8ef9a7e5e4
comment reporting for moderation
2019-02-18 16:35:21 -06:00
1a87cadc4d
Merge branch 'develop' into comment-moderation
...
# Conflicts:
# backend/grant/utils/pagination.py
# frontend/client/components/Proposal/Comments/index.tsx
2019-02-18 15:36:31 -06:00
e8c7dad87f
be & admin moderation & reporting for proposal comments
2019-02-18 15:31:20 -06:00
709a370284
Proposal stage and comment pagination ( #214 )
...
* hook up proposal stage filters
* paginate comments & "All" stages filter in frontend
* Add 'status' to 'create-proposals'
2019-02-17 21:13:24 -05:00
e8d6f659e8
basic comment pagination + admin moderation
2019-02-17 13:15:40 -06:00
7314631ea5
Admin refunds of contributions
2019-02-17 11:52:35 -05:00
1be2c5c945
Add bounty banner to campaign block. Reflect bounty in funded amount. Fix some of the cases that opens up. ( #213 )
2019-02-16 12:32:26 -05:00
cbe0ed659c
Add refund address to settings, editable on the account page.
2019-02-16 11:49:32 -05:00
be259af0cd
Merge branch 'develop' into redux-alien-auth-events
2019-02-16 08:50:37 -06:00
877bc53332
Milestone & Arbiter adjustments ( #211 )
...
* ms emails: fix link underline extra space
* fe: team member no arbiter ms action verbiage
* BE: no proposal matching changes after funding + pull proposal state changing into model funcs
* when funding reached with immediate payout skip MS to ACCEPTED (waiting for payment)
* email: fix another trailing link space
* arbiter may not be team-member
* add proposal hybrid property is_failed, true if not funded past deadline
* do not allow setting arbiter on failed proposals
* fix matching and arbiter related tests
2019-02-15 22:35:25 -05:00
00dedfbfc0
trigger redux auth state update based on custom auth header
2019-02-15 21:07:41 -06:00
7b365a28c7
Address user directly in error messages
2019-02-15 13:09:51 -06:00
d01827ec43
Merge branch 'develop' into user-banning
2019-02-15 12:12:18 -06:00
f30d53c21c
Merge branch 'develop' into user-banning
...
# Conflicts:
# backend/grant/utils/pagination.py
2019-02-14 22:25:03 -06:00
1d811bb7d3
BE: user banning + silencing + pagination
2019-02-14 22:11:47 -06:00
31345c57b6
Merge develop in
2019-02-14 19:08:18 -05:00
16ed593304
Merge branch 'develop' into zcash-milestones
...
# Conflicts:
# frontend/client/modules/create/utils.ts
2019-02-13 14:38:52 -06:00
47f827693d
mileston payout emails + some bug fixes
2019-02-13 14:30:58 -06:00
fd9a4c5393
full payout flow operational
2019-02-13 10:54:46 -06:00
380eec005e
payout endpoints + redux actions + ms UX refactors
2019-02-11 23:10:09 -06:00
dc92d3f297
Merge branch 'develop' into zcash-milestones
...
# Conflicts:
# backend/grant/proposal/models.py
# backend/grant/utils/enums.py
# frontend/client/modules/create/utils.ts
# frontend/stories/props.tsx
# frontend/types/proposal.ts
2019-02-11 16:51:31 -06:00
f2e685b1d6
Merge branch 'develop' into finalize-categories
2019-02-11 16:47:07 -06:00
72c3d6b507
join arbiter filter queries + use flush to get proposal.id on create
2019-02-11 15:59:29 -06:00
4e5c0eaea7
BE: more milestone fields
2019-02-11 15:08:51 -06:00
7d6d38552c
remove DApp category
2019-02-10 16:15:36 -06:00
f15c110f92
Merge branch 'develop' into arbiter-management
2019-02-10 15:53:29 -06:00
5ec50718dd
fix indentation bug
2019-02-09 22:03:55 -06:00
9831bc03db
BE: more robust arbiter + arbiter status + arbiter accept email code
2019-02-09 20:58:40 -06:00
2dcc1c8cad
Merge branch 'develop' into resend-verification
2019-02-08 15:18:31 -05:00
9d82140c48
Fix parser error by parsing unix with 'datetime' instead of dateutil
2019-02-08 15:12:44 -05:00
2a0e12194c
Add resend button to email settings
2019-02-08 14:57:54 -05:00
74fba18f99
Fix contribution matching. Add deets to rfp detail admin.
2019-02-08 14:11:52 -05:00
263764255b
Frontend for new RFP fields.
2019-02-08 14:02:34 -05:00
1d1f3bb007
Admin interface for new fields.
2019-02-08 11:54:20 -05:00
b03a9d3caf
Update RFP model with new fields, api endpoint for editing them.
2019-02-07 15:35:33 -05:00
60575b4024
Merge branch 'develop' into proposal-arbiter
...
# Conflicts:
# admin/src/components/Proposals/index.tsx
# admin/src/store.ts
# backend/grant/admin/views.py
# backend/grant/proposal/models.py
2019-02-07 09:57:56 -06:00
33251d678c
Merge branch 'develop' into contribution-admin
2019-02-06 18:53:51 -06:00
bd9c870e5c
Merge branch 'develop' into stake-topoff
2019-02-06 17:58:45 -06:00
048cda8216
FE: user profile arbitrations tab
2019-02-06 16:37:45 -06:00
9fd60cabaa
Button to create contribution.
2019-02-06 17:24:07 -05:00
2b78a17973
proposal_arbiter email
2019-02-06 14:56:21 -06:00
e4290c76cf
Contribution create / edit form
2019-02-06 14:01:46 -05:00
6fd885c274
order admin arbiter search by display_name
2019-02-06 12:56:08 -06:00
40e73f9ee6
arbiters: admin views + pagination filter imp.
2019-02-06 12:31:53 -06:00
2f3161ae4b
Generecize pageable. List view of contributions.
2019-02-06 12:47:47 -05:00
aeb0932120
Initial crack at admin endpoints.
2019-02-06 11:21:19 -05:00
54e9889090
arbiter & related schema adjustments
2019-02-06 08:31:38 -06:00
eb8c1ec258
add ARBITER proposal filter
2019-02-05 21:30:31 -06:00
a1283f24eb
Allow topping off of partial stake contributions. Fix float innaccuracy errors in python. Allow staking proposals to be deleted.
2019-02-05 20:45:57 -05:00
f4f8d9312d
Merge branch 'develop' into proposal-date-fixes
2019-02-05 16:29:46 -05:00
Will O'Beirne
Daniel Ternyak
AMStrix