Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

10459 Commits

Author SHA1 Message Date
Calen Pennington
6c546fbf1f Fix merge conflicts 2014-05-13 15:31:40 -04:00
Calen Pennington
240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
 2014-05-13 15:30:56 -04:00
Calen Pennington
16faafded9 Fix ssl redirection test 2014-05-13 14:13:45 -04:00
Brian Wilson
d6a74a644d Merge branch 'master' into release 
Conflicts:
	cms/static/js/views/modals/edit_xblock.js
 2014-05-13 11:10:48 -04:00
Sébastien Hinderer
ec31a42637 CMS: debug toolbar should be displayed on dev stack. 
In Studio, the debug tool bar did not appear as in LMS.
 2014-05-13 10:30:59 -04:00
Calen Pennington
484c529d99 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master 2014-05-13 10:23:24 -04:00
Calen Pennington
37b1a2f738 Remove calls to loc_mapper 2014-05-12 16:34:53 -04:00
Adam Palay
a51a0c558e fix importing bug (STUD-1599) 
add target_location_namespace check
 2014-05-12 15:59:41 -04:00
Don Mitchell
ded28af8b4 Make Locators comply with UsageKey accessors 2014-05-12 15:35:54 -04:00
Calen Pennington
a4df0e1515 Fix failing tests 2014-05-12 14:45:38 -04:00
Calen Pennington
85ca7db7a6 Fix merge conflicts relative to master 2014-05-12 11:42:21 -04:00
Calen Pennington
19acdd31e8 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html
 2014-05-12 11:35:03 -04:00
polesye
2d64a2773f Fix acceptance tests. 2014-05-12 16:22:05 +03:00
David Ormsbee
77c7ebd704 Merge pull request #2768 from carsongee/cg/ssl-next-url 
Modified ssl certificate authentication to handle next redirection
 2014-05-11 20:12:12 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool
 2014-05-09 16:14:42 -04:00
Calen Pennington
c72b0bb293 Resolve merge conflicts relative to master 2014-05-09 15:31:20 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
 2014-05-09 15:29:32 -04:00
Andy Armstrong
a454502b63 Merge pull request #3666 from edx/andya/fix-translation-string 
Improve the translatability of Studio's paging header
 2014-05-09 15:16:11 -04:00
Carson Gee
cbf525f6cf Fix infinite redirect loop on logout caused by django caching 2014-05-09 14:22:11 -04:00
Carson Gee
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-05-09 14:22:10 -04:00
Andy Armstrong
e75f273329 Apply Sarina's code review suggestions 2014-05-09 13:39:17 -04:00
srpearce
fa0e958b43 Merge pull request #3650 from edx/sylvia/docs/DOC-206 
Sylvia/docs/doc 206
 2014-05-09 12:38:05 -04:00
Sylvia Pearce
c1ef41fe6a Update Video component UI text 2014-05-09 12:37:28 -04:00
Andy Armstrong
6d08a0b47b Improve the translatability of the paging header 2014-05-09 12:07:49 -04:00
Don Mitchell
660f905028 Merge pull request #3658 from edx/opaque-keys-location-to-son 
Opaque keys location to son
 2014-05-09 10:48:51 -04:00
Nimisha Asthagiri
46a976d7e1 fixed asset search query. 
moved location_to_son to LocationBase.py.
 2014-05-09 10:28:34 -04:00
Don Mitchell
69a2d9882e Validate the args to SSCK 2014-05-09 10:26:06 -04:00
Don Mitchell
f73939ab7d Responses to comments on https://github.com/edx/edx-platform/pull/3539 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/locations.py
 2014-05-09 10:18:22 -04:00
Adam
efcd13e836 Merge pull request #3511 from edx/adam/wiki-hide-fix-firefox 
fix wiki hide button not working in firefox (STUD-1581)
 2014-05-09 07:04:03 -05:00
Calen Pennington
0d88379eeb Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit adds all of cms.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-07 12:56:43 -04:00
Ned Batchelder
5e34c21ff4 Merge pull request #3628 from edx/ned/fix-ignorable-404-ends 
IGNORABLE_404_ENDS is wrong and unused
 2014-05-07 11:17:05 -04:00
Waheed Ahmed
998af82baa Fixed cheatsheet for open ended editor. 
STUD-1583
 2014-05-07 12:58:35 +05:00
Ned Batchelder
4d4390c0c9 IGNORABLE_404_ENDS is wrong and unused 
This setting is only used if SEND_BROKEN_LINK_EMAILS is true, which it
is not, and it is deprecated, and this value for it is wrong, since it
is used as an iterable.
 2014-05-06 18:02:53 -04:00
marcotuts
b0781cdd4a Merge pull request #3614 from edx/waheed/fix-simple-problem-editor 
Fixed simple problem editor text showing up in advanced editor
 2014-05-06 12:17:37 -04:00
frances botsford
3530721671 Merge pull request #3577 from edx/frances/fix/404-and-500-page-layout 
Fix for Studio 404 and 500 page layouts
STUD-864
 2014-05-06 11:44:51 -04:00
Waheed Ahmed
b873cfc26d Fixed simple editor text showing in advanced editor. 2014-05-06 20:35:38 +05:00
Christina Roberts
df262d4fc7 Merge pull request #3229 from edx/christina/container-dnd 
Drag and drop on container page
 2014-05-06 11:09:29 -04:00
Frances Botsford
5890bc842c removing larger size for CodeMirror for funky visual behavior on Checkbox problems in release 2014-05-06 10:47:59 -04:00
Adam
0b8cc25be3 Merge pull request #3582 from edx/adam/some-cleaning 
Adam/some cleaning
 2014-05-05 15:14:59 -04:00
Jay Zoldak
f91b9eec65 Rebalance CMS acceptance test shards 2014-05-05 13:52:34 -04:00
Christina Roberts
759b656ac8 Merge pull request #3594 from edx/christina/delete-dead-files 
These files are not being used.
 2014-05-05 13:07:25 -04:00
cahrens
acd9d7d904 These files are not being used. 2014-05-05 11:36:04 -04:00
Andy Armstrong
7693659e48 Address Christina's review comments 2014-05-05 11:34:55 -04:00
Adam Palay
3d3e15ca1b remove new_location from logging 2014-05-05 10:05:04 -04:00
Andy Armstrong
de80f892e2 Clean up coverage and code quality issues 2014-05-02 16:20:17 -04:00
Andy Armstrong
e20a7fc53c Fix Jasmine tests 
Also, rewrite them to be easier to comprehend, and to not use magic constants (or to use fewer, at least).
 2014-05-02 16:20:17 -04:00
Andy Armstrong
f3a23f3973 Only show drag handles in draft mode 2014-05-02 16:20:12 -04:00
Frances Botsford
fb4cab435e fix for Studio 404 and 500 page layouts 
STUD-864
 2014-05-02 16:19:59 -04:00
Adam Palay
a35e359482 add logging to course import 2014-05-02 15:31:08 -04:00
cahrens
37da399997 Update unit test based on changes in master. 2014-05-02 15:09:25 -04:00