Commit Graph

429 Commits

Author SHA1 Message Date
Sarina Canelake
d408f174e3 Wording for batch beta email add with autoenroll (LMS-2551) 2014-04-18 10:13:19 -04:00
Sarina Canelake
1622216b58 Merge pull request #3084 from edx/sarina/improve-bulk-beta-add
Improve the batch beta tester add feature
2014-04-16 14:07:51 -04:00
Sarina Canelake
bddae213f6 Accept usernames in Batch Enrollment widget
Respond to pull request comments
2014-04-16 10:46:54 -04:00
Will Daly
0b40354c12 Reset submission API scores in beta and legacy instructor dash 2014-04-16 09:25:53 -04:00
Sarina Canelake
ede21224a8 Add "Auto Enroll" option for bulk beta add 2014-04-16 09:20:23 -04:00
Sarina Canelake
4f38b69eba Allow batch beta enrollment by username 2014-04-16 09:20:23 -04:00
David Adams
28bf623490 Merge pull request #3240 from edx/dcadams/enhanced_metric_reporting
This makes the metrics tab "bars" clickable.
2014-04-14 09:42:33 -07:00
Sarina Canelake
338a242e22 Fix course urls in enrollment emails (LMS-2217) 2014-04-11 18:43:43 -04:00
David Adams
0f37ee6924 This makes the metrics tab "bars" clickable.
Clicking on any of the bars displays a list of students for that
  particular action (either opened the subsection or attempted the
  problem).
  Students are listed for the sub-sections.
  Students, grade and percent are listed for the problems.
  The on-screen list displays only the first 250 students with
  an overflow message if there are more students than that.
  The csv download lists all students.
2014-04-11 13:56:49 -07:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Adam Palay
aefa456ed5 add failing tests 2014-04-02 16:07:46 -04:00
Adam Palay
7b2cbfc5c5 make beta dash compute module_state_key like legacy dash (LMS-2491) 2014-04-02 15:46:32 -04:00
Waheed Ahmed
375c206a2b Fixed lagacy dash numeric placeholders with named. 2014-03-31 12:06:31 +05:00
Carson Gee
9e58ef692d fix raw grade dump in standard instructor dashboard
Added test and cleaned up code formatting
Review based changes
Converting class method and attributes to private
2014-03-28 11:10:14 -04:00
Usman Khalid
76e592634a Some more str->unicode fixes in instructor and courseware apps.
LMS-2429
2014-03-26 18:57:02 +05:00
Sarina Canelake
2244ba5ef2 Merge pull request #3028 from edx/sarina/LMS-2262
More helpful UX in beta membership widget
2014-03-24 13:24:01 -04:00
Sarina Canelake
c2ede18de5 More helpful UX in beta membership widget
LMS-2262
2014-03-24 12:16:41 -04:00
Sarina Canelake
454da6fefc i18n Inst Dash enrolled students profile table
LMS-2357
2014-03-21 17:49:13 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00
Sarina Canelake
bbf4471d92 Merge pull request #2992 from edx/sarina/fix-beta-batch-enrollment
Simple email checking for batch enrollment on inst dash
2014-03-21 07:45:09 -04:00
Sarina Canelake
066d04f595 Simple email checking for batch enrollment on inst dash
LMS-2244
2014-03-20 15:58:19 -04:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Waheed Ahmed
bb26fa0cd0 Fixed assigning forum roles from beta dashboard membership.
LMS-2346
2014-03-20 11:38:43 +05:00
Waheed Ahmed
5fccc46bfb Fixed "ugettext" is imported as "_u" in lagacy dash.
LMS-2307
2014-03-19 18:19:15 +05:00
Sarina Canelake
8f24a5fd5e Batch add/remove beta testers on beta dash
LMS-1287
2014-03-18 16:08:59 -04:00
Adam Palay
d7c9491f23 Bulk beta tester add/remove on instructor dashboard
LMS-1287
2014-03-18 16:08:58 -04:00
Sarina Canelake
7d2f9b88e3 Merge pull request #2857 from edx/adam/new-data-download
Update data download dash for parity (LMS-1203)
2014-03-13 10:58:50 -04:00
Sarina Canelake
6ca099d5b6 Acceptance tests for beta instructor dash
LMS-1203
2014-03-13 07:49:40 -04:00
Adam Palay
4874f21f6f Inst Dash membership widget accepts usernames
In addition to email addresses. LMS-1438
2014-03-13 07:44:07 -04:00
Adam Palay
74714c4ed7 Update data download dash for parity (LMS-1203) 2014-03-13 06:47:40 -04:00
Gabe Mulley
779d0aab7f Merge pull request #2827 from mulby/gabe/report-downloads
Generalize grade report to allow display of any report
2014-03-11 11:23:58 -04:00
Gabe Mulley
d0b12ee3be Generalize grade report to allow display of any report
We would like to be able to generate arbitrary reports and expose them to the instructor by simply uploading them to S3.  The existing grade download infrastructure pretty much supported that already, however, all of the internal and external structures were referring to the reports as exclusively grading related.

Fixes: AN-590
2014-03-11 10:14:37 -04:00
Usman Khalid
8824973759 Fixed module urls creation in legacy instructor dashboard.
LMS-2327
2014-03-10 19:22:57 +05:00
Dave St.Germain
72e876fe40 Prevent reflected XSS in instructor dashboard. 2014-03-05 11:45:45 -05:00
chrisndodge
c4401fdc7f Merge pull request #2553 from edx/cdodge/microsite-cleanup
Address Microsite PR feedback - separate out middleware from microsite logic, shor...
2014-02-28 17:38:19 -05:00
Kristin Stephens
3881ffdc0d New tab (Metrics) in instructor dashboard
Metrics tab shows student data:
  -Count of students opened a subsection
  -Grade distribution per problem

for each section/subsection of the course.

Implemented for both the old and beta dashboard
Controlled by a feature flag 'CLASS_DASHBOARD'
Data is aggregated across all students
Aggregate data computed from courseware_studentmodule
2014-02-28 14:01:44 -08:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -05:00
cahrens
09d90b16af Clean up of modulestore references (primarly LMS).
STUD-1151
2014-02-11 14:29:22 -05:00
Ned Batchelder
1bd213beba Remove unused imports. 2014-02-10 14:07:50 -05:00
Calen Pennington
6d67d0c677 Merge pull request #1949 from cpennington/xblock-studio-js-and-css
Enable XBlock js and css in Studio
2014-02-05 08:19:45 -05:00
Chris Dodge
ad7348ec11 Allow author to cap enrollments in course
add a test case for enrollment caps

pep8 fix
2014-02-04 15:32:36 -05:00
Calen Pennington
49217ebe8b Allow multiple client-side runtimes on a single page
Make XBlock client-side runtimes proper classes, so that handlerUrl can
be defined in a per-runtime way, and we can have multiple runtimes on a
single page.

[LMS-1630][LMS-1421][LMS-1517]
2014-02-04 08:55:36 -05:00
Jay Zoldak
bc30addfb9 Unicode changes to support QRF
fixing unit tests

fixing merge error

fixing xqueue submission issue with unicode url (trial 0.1)

fixing fotmats as commented upon

removing yaml file language selection

Unicode changes to support QRF

removed unnecessary pass in modulestore/init.py

fixing merge error

fixing fotmats as commented upon

removing yaml file language selection

fixing pep8 violations

- fixing pylint violations

pylint violation

fixing line spaces and formats

ignore pylint E1101

remove empty line

fixing pylint violations

 pep8 violations

bulk mail unicode/decode

fix migration error

fix pep8 just to push again

more unicode/decode
Final changes to comments and error messages.
2014-01-30 16:20:36 -05:00
Usman Khalid
e0ecf011bd Fixed flaky test for instructor command openended_post.
The submission time is serialized into json and sent to xqueue. Previously the
whole json body argument to send_to_queue() was being matched. Sometimes the
time calculated in the test would differ slightly from the time calculated in
send_to_grader() and the test would fail. This fix tests individual fields of
the body argument to mock_send_to_queue() instead.
2014-01-24 18:35:25 +05:00
Don Mitchell
3885e6cf78 Merge branch 'release'
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
2014-01-16 12:51:22 -05:00
Don Mitchell
7ff137866b Merge pull request #2180 from edx/usman/openended_post_hostname_argument
Added hostname argument to openended_post command.
2014-01-15 09:05:32 -08:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones
STUD-1006
2014-01-14 17:04:44 -05:00
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -05:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
2014-01-14 14:36:01 -05:00