135ff9fff3
Merge branch 'develop' into admin-users
2019-02-20 11:22:42 -06:00
95d57983e3
Merge pull request #236 from grant-project/proposal-unlink
...
Proposal RFP unlinking
2019-02-19 16:44:40 -06:00
58ebdeb9fa
Merge branch 'develop' into proposal-unlink
2019-02-19 16:36:59 -06:00
2ac66cb12a
Merge pull request #239 from grant-project/remove-dead-link
...
Remove dead link
2019-02-19 16:28:22 -06:00
e05b210b29
Removes non-existent help link.
2019-02-19 16:56:25 -05:00
b94b8d475d
Merge pull request #234 from grant-project/handle-hydrated-rfp
...
Convert hydrated bounty to BN
2019-02-19 14:42:23 -06:00
f960351e10
Merge branch 'develop' into handle-hydrated-rfp
2019-02-19 14:42:15 -06:00
5163d87172
Add link for unlinking proposals from requests.
2019-02-19 14:48:51 -05:00
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
9516d78190
Merge branch 'develop' into fix-body-more
2019-02-19 13:35:13 -06:00
03865a9ff2
Use ref instead of random id
2019-02-19 14:08:27 -05:00
c2182b951c
Remove
2019-02-19 14:00:55 -05:00
4755949496
Convert hydrated bounty to BN
2019-02-19 13:58:18 -05: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
ceefe0c403
Merge branch 'develop' into rfp-detail
2019-02-18 23:11:24 -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
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
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
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
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
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
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
Aaron
Daniel Ternyak
Will O'Beirne