Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(WIP) February integration branch #379

Merged
merged 85 commits into from
Feb 14, 2018
Merged

(WIP) February integration branch #379

merged 85 commits into from
Feb 14, 2018

Conversation

owocki
Copy link
Contributor

@owocki owocki commented Feb 3, 2018 •
edited
Loading

combines
#330
#364
#378

jasonrhaas and others added 30 commits January 29, 2018 19:25
@jasonrhaas
Add support for multiple fulfillments in bounty_details.js
5ada7d7
@jasonrhaas
Merge branch 'kevin/new_statuses' into multiple-fulfillments
1d299e6
@jasonrhaas
Merge branch 'kevin/new_statuses' into multiple-fulfillments
b8c37e3
@jasonrhaas
Add new BountyFulfillment model
e5a4e56
@jasonrhaas
Remove fulfiller individual fields from Bounty model
1597715 
Also add `fulfillments` JSON field.  This should match the data in the
BountyFulfillment model, but in JSON format.
@jasonrhaas
Change status logic to use num_fulfillments
2a9d1bd
@jasonrhaas
Comment out normalize_usernames for now
169f3a0
@jasonrhaas
Use num_fulfillments to check status
aa5d52f
@jasonrhaas
Revamp process_bounty_details using new fulfillment def
8212e80
@jasonrhaas
Update API. Fulfillment data now available as JSON
b6c78b5
@jasonrhaas
Add support for multiple fulfillments in front-end code
34fc5b4
@jasonrhaas
Migrations are fun
5a80067
@jasonrhaas
Add function to retrieve bounty fulfiller list
b7dd6bc
@jasonrhaas
Add front-end code to display submissions
f617592 
Still need to get the “Accept Submission” button to work.
@jasonrhaas
Add "Accept Submission" button for each submission
98d5f34 
Depending on what button you press, it changes the Fulfillment Id for
the Process Bounty form.
@jasonrhaas
Merge branch 'master' into multiple-fulfillments
0df7080
@jasonrhaas
Remove some old comments
b3d9a5d
@jasonrhaas
Fix migration files
8cec9a6
@mbeacom
Squash migration files and fix isort
3122fc7
@jasonrhaas
Add related_name for bounty foreign key
1f0f6fb
@jasonrhaas
Re-name some user facing fields for more clarity
fc966cf
@jasonrhaas
Make submissions easier to read
5f72fc0
@jasonrhaas
Had one border too many on submissions
bfd4e50
@owocki
proof of concept
d1e1ab7
@jasonrhaas
Clean up some old comments and references
3bb3407
@owocki
starts to get rid of spaghetti javascript
01a5355
@mbeacom
Merge branch 'master' into multiple-fulfillments
fa46f54
@mbeacom
Manual migrations and serializer for fulfillments
a1d29b3
@mbeacom
Modify fulfillment data handling in templates/js to use FKs
c7a240d
@owocki
some moving things around and refactoring
6c4a47c
@mbeacom mbeacom mentioned this pull request Feb 13, 2018
Closed
@owocki owocki mentioned this pull request Feb 13, 2018
Merged
3 tasks
mbeacom and others added 11 commits February 13, 2018 13:24
@mbeacom
Don't return metadata for fulfillments
1d28755
@mbeacom
Remove hardcoded fulfillment urls in jsrender and fix bounties func
fc696e5
@jasonrhaas
Don't need to add +1 to fulfillment number
f7f0837
@jasonrhaas
Change bounty submission to drop down menu
6131e69 
Default selection comes from the click on the previous page
@jasonrhaas
Show which fulfillment was Accepted after Bounty is done
7b037ac 
Need to update the `bountyfulfillment` table when a fulfillment is
accepted so that this will display correctly.  Currently the database
is not being updated properly when a fulfillment is accepted
@mbeacom
Check for accepted in fulfillment creation
b274939
@jasonrhaas
Fix accepted logic for bounty_details.js
7a33f20
@owocki
adds default naming, a few tweaks to UX (redirect callback links etc )
c54a296
@owocki
Merge branch 'february_integration_branch' of github.com:gitcoinco/we…
d193aa2 
…b into february_integration_branch
@owocki
hopefully factors down some of the bounty details page a little bit
8f3c524
@owocki
some small cleanup
fc0670f
@owocki owocki merged commit fc0670f into master Feb 14, 2018
@mbeacom mbeacom deleted the february_integration_branch branch February 14, 2018 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mbeacom mbeacom mbeacom left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@owocki @mbeacom @jasonrhaas