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

Fix part of #1464: implement the collection editor node list #1993

Merged
merged 38 commits into from
Jun 5, 2016
Merged

Fix part of #1464: implement the collection editor node list #1993

Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
2459246
Merge remote-tracking branch 'upstream/develop' into develop
Feb 16, 2016
6ee3a35
Merge remote-tracking branch 'upstream/develop' into develop
Feb 29, 2016
44c7704
Merge remote-tracking branch 'upstream/develop' into develop
Mar 21, 2016
1e56ba2
Merge remote-tracking branch 'upstream/develop' into develop
Mar 21, 2016
2916029
Merge remote-tracking branch 'upstream/develop' into develop
Mar 31, 2016
387301e
Implementation of collection editor node list
Apr 5, 2016
9b7e10a
Merge remote-tracking branch 'upstream/develop' into develop
Apr 5, 2016
1f99d8a
Merge remote-tracking branch 'upstream/develop' into collection-node-…
Apr 5, 2016
f44d255
Merge remote-tracking branch 'upstream/develop' into develop
Apr 5, 2016
644766c
Merge remote-tracking branch 'upstream/develop' into develop
Apr 6, 2016
b529b02
Merge remote-tracking branch 'upstream/develop' into develop
Apr 11, 2016
dee6f96
Merge remote-tracking branch 'upstream/develop' into develop
Apr 17, 2016
93acb54
Merge remote-tracking branch 'upstream/develop' into develop
Apr 27, 2016
a5a2389
Re-instated the skills editor
Apr 27, 2016
88533ba
Fixed merge conflicts
Apr 27, 2016
9123a1b
Fixed merge conflicts
Apr 27, 2016
21f168b
Linearize collection node list
May 3, 2016
95d8f1c
Merge remote-tracking branch 'upstream/develop' into develop
May 3, 2016
79c083c
Merge remote-tracking branch 'upstream/develop' into collection-node-…
May 3, 2016
1ecb7f7
Merged with remote branch
May 3, 2016
9b2d4a1
Merge remote-tracking branch 'upstream/develop' into develop
May 4, 2016
07982c1
Merge branch 'develop' of https://github.com/oppia/oppia into develop
May 18, 2016
752f2b0
Merge branch 'develop' of https://github.com/oppia/oppia into develop
May 19, 2016
163cf12
Merge branch 'develop' of https://github.com/oppia/oppia into develop
May 21, 2016
da9c4e6
Merge branch 'develop' of https://github.com/oppia/oppia into develop
May 23, 2016
24841f9
Merge branch 'develop' of https://github.com/oppia/oppia into develop
Jun 1, 2016
e2380e2
Merge branch 'develop' of https://github.com/oppia/oppia into develop
Jun 1, 2016
544ecab
Merge branch 'develop' of https://github.com/oppia/oppia into develop
Jun 2, 2016
b8dc81a
Merged with develop
Jun 2, 2016
bd52afa
Responded to Ben's comments
Jun 3, 2016
5d08d30
Start working on shifting nodes
Jun 4, 2016
dab228c
Merge branch 'develop' of https://github.com/amgowano/oppia into coll…
Jun 4, 2016
b0d1e22
Merged with Sean's changes
Jun 4, 2016
24f04ef
Implemented list update on node deletion
Jun 5, 2016
9597876
Merge pull request #1992 (#1687) from amgowano/collection-node-list
BenHenning Jun 5, 2016
80f144f
Merge branch 'collection-editor-first-iteration' into collection-node…
BenHenning Jun 5, 2016
0307fe6
Consolidated large amounts of the new linear collection editor logic
BenHenning Jun 5, 2016
2b6bd4c
Implemented functionality for shifting nodes left and right in the
BenHenning Jun 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' of https://github.com/oppia/oppia into develop
  • Loading branch information
Abraham Mgowano committed Jun 1, 2016
commit e2380e2802fe5ea899d5f364ec6df64c5e7f0d76

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.