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

Optimizations #241

Merged
merged 28 commits into from
May 2, 2017
Merged

Optimizations #241

merged 28 commits into from
May 2, 2017

Commits on Apr 14, 2017

  1. Separated out serializer fields that aren't needed immediately

    @jayoshih
    jayoshih committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    9697eaf View commit details
    Browse the repository at this point in the history

  2. Fixed saving changes

    @jayoshih
    jayoshih committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    18829c5 View commit details
    Browse the repository at this point in the history

  3. Reverted to old saving method

    @jayoshih
    jayoshih committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    0824b6d View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2017

  1. Separated serializers and added caching to associated presets and ori… 

    …ginal channel
    @jayoshih
    jayoshih committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    d9ff190 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2017

  1. Merge branch 'master' of https://github.com/fle-internal/content-cura… 

    …tion into serializers

# Conflicts:
#	contentcuration/contentcuration/models.py
#	contentcuration/contentcuration/serializers.py
#	contentcuration/contentcuration/static/js/edit_channel/import/hbtemplates/import_list_item.handlebars
#	contentcuration/contentcuration/urls.py
#	contentcuration/contentcuration/views.py
    @jayoshih
    jayoshih committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    528f094 View commit details
    Browse the repository at this point in the history

  2. Use simplified node serializer as soon as possible

    @jayoshih
    jayoshih committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    6ec5e61 View commit details
    Browse the repository at this point in the history

  3. Fixed export styling

    @jayoshih
    jayoshih committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    018378b View commit details
    Browse the repository at this point in the history

  4. More optimizations

    @jayoshih
    jayoshih committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    3841486 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2017

  1. Fixed clipboard to edit nested content items correctly

    @jayoshih
    jayoshih committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    80dfa59 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/jayoshih/content-curation … 

    …into serializers

# Conflicts:
#	contentcuration/contentcuration/views.py
    @jayoshih
    jayoshih committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    4f7db0e View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2017

  1. Fixed get_all_fetch to add nodes to collection

    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    a6f1232 View commit details
    Browse the repository at this point in the history

  2. Merged master into serializers

    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    37fe966 View commit details
    Browse the repository at this point in the history

  3. Fixed some issues with drag/drop

    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    5a068f7 View commit details
    Browse the repository at this point in the history

  4. Separated serializer for retrieving files/assessmentitems/original ch… 

    …annels
    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    cdf430b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of https://github.com/fle-internal/content-cur… 

    …ation into serializers
    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    a97b12d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' of https://github.com/fle-internal/content-cur… 

    …ation into serializers

# Conflicts:
#	contentcuration/contentcuration/models.py
    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    a2a9d53 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'separate-views' of https://github.com/jayoshih/content-… 

    …curation into serializers

# Conflicts:
#	contentcuration/contentcuration/urls.py
#	contentcuration/contentcuration/view/file_views.py
#	contentcuration/contentcuration/view/node_views.py
    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    2e874b5 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'separate-views' of https://github.com/jayoshih/content-… 

    …curation into serializers
    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    d32b1eb View commit details
    Browse the repository at this point in the history

  9. Merge branch 'separate-views' of https://github.com/jayoshih/content-… 

    …curation into serializers
    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    12f9213 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'content-fixes' of https://github.com/jayoshih/content-c… 

    …uration into serializers
    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    b1c469e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'content-fixes' of https://github.com/jayoshih/content-c… 

    …uration into serializers
    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    50ef047 View commit details
    Browse the repository at this point in the history

  12. Added migration for index

    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    baf0501 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'content-fixes' of https://github.com/jayoshih/content-c… 

    …uration into serializers
    @jayoshih
    jayoshih committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    e82ca91 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2017

  1. Merge branch 'separate-views' of https://github.com/jayoshih/content-… 

    …curation into serializers
    @jayoshih
    jayoshih committed May 1, 2017
    Configuration menu
    Copy the full SHA
    c63e237 View commit details
    Browse the repository at this point in the history

  2. Removed original_node caching for now

    @jayoshih
    jayoshih committed May 1, 2017
    Configuration menu
    Copy the full SHA
    8777058 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'separate-views' of https://github.com/jayoshih/content-… 

    …curation into serializers

# Conflicts:
#	contentcuration/contentcuration/static/js/edit_channel/move/views.js
    @jayoshih
    jayoshih committed May 1, 2017
    Configuration menu
    Copy the full SHA
    1561a56 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/fle-internal/content-cur… 

    …ation into serializers
    @jayoshih
    jayoshih committed May 1, 2017
    Configuration menu
    Copy the full SHA
    3beca31 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2017

  1. Removed legacy code, improved get_original_node query

    @jayoshih
    jayoshih committed May 2, 2017
    Configuration menu
    Copy the full SHA
    97e2015 View commit details
    Browse the repository at this point in the history