Skip to content

Commit

Permalink
Merge pull request #157 from mitodl/release-candidate
Browse files Browse the repository at this point in the history
Release 0.6.0
  • Loading branch information
pdpinch authored Nov 17, 2016
2 parents 172a90f + 886a904 commit 2e43cf3
Show file tree
Hide file tree
Showing 200 changed files with 39,610 additions and 203 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "edx_sga/static/js/bower/"
}
50 changes: 50 additions & 0 deletions DEVELOPMENT.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
Developing on edx-sga
=====================

Setup (including devstack setup)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

#. Install vagrant: http://docs.vagrantup.com/v2/installation/
#. Install virtualbox: https://www.virtualbox.org/wiki/Downloads
#. Set up devstack::

mkdir devstack
cd devstack
curl -L https://raw.githubusercontent.com/edx/configuration/master/vagrant/release/devstack/Vagrantfile > Vagrantfile
vagrant plugin install vagrant-vbguest
vagrant up

#. Fork https://github.com/mitodl/edx-sga.git to your own github account.
#. Set up your development environment::

cd themes/
git clone https://github.com/your-name/edx-sga.git
vagrant ssh
sudo su edxapp
cd ./themes/
pip uninstall edx-sga (since it's part of the edx distribution, we have to remove the installed version)
cd edx-sga/
pip install -e .
paver run_all_servers

You should now see your fork of the most recent master branch of edx-sga running in the LMS.

Developing
~~~~~~~~~~

#. In your host filesystem::

cd /path/to/devstack/edx-platform/themes/edx-sga
git branch feature/your-name/name-of-feature

#. Write Code, then::

git add .
git commit -m "Description of feature added."
git push origin feature/your-name/name-of-feature

#. Rebase your branch against mitodl/master and resolve any conflicts, following this process: https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request.
#. Open a pull request from your fork/feature branch to mitodl/master

Also, see testing: https://github.com/mitodl/edx-sga#testing.

2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Try Out on devstack/fullstack

.. code:: javascript
"ALLOW_ALL_ADVANCED_COMPONENTS": True,
"ALLOW_ALL_ADVANCED_COMPONENTS": true,

to the list of ``FEATURES``

Expand Down
27 changes: 25 additions & 2 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
SGA 0.5.0 Release Notes
=======================
Release Notes
=============

Version 0.6.0
-------------

- adding version number so this will work with our release-script
- Fixed test failure issues on sga (#146)
- Removed import in __init__
- Center modal and fix scrolling
- Installed bower with URI.js, require.js, underscore, jquery
- Add actions cell to assignments table header.
- Added basic developer notes.
- Added sorting plugin to header table, Now you can sort each column by clicking header
- Handle file not found error, Fixed error messages, set error code to 404
- Allow not only english language file uploads
- Implement support for multiply SGA elements at one vertical
- fixed all posible pylint issues
- fix jshint indentified issue for all studio and edx_sga file
- merge base and fixed error message display under button error and loaded max file size from settings
- Added log.info in all locations where sga.py is chaning state of StudentModule
- added display name on sga lms and grade submission dialog
- Changed enter grade link style to make it look like button and added some spaces in css attributes
- Added weight validations and test cases, split long length test into sub funtions
- Design changes in sga settings page, added a settings tab and style in css file, added some classes

Migrations
----------
Expand Down
16 changes: 16 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "edx-sga",
"version": "0.0.0",
"homepage": "https://github.com/mitodl/edx-sga",
"authors": [
"ODL Engineering <odl-engineering@mit.edu>"
],
"license": "AGPLv3",
"dependencies": {
"jquery": "~2.1.4",
"URIjs": "~1.16.0",
"requirejs": "~2.1.20",
"underscore": "~1.8.3",
"sinon": "~1.16.1"
}
}
6 changes: 5 additions & 1 deletion edx_sga/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
from .sga import StaffGradedAssignmentXBlock
"""
Module for StaffGradedAssignmentXBlock.
"""

__version__ = "0.6.0"
1 change: 1 addition & 0 deletions edx_sga/management/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# pylint: disable=missing-docstring
1 change: 1 addition & 0 deletions edx_sga/management/commands/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# pylint: disable=missing-docstring
11 changes: 9 additions & 2 deletions edx_sga/management/commands/sga_migrate_submissions.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
"""
Django command which migrates existing SGA submissions for a course from all
old SGA implementation before v0.4.0 to newer version that uses the
'submissions' application.
"""
import json

from django.core.management.base import BaseCommand, CommandError
Expand Down Expand Up @@ -27,8 +32,10 @@ def handle(self, *args, **options):
course = get_course_by_id(course_key)

student_modules = StudentModule.objects.filter(
course_id=course.id).filter(
module_state_key__contains='edx_sga')
course_id=course.id
).filter(
module_state_key__contains='edx_sga'
)

blocks = {}
for student_module in student_modules:
Expand Down
Loading

0 comments on commit 2e43cf3

Please sign in to comment.