c2182b951c
Remove
2019-02-19 14:00:55 -05:00
4755949496
Convert hydrated bounty to BN
2019-02-19 13:58:18 -05:00
054b49ecbb
Merge branch 'develop' into comment-moderation
2019-02-19 12:57:06 -06:00
00462f403d
Merge pull request #226 from grant-project/rfp-detail
...
Show tags and brief on RFP detail
2019-02-19 12:30:52 -06: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
eecfbd3b3d
Merge branch 'develop' into comment-moderation
2019-02-19 10:24:13 -06:00
ceefe0c403
Merge branch 'develop' into rfp-detail
2019-02-18 23:11:24 -06:00
10d70ec4f6
fix UserCommentSchema
2019-02-18 17:59:22 -06:00
29ce4c08c6
Merge pull request #220 from grant-project/standardize-profile-placeholders
...
Standardize Profile Placeholders
2019-02-18 17:45:00 -06:00
49a845c41b
Merge branch 'develop' into standardize-profile-placeholders
2019-02-18 17:44:45 -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
2f49b27ab4
Merge branch 'develop' into rfp-detail
2019-02-18 12:28:09 -06:00
00b4a2fbc8
remove empty space
2019-02-18 12:12:25 -06:00
6183420a9d
Show tags and brief on RFP detail
2019-02-18 12:08:20 -06:00
da8fae07e6
Merge pull request #224 from grant-project/develop
...
Release 0.3.1
2019-02-18 11:06:26 -06:00
d03d9ac556
Merge pull request #223 from grant-project/admin-tsc
...
Fix Admin Build
2019-02-18 11:06:02 -06:00
f3640f27ce
remove unused import
2019-02-18 11:03:16 -06:00
38cc872699
Merge pull request #221 from grant-project/develop
...
Release 0.3.0
2019-02-18 10:14:50 -06:00
48ae5a8d22
Merge branch 'develop' into standardize-profile-placeholders
2019-02-17 20:34:24 -06:00
9e835e977b
Merge pull request #219 from grant-project/modal-sharing-links
...
Modal Sharing Links
2019-02-17 20:33:53 -06:00
76c3ea7256
Merge branch 'develop' into modal-sharing-links
2019-02-17 20:32:51 -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
d51877d1e3
Update all profile tabs to use placeholders with both titles and subtitles
2019-02-17 16:37:11 -06:00
1d3cffc7a5
Merge branch 'proposal-and-comment-pagination' of https://github.com/dternyak/zcash-grant-system into modal-sharing-links
2019-02-17 16:05:27 -06:00
0f1e8d8e3e
Merge branch 'develop' into proposal-and-comment-pagination
2019-02-17 16:04:51 -06:00
b83e1f21ec
Merge pull request #209 from grant-project/fix-edit-profile
...
Fix Edit Profile Save Button Always disabled
2019-02-17 16:04:16 -06:00
5e2fdbfea4
Use Modal to present social share option instead of direct pop-up
2019-02-17 15:57:57 -06:00
75ca7667d8
Refactor CopyInput out into it's own component
2019-02-17 15:57:06 -06:00
39250211b6
Merge branch 'proposal-and-comment-pagination' into modal-sharing-links
2019-02-17 15:01:06 -06:00
0ac4c0591d
rename and simplify user profile validation function
2019-02-17 14:36:17 -06:00
af39ac6942
admin refactor - use generic page fn on store where apropo
2019-02-17 14:21:53 -06:00
fe908f449a
Pageable: handle null filters
2019-02-17 14:20:55 -06:00
5fb6f4c36a
Merge branch 'develop' of https://github.com/dternyak/zcash-grant-system into fix-edit-profile
2019-02-17 13:56:09 -06:00
edc5ce54d4
Merge branch 'develop' into proposal-and-comment-pagination
2019-02-17 13:49:41 -06:00
16e632018a
Add 'status' to 'create-proposals'
2019-02-17 13:49:11 -06: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
da889a4f58
paginate comments & "All" stages filter in frontend
2019-02-16 19:33:57 -06: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
4ce3ea4dbe
hook up proposal stage filters
2019-02-16 10:31:10 -06:00
84dd969136
Merge pull request #212 from grant-project/redux-alien-auth-events
...
Handle External Auth Events & Fix Double Loading
2019-02-16 09:05:54 -06:00
be259af0cd
Merge branch 'develop' into redux-alien-auth-events
2019-02-16 08:50:37 -06:00
5554f18273
remove commented code
2019-02-15 21:43:32 -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
f489b093f6
scripts were getting rendered to html twice, causing double init
2019-02-15 21:28:06 -06:00
Will O'Beirne
Aaron
Daniel Ternyak