This website requires JavaScript.
ff1564382d
Corrected test names and doc strings
2014-05-12 13:41:23 -04:00
a7590e8588
Merge pull request #2865 from edx/sarina/change-default-dashboard
2014-05-12 13:31:41 -04:00
a5381db070
Only show banner on legacy dash for edx.org
2014-05-07 17:10:32 -04:00
ea11fd0751
Merge pull request #3684 from edx/ora2/release-2014-05-12T12.57
2014-05-12 12:35:12 -04:00
eff5ad6b46
Merge pull request #3600 from edx/rc/2014-05-06
2014-05-12 12:32:10 -04:00
2f8d7e8cbe
Fix @feanil Traceback from Logs(TypeError: 'SlashSeparatedCourseKey' object is not iterable)
2014-05-12 12:29:06 -04:00
6d7fe5619a
Merge pull request #3675 from edx/opaque-keys-migrate
2014-05-12 12:10:48 -04:00
75280e8577
fixup! Migration refactoring
2014-05-12 11:55:24 -04:00
2238ce2cda
Let sql tell us if the data is unique
2014-05-09 17:10:07 -04:00
7b70c4b8da
Migration refactoring
2014-05-09 15:31:09 -04:00
85ca7db7a6
Fix merge conflicts relative to master
2014-05-12 11:42:21 -04:00
3e13962930
Release for May 12, 2014
2014-05-12 09:23:03 -04:00
19acdd31e8
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
2014-05-12 11:35:03 -04:00
94c8d86a42
Fix failing tests from merge with master
2014-05-09 16:37:17 -04:00
b8f669eb09
Merge pull request #3669 from cpennington/opaque-keys-fix-discussion-tests
2014-05-12 11:10:10 -04:00
b90f1e41e5
UI cleanup of new instructor dashboard
2014-05-05 10:32:28 -04:00
bc0c13828f
Add segment.io tracking for legacy instructor dashboard
2014-03-24 13:09:28 -04:00
b7a0de7f3b
Change URL patterns for instructor dashboard
2014-04-28 00:18:41 -04:00
09442ef4ac
Port spoc gradebook to new instructor dash
2014-04-29 09:33:47 -04:00
c224fe57ef
Add banners to the instructor dashboard
2014-03-07 14:24:55 -05:00
ced09a6b04
Switch default instructor dashboard to new dash
2014-03-07 14:13:12 -05:00
c13282462a
Modify paver run_all_servers to allow different settings for LMS and Studio.
2014-04-28 12:20:47 +03:00
d37006c657
Merge pull request #3681 from edx/anton/fix-video-tests
2014-05-12 17:07:08 +03:00
2d64a2773f
Fix acceptance tests.
2014-05-12 09:26:56 +03:00
839887246c
Merge pull request #3643 from edx/anton/fix-video-in-ff
2014-05-12 10:24:47 +03:00
77c7ebd704
Merge pull request #2768 from carsongee/cg/ssl-next-url
2014-05-11 20:12:12 -04:00
b7003a1d76
Merge pull request #3672 from edx/sarina/fix-unicode
2014-05-09 16:57:12 -04:00
cbcb1059a3
fixup! Fix discussions by correctly serializing outgoing course_ids
2014-05-09 16:47:39 -04:00
0e07c27d03
Merge pull request #3674 from edx/flowerhack/fix-ora
2014-05-09 16:45:37 -04:00
34c28cf42d
Merge pull request #3068 from edx/fix/ichuang/capa-customresponse-anonid
2014-05-09 16:21:36 -04:00
c0a5171c75
Merge pull request #3466 from lduarte1991/lduarte-harvardx
2014-05-09 16:14:42 -04:00
c72b0bb293
Resolve merge conflicts relative to master
2014-05-09 15:31:20 -04:00
5b40604b1c
Merge pull request #3671 from edx/adam/rebase/anton-fix-video-in-ff
2014-05-09 14:31:00 -05:00
155ffe37ca
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
2014-05-09 15:29:32 -04:00
9fb82d5357
Fixing ORA
2014-05-09 19:27:15 +00:00
22d17a21ec
Remove unicode character inserted into video_xfields
2014-05-09 15:25:56 -04:00
a454502b63
Merge pull request #3666 from edx/andya/fix-translation-string
2014-05-09 15:16:11 -04:00
74578cd720
Merge pull request #3493 from carsongee/cg/sysdash_git_info
2014-05-09 15:14:10 -04:00
193a816395
Merge pull request #3609 from edx/sarina/i18n-cleanup
2014-05-09 15:00:36 -04:00
76a04fa805
Fix discussions by correctly serializing outgoing course_ids
2014-05-09 14:51:03 -04:00
754ada9c62
Merge pull request #3668 from edx/opaque-keys-fix-cache-content-diff-runs
2014-05-09 14:36:48 -04:00
eab8445eb1
Merge pull request #3156 from edx/dcs/LMS-1740
2014-05-09 14:28:24 -04:00
cbf525f6cf
Fix infinite redirect loop on logout caused by django caching
2014-02-28 11:55:40 -05:00
5452de20d8
Modified ssl certificate authentication to handle next redirection Makes small changes in lms and cms both so that user's go to the original page they intended to if they weren't already logged in
2014-02-28 09:31:36 -05:00
e9052dc2fb
Fix delete cache so it also deletes location with run = None.
2014-05-09 14:10:59 -04:00
4ea3945d78
Merge pull request #3667 from edx/ned/more-links-in-pr-guidelines
2014-05-09 14:01:41 -04:00
c7543dd33d
Add more links in the PR guidelines.
2014-05-09 13:53:16 -04:00
e75f273329
Apply Sarina's code review suggestions
2014-05-09 13:39:17 -04:00
379745e3a4
Merge pull request #2686 from edx/feature/ichuang/add-reset-links-to-staff-debug
2014-05-09 13:29:29 -04:00
d756b4a96d
Merge pull request #3617 from edx/sylvia/docs/DOC-359
2014-05-09 13:26:39 -04:00
28a2efeace
Add VitalSource information
2014-05-06 09:24:12 -04:00
fa0e958b43
Merge pull request #3650 from edx/sylvia/docs/DOC-206
2014-05-09 12:38:05 -04:00
c1ef41fe6a
Update Video component UI text
2014-05-08 16:16:02 -04:00
6d08a0b47b
Improve the translatability of the paging header
2014-05-09 12:03:21 -04:00
dbb87e2609
Merge pull request #3663 from edx/markhoeber/documentation/doc-309
2014-05-09 12:05:33 -04:00
3a185b2656
Note about course staff and discussion admin roles
2014-05-09 11:36:32 -04:00
558e9c8f20
Merge pull request #3662 from edx/diana/minor-ddt-fix
2014-05-09 11:33:11 -04:00
f3a7be5a15
Use ddt decorators as specified in doc.
2014-05-09 11:24:57 -04:00
01ae09aa6c
Merge pull request #3661 from edx/opaque-keys-mod_key
2014-05-09 11:23:14 -04:00
7c1e6d83e4
Fix message handling to be more internationalizable
2014-05-09 11:19:59 -04:00
bd4595fad2
Fix missing field access
2014-05-09 11:19:54 -04:00
660f905028
Merge pull request #3658 from edx/opaque-keys-location-to-son
2014-05-09 10:48:51 -04:00
ae99a1700a
Merge pull request #3659 from edx/opaque-keys-validate
2014-05-09 10:47:41 -04:00
a558980e3c
Merge pull request #3645 from edx/opaque-keys-student-module
2014-05-09 10:42:25 -04:00
7be81341d7
Revert StudentModule.module_state_key to field rather than computed property
2014-05-08 12:01:45 -04:00
8f90dd835d
Merge pull request #3653 from edx/gprice/discussion-link-command
2014-05-09 10:34:45 -04:00
b89b1e0727
Merge pull request #3657 from edx/opaque-keys-access
2014-05-09 10:30:09 -04:00
46a976d7e1
fixed asset search query. moved location_to_son to LocationBase.py.
2014-05-06 16:52:08 -04:00
69a2d9882e
Validate the args to SSCK
2014-05-06 11:31:15 -04:00
b337d4f893
Merge pull request #3651 from edx/opaque-keys-xmodule-lib-cleanup
2014-05-09 10:24:17 -04:00
81a8bc39f6
Clarify strings for i18n
2014-05-06 07:52:02 -04:00
f73939ab7d
Responses to comments on https://github.com/edx/edx-platform/pull/3539
2014-05-08 16:50:46 -04:00
b3b118ee49
Merge pull request #3655 from edx/opaque-keys-common-lib-xmodule
2014-05-09 10:13:00 -04:00
6834376b8a
Don't fetch the course just to find out if the user has access to it.
2014-05-06 17:23:51 -04:00
d5468fff4e
Merge pull request #3642 from cpennington/opaque-keys-return-course
2014-05-09 10:06:38 -04:00
18edab35f3
BLD-1057: Fix Video player in FF.
2014-05-08 14:47:20 +03:00
f4d97ca55d
Merge pull request #3652 from edx/sylvia/docs/DOC-390
2014-05-09 09:51:30 -04:00
50a99de6e1
Merge pull request #3634 from edx/ammar/bok-choy-video-tests-batch6
2014-05-09 18:31:04 +05:00
e042eb62c3
Use a validly formed bogus task id
2014-05-08 16:26:13 -04:00
002bfd475e
Clean up partial import statemen
2014-05-08 16:11:11 -04:00
ac7675be2c
Make dashboard.tests a python module
2014-05-08 14:01:52 -04:00
60cecc4e12
Fix syntax error
2014-05-08 14:00:58 -04:00
6334d7ddaa
Clean up how courses are iterated on instructor dashboard
2014-05-08 14:00:52 -04:00
7bb6d6f281
Fix cohort.course_id naming
2014-05-08 14:00:22 -04:00
eb11ba76a7
Better unicode handling in instructor tasks/bulk-email
2014-05-08 12:06:28 -04:00
54bd1cbed5
Return the course from get_course in courseware
2014-05-08 12:05:28 -04:00
8827118bb0
fixup! Make course ids and usage ids opaque to LMS and Studio [partial commit]
2014-05-09 09:13:17 -04:00
efcd13e836
Merge pull request #3511 from edx/adam/wiki-hide-fix-firefox
2014-05-09 07:04:03 -05:00
47ec168ea4
BLD-1057: Fix Video player in FF.
2014-05-08 14:47:20 +03:00
31f3ef0ab3
Merge pull request #3632 from edx/waheed/lms2617-verify-mode-none
2014-05-09 16:37:54 +05:00
40a03ebb79
Redirected to dashboard if course mode is none. LMS-2617
2014-05-07 18:39:39 +05:00
aa0e8041af
Bok-Choy Video Tests Batch6
2014-05-09 07:01:03 +00:00
d466132a1f
Merge remote-tracking branches 'edx/opaque-keys-base-keys', 'edx/opaque-keys-cms', 'edx/opaque-keys-common-djangoapps', 'edx/opaque-keys-common-lib-xmodule', 'edx/opaque-keys-common-misc', 'edx/opaque-keys-django-fields', 'edx/opaque-keys-embargo-tests', 'edx/opaque-keys-library', 'edx/opaque-keys-lms-courseware', 'edx/opaque-keys-lms-djangoapps', 'edx/opaque-keys-lms-templates', 'edx/opaque-keys-mongoengine-fields', 'edx/opaque-keys-requirements' and 'edx/opaque-keys-roles-table' into opaque-keys
2014-05-08 20:32:28 -04:00
d654798856
Make course ids and usage ids opaque to LMS and Studio [partial commit]
2014-04-30 10:17:45 -04:00
b3ec4d1b6b
Switching to new dashboard API and adding rescore to actions list
2014-05-08 18:43:30 -04:00
5e849bfb76
Add command to get discussion_link for a course
2014-05-08 17:40:13 -04:00
91534bf0f0
Fixed typos in example code for drag and drop problems
2014-05-08 17:00:59 -04:00
2d132e10eb
Merge pull request #3649 from edx/markhoeber/documentation/doc-344
2014-05-08 15:54:53 -04:00
95e1ee6e7b
Added warnings about file size
2014-05-08 15:31:45 -04:00
43b4a6b40e
Merge pull request #3646 from edx/db/mysql-python-upgrade
2014-05-08 14:36:55 -04:00
Carson Gee