f3640f27ce
remove unused import
2019-02-18 11:03:16 -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
00dedfbfc0
trigger redux auth state update based on custom auth header
2019-02-15 21:07:41 -06:00
f2c2b70967
Fix 'Edit Profile' form being always disabled; remove email
2019-02-15 13:31:08 -06:00
30557e3b9c
Merge pull request #207 from grant-project/user-banning
...
User banning
2019-02-15 13:12:30 -06:00
7b365a28c7
Address user directly in error messages
2019-02-15 13:09:51 -06:00
6fb576c8a6
Fix revision branch.
2019-02-15 13:57:04 -05:00
813e3b5f93
Merge branch 'develop' into user-banning
2019-02-15 13:53:44 -05:00
9fc9da8c44
Remove Dapp category from Admin ( #208 )
2019-02-15 13:53:27 -05:00
d01827ec43
Merge branch 'develop' into user-banning
2019-02-15 12:12:18 -06:00
fe5632dc75
Merge pull request #179 from grant-project/rfp-fields
...
RFP Fields (matching, bounty, dates)
2019-02-15 12:05:59 -06:00
ac3bfb66c8
Tags for list view, bold bounty and matching on detail view.
2019-02-15 12:46:50 -05:00
0c4cb59262
fix migration branch
2019-02-14 22:50:16 -06:00
f30d53c21c
Merge branch 'develop' into user-banning
...
# Conflicts:
# backend/grant/utils/pagination.py
2019-02-14 22:25:03 -06:00
7090d3e97b
admin: user pagination + silencing + banning
2019-02-14 22:18:43 -06:00
1d811bb7d3
BE: user banning + silencing + pagination
2019-02-14 22:11:47 -06:00
99f0ec5ba2
Merge branch 'rfp-fields' of github.com:dternyak/zcash-grant-system into rfp-fields
2019-02-14 19:14:31 -05:00
170510e1b8
Set initialValue of matching field on RFPs.
2019-02-14 19:14:03 -05:00
030ac64391
Fix migration
2019-02-14 19:08:48 -05:00
31345c57b6
Merge develop in
2019-02-14 19:08:18 -05:00
90d5cae094
Merge pull request #194 from grant-project/zcash-milestones
...
Zcash milestones
2019-02-14 15:37:12 -06: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
Daniel Ternyak
AMStrix
Will O'Beirne