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.

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

Release 0.6.0 #157

Merged
merged 69 commits into from
Nov 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
004807e
Merge branch 'rc/0.5.0'
pdpinch Feb 12, 2015
0536ea0
Design changes in sga settings page, added a settings tab and style i…
Mar 16, 2015
c28ba68
Added weight validations and test cases, split long length test into …
Mar 11, 2015
c698d10
Merge pull request #69 from arbisoft/weight_validation
carsongee Mar 20, 2015
5fb66c7
Merge pull request #80 from arbisoft/design_edx_settings
carsongee Mar 20, 2015
00db211
Changed enter grade link style to make it look like button and added …
Mar 11, 2015
f6a6792
Merge pull request #68 from arbisoft/chage_enter_grade_style
carsongee Mar 27, 2015
e3b5cf1
added display name on sga lms and grade submission dialog
Mar 13, 2015
6c600a9
Merge pull request #74 from arbisoft/x_show_display_name
carsongee Mar 30, 2015
2de749a
Added log.info in all locations where sga.py is chaning state
Mar 9, 2015
f037fda
Merge pull request #67 from arbisoft/smlogging
carsongee Apr 7, 2015
ce68e3f
merge base and fixed error message display under button error and loa…
Mar 9, 2015
9c10400
Merge pull request #66 from arbisoft/fileuploadlimitissue
carsongee Apr 9, 2015
ee26d64
fix jshint indentified issue for all studio and edx_sga file
Apr 13, 2015
a38e985
fixed all posible pylint issues
Apr 10, 2015
1a0b28d
Merge pull request #86 from arbisoft/fix_pylint_issues
carsongee Apr 15, 2015
bf7914c
Merge pull request #85 from arbisoft/fix_js_lint_issues
carsongee Apr 28, 2015
0b72027
Implement support for multiply SGA elements at one vertical
aliaksandrb May 20, 2015
dd74c91
Merge pull request #96 from aliaksandrb/master
carsongee Jun 9, 2015
8a48303
made True lower-case
amir-qayyum-khan Jun 29, 2015
0f25d31
Merge pull request #104 from amir-qayyum-khan/fix_readme_issue
pwilkins Jun 30, 2015
de2f501
Allow not only english language file uploads
aliaksandrb Jul 2, 2015
3f158db
Merge pull request #105 from aliaksandrb/filename_encoding
pwilkins Jul 8, 2015
abf4c4a
Hanndle file not found error, Fixed error messages, set error code to…
amir-qayyum-khan Jun 29, 2015
98beff9
Added sorting plugin to header table, Now you can sort each column by…
amir-qayyum-khan Jun 26, 2015
68bc8f9
Merge pull request #102 from amir-qayyum-khan/add_sorting
pdpinch Aug 14, 2015
27f5457
Merge pull request #103 from amir-qayyum-khan/500response_handling
pdpinch Aug 14, 2015
6531a7c
Added basic developer notes.
jamiefolsom Aug 27, 2015
d1c2592
Added content to basic developer quickstart.
jamiefolsom Aug 27, 2015
7141ce2
Add complete details to devstack setup, cribbed from @carsongee's exc…
jamiefolsom Aug 27, 2015
79185ea
Fix formatting.
jamiefolsom Aug 27, 2015
52b7867
Fix sequence of steps.
jamiefolsom Aug 27, 2015
bcd9d47
Add a link to the edx rebase process page.
jamiefolsom Aug 28, 2015
44b4897
Added header cell to the assignments table.
jamiefolsom Aug 28, 2015
29b35b3
Revert "Added header cell to the assignments table."
jamiefolsom Aug 28, 2015
f515f93
Add actions cell to assignments table header.
jamiefolsom Aug 28, 2015
d8179db
Fixed heading underline being too short.
jamiefolsom Aug 28, 2015
b0a8071
Make commands copy/paste-able.
jamiefolsom Aug 28, 2015
d00ae58
Formatting tweak.
jamiefolsom Aug 28, 2015
13db915
Formatting tweak.
jamiefolsom Aug 28, 2015
665bfc5
Formatting tweak.
jamiefolsom Aug 28, 2015
f55db19
Formatting tweak.
jamiefolsom Aug 28, 2015
fb99700
Formatting tweak.
jamiefolsom Aug 28, 2015
989d56b
Formatting tweak.
jamiefolsom Aug 28, 2015
a468231
Formatting tweak.
jamiefolsom Aug 28, 2015
9913fd0
Formatting tweak.
jamiefolsom Aug 28, 2015
ca1fa6c
Formatting tweak.
jamiefolsom Aug 28, 2015
fbb02c3
Formatting tweak.
jamiefolsom Aug 28, 2015
37dbd4a
Formatting tweak.
jamiefolsom Aug 28, 2015
1f259f3
Formatting tweak.
jamiefolsom Aug 28, 2015
f782248
Adhere to strict .rst standards for heading underline length.
jamiefolsom Aug 28, 2015
c3bb309
Fixes per @pwilkins' suggestions.
jamiefolsom Aug 28, 2015
a172901
Fixes per @pwilkins' suggestions.
jamiefolsom Aug 28, 2015
82e0c87
Merge pull request #122 from mitodl/feature/jf/devnotes
pwilkins Aug 28, 2015
9894c1a
Installed bower with URI.js, require.js, underscore, jquery
Aug 28, 2015
8d91d58
Merge pull request #124 from mitodl/fix/jf/action-cell
noisecapella Aug 31, 2015
54e4bd1
Merge pull request #126 from mitodl/feature/gs/install_bower
pdpinch Sep 3, 2015
0bbf948
Improved performances for assignment listing
Sep 1, 2015
2a37338
Merge pull request #129 from mitodl/bug/gdm/111_performance
pdpinch Sep 4, 2015
8ef51fb
Revert "Merge pull request #129 from mitodl/bug/gdm/111_performance"
pdpinch Sep 4, 2015
2676f79
Merge pull request #130 from mitodl/feature/revert-129
pdpinch Sep 4, 2015
4d5f440
Center modal and fix scrolling
caesar2164 Oct 6, 2015
6618c8d
Merge pull request #132 from Stanford-Online/giulio/modal-styling
justinabrahms Oct 14, 2015
739e00c
Removed import in __init__
Nov 9, 2016
8040558
Fixed test failure issues on sga (#146)
amir-qayyum-khan Nov 16, 2016
2bbf280
Merge pull request #153 from clintonb/remove-init-import
pdpinch Nov 16, 2016
76909e6
adding version number so this will work with our release-script
pdpinch Nov 16, 2016
fffca3f
Merge pull request #154 from mitodl/pdpinch/add-version-to-init
pdpinch Nov 16, 2016
886a904
Release 0.6.0
pdpinch Nov 17, 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
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