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 |
|
Daniel Ternyak
|
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 |
|
Will O'Beirne
|
58c0f8cfdc
|
Remove unused imports
|
2019-02-19 12:20:17 -05:00 |
|
Will O'Beirne
|
af7bc08828
|
Simplify logic.
|
2019-02-19 12:19:47 -05:00 |
|
Will O'Beirne
|
ea35f7874c
|
Fail emails and task.
|
2019-02-19 12:13:13 -05:00 |
|
Daniel Ternyak
|
eecfbd3b3d
|
Merge branch 'develop' into comment-moderation
|
2019-02-19 10:24:13 -06:00 |
|
Daniel Ternyak
|
ceefe0c403
|
Merge branch 'develop' into rfp-detail
|
2019-02-18 23:11:24 -06:00 |
|
Aaron
|
10d70ec4f6
|
fix UserCommentSchema
|
2019-02-18 17:59:22 -06:00 |
|
Daniel Ternyak
|
29ce4c08c6
|
Merge pull request #220 from grant-project/standardize-profile-placeholders
Standardize Profile Placeholders
|
2019-02-18 17:45:00 -06:00 |
|
Daniel Ternyak
|
49a845c41b
|
Merge branch 'develop' into standardize-profile-placeholders
|
2019-02-18 17:44:45 -06:00 |
|
Aaron
|
8ef9a7e5e4
|
comment reporting for moderation
|
2019-02-18 16:35:21 -06:00 |
|
Aaron
|
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 |
|
Aaron
|
e8c7dad87f
|
be & admin moderation & reporting for proposal comments
|
2019-02-18 15:31:20 -06:00 |
|
Daniel Ternyak
|
2f49b27ab4
|
Merge branch 'develop' into rfp-detail
|
2019-02-18 12:28:09 -06:00 |
|
Daniel Ternyak
|
00b4a2fbc8
|
remove empty space
|
2019-02-18 12:12:25 -06:00 |
|
Daniel Ternyak
|
6183420a9d
|
Show tags and brief on RFP detail
|
2019-02-18 12:08:20 -06:00 |
|
Daniel Ternyak
|
d03d9ac556
|
Merge pull request #223 from grant-project/admin-tsc
Fix Admin Build
|
2019-02-18 11:06:02 -06:00 |
|
Daniel Ternyak
|
f3640f27ce
|
remove unused import
|
2019-02-18 11:03:16 -06:00 |
|
Daniel Ternyak
|
48ae5a8d22
|
Merge branch 'develop' into standardize-profile-placeholders
|
2019-02-17 20:34:24 -06:00 |
|
Daniel Ternyak
|
9e835e977b
|
Merge pull request #219 from grant-project/modal-sharing-links
Modal Sharing Links
|
2019-02-17 20:33:53 -06:00 |
|
Daniel Ternyak
|
76c3ea7256
|
Merge branch 'develop' into modal-sharing-links
|
2019-02-17 20:32:51 -06:00 |
|
AMStrix
|
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 |
|
Daniel Ternyak
|
d51877d1e3
|
Update all profile tabs to use placeholders with both titles and subtitles
|
2019-02-17 16:37:11 -06:00 |
|
Daniel Ternyak
|
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 |
|
Daniel Ternyak
|
0f1e8d8e3e
|
Merge branch 'develop' into proposal-and-comment-pagination
|
2019-02-17 16:04:51 -06:00 |
|
Daniel Ternyak
|
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 |
|
Daniel Ternyak
|
5e2fdbfea4
|
Use Modal to present social share option instead of direct pop-up
|
2019-02-17 15:57:57 -06:00 |
|
Daniel Ternyak
|
75ca7667d8
|
Refactor CopyInput out into it's own component
|
2019-02-17 15:57:06 -06:00 |
|
Daniel Ternyak
|
39250211b6
|
Merge branch 'proposal-and-comment-pagination' into modal-sharing-links
|
2019-02-17 15:01:06 -06:00 |
|
Daniel Ternyak
|
0ac4c0591d
|
rename and simplify user profile validation function
|
2019-02-17 14:36:17 -06:00 |
|
Aaron
|
af39ac6942
|
admin refactor - use generic page fn on store where apropo
|
2019-02-17 14:21:53 -06:00 |
|
Aaron
|
fe908f449a
|
Pageable: handle null filters
|
2019-02-17 14:20:55 -06:00 |
|
Daniel Ternyak
|
5fb6f4c36a
|
Merge branch 'develop' of https://github.com/dternyak/zcash-grant-system into fix-edit-profile
|
2019-02-17 13:56:09 -06:00 |
|
Daniel Ternyak
|
edc5ce54d4
|
Merge branch 'develop' into proposal-and-comment-pagination
|
2019-02-17 13:49:41 -06:00 |