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

Lynn experiment #11

Open
wants to merge 107 commits into
base: master
Choose a base branch
from
Open

Lynn experiment #11

wants to merge 107 commits into from

Conversation

fosterlynn
Copy link
Member

This was created by:

  • Getting up to date locally in learndeep/master
  • Merging learndeep/api-extensions into master (this already had the upstream api-extensions in it)
  • Tested in django app, worked fine
  • Tested in graphiql, not working
  • Created lynn-experiment branch to do PR, from local learndeep/master

fosterlynn and others added 30 commits August 22, 2017 17:17
@fosterlynn
manual merge of fulfillment name changes to be able to do more mutations
cdb6189
@fosterlynn
fix stupid import causing ci error
562736a
@bum2
fix error when zero related projects
e9632ac
@bum2
Merge branch 'master' of https://github.com/FreedomCoop/valuenetwork
f709463
@bum2
projects menu if single relation without project or services
580ec5f
@fosterlynn
roughed out Plan using Order in models
ee6e9e7
@fosterlynn
remove foreign key process to order (existing methods work)
4abc4f5
@fosterlynn
Plan basic queries working.
fe1b805
@fosterlynn
made plan scope handle multiple agents
73f76b8
@fosterlynn
Merge branch 'master' of https://github.com/FreedomCoop/valuenetwork.git
7db8e78 
 into api-extensions
@fosterlynn
remove unwanted process methods
fac5d4c
@fosterlynn
added action filter to process methods
705a1f2
@fosterlynn
tests running for last changes
d26adf4
@fosterlynn
changed plan.planned to plannedOn for consistency
1155907
@fosterlynn
fixed agentPlans bug, added to tests and samples
e149cf3
@fosterlynn
added ProcessClassification, other minor fixes
e3ad9d0
@fosterlynn
test for ProcessClassification
ec7e3e2
@fosterlynn
Started work on plan resources (commented out).
55b5d4d
@fosterlynn
input and output committed / actual resources just api
6f67e51
@bhaugen
add order.all_incoming_commitments and
804b6ab 
order.all_outgoing_commitments
eliminating resources passed between processes
@fosterlynn
Merge branch 'plan-io' of https://github.com/FreedomCoop/valuenetwork…
3c7273b 
….git into api-plan-res
@bhaugen
add order.all_incoming_events and
bab5893 
order.all_outgoing_events
eliminating resources passed between processes
@fosterlynn
Merge branch 'plan-io' of https://github.com/FreedomCoop/valuenetwork…
68e4e7b 
….git into api-plan-res
@fosterlynn
commitment/event inputs/outputs for a plan
93f0cc3
@fosterlynn
Merge branch 'api-extensions' into api-mutations-2
640e7f9
@bhaugen
fix modal form bugs in manufacturing recipes
38d2b3a
@bhaugen
fix bug in workflow recipes
1cc8ba7
@bhaugen
fix bug where work/process-logging crashes
3b805b8 
if no work resource types found
@fosterlynn
Added Plan create, update, delete (without connected logic)
b5a1eda
@fosterlynn
mutations: fix commitment test samples, minimal check on delete plan
048d614
bum2 and others added 29 commits October 12, 2017 00:22
@bum2
fix bleach to 2.0.0 to avoid the error after using 2.1.1
69ebc15
@bum2
Merge branch 'master' of https://github.com/FreedomCoop/valuenetwork
9673755
@bum2
fix error when no POST in the request to transfer faircoins
43cf091
@bum2
save notes when sending faircoins
56fd75e
@fosterlynn
Merge branch 'master' into api-extensions
cd08a5f
@bhaugen
first draft of fake-kanban
b1e3af9
@bhaugen
Merge pull request FreedomCoop#382 from FreedomCoop/fake-kanban
972d173 
first draft of fake-kanban
@bhaugen
change links in fake-kanban to go to work app
483569b
@bhaugen
add note if process is in other project
46ba9f7
@bhaugen
Merge pull request FreedomCoop#383 from FreedomCoop/fake-kanban-2
b561856 
Fake kanban 2
@bum2
Merge branch 'master' of https://github.com/FreedomCoop/valuenetwork
a35434a
@fosterlynn
Merge branch 'master' of https://github.com/FreedomCoop/valuenetwork.git
b77f570 
 into api-extensions
@fosterlynn
query for agent faircoin address
7b59fe9
@fosterlynn
added isDeletable methods
4f2e8e8
@fosterlynn
peg file versions for graphene, now it compiles (but api does not run)
ba88be5
@fosterlynn
peg graphql-core version
470b137
@fosterlynn
in process: authorization in query (for feedback)
06fae9b
@fosterlynn
temp hold
4e15f7c
@bhaugen
add token user to context in
48bd762 
resolve_user_is_authorized_to_update
@fosterlynn
Merge branch 'api-contr' of https://github.com/FreedomCoop/valuenetwo…
b6589ae 
…rk.git into api-contr
@fosterlynn
added query authorization for commitment, event, process
b52fef6
@fosterlynn
Added references to resource.current_location
1272be9
@fosterlynn
space tweak
e8f33ca
@fosterlynn
added create date to resource, added filter to ownedEconomicResources…
05d44af 
… for resource type
@fosterlynn
add sort to agent plans
1ecd94c
@fosterlynn
Made isFinished option for agentPlans work.
32e4c9c
@ConnorHibbs
Added gitignore for JetBrains IDES
6460b08
@ConnorHibbs
Merge remote-tracking branch 'upstream/api-extensions' into api-exten…
1b669fe 
…sions

Updated API to match FreedomCoop
@fosterlynn
Merge branch 'api-extensions' of https://github.com/LearnDeepMilwauke…
bdeed9d 
…e/valuenetwork.git

# Conflicts:
#	requirements.txt
#	valuenetwork/api/schemas/Organization.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ConnorHibbs ConnorHibbs ConnorHibbs approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@fosterlynn @ConnorHibbs @bum2 @bhaugen