This repository has been archived by the owner on Feb 8, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 308
Edit TOS to decouple payins and payouts #4117
Merged
Merged
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
a3d7fa7
Edit TOS to decouple payins and payouts
mattbk c058360
Change "payroll" to TWYW, highlight "open work" phrases.
mattbk b72e007
Change most instances of "open work" to "work"
mattbk 39f2449
"Open Work" to "work" in all cases except reference to Gratipay.
mattbk 0bd6791
Remove TWYW specifics, leave "payouts"
mattbk e59a214
Fix a small grammar mistake
chadwhitacre c7d589c
Talk about Projects instead of Teams
chadwhitacre 95a88a5
Tweak a few small things
chadwhitacre 3710642
Clarify relationship of Members and Owners
chadwhitacre 9d13c56
Address some suggested changes
mattbk c3170b5
Make a first pass at restructuring in terms of obligations
mattbk 6f0b90f
Reduce redundancy.
mattbk 4990736
Reflow markdown to match existing
chadwhitacre 08d43be
Remove quotes where not needed
chadwhitacre bcca3af
Project Members -> Collaborators
chadwhitacre 7d7d3d8
Simplify references to Work
chadwhitacre 32ac2b8
Address comments from @tieguy
mattbk dbfbc17
Address more comments from @tieguy.
mattbk 06fb9c9
Switch the last instance of "Rules" to "Terms"
chadwhitacre 8d68dcd
Reflow lines -- no content change
chadwhitacre 82c5a08
Thoroughly replace Project with Project Owner
chadwhitacre 8dbd24b
Make 3 parallel items to intro Participant types
chadwhitacre 826d4e1
Prohibit aggresive trolling and activism
chadwhitacre 3f12d24
Regroup "reject" clause with other "reject" clause
chadwhitacre 407633f
Resolve Project -> {Collaborator,Giver} asymmetry
chadwhitacre 67c8b0c
Make another pass re: Project -> Project Owner
chadwhitacre 6dc7494
Small changes.
mattbk e09c128
Small changes.
mattbk 7cc452c
Define Project
mattbk 71e42bb
Explain what work is.
mattbk 615403d
Fix AUP indents
mattbk dce8938
State laws to local laws.
mattbk 7f8cdd8
Reflow using Vim's markdown rules
chadwhitacre 230b701
Reduce redundancy ("payment to pay for")
chadwhitacre 123efb1
Relax terms around escrow
chadwhitacre dcea849
Make new paragraph more paralleler to 4.ii
chadwhitacre 2eaf205
Be consistent re: Gratipay as Owner and Project
chadwhitacre 8d69f20
Shift initial definition of Project earlier
chadwhitacre 2594b15
Split out a paragraph parallel to {3,4}.ii
chadwhitacre 9361562
Trim Work/Project definition up a tad
chadwhitacre e549303
Rephrase 3.ii, 4.ii, and 5.i
chadwhitacre File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Section 3 should probably have a parallel to Section 4.ii. (Something like "Project Owners may only make payments to a Collaborator for their contributions...")
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in ac4207e.