Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,833 Commits 1 Branch 0 Tags
ecdf774e75dbb0f0fe84494de18dfdf946c14552
Commit Graph

10630 Commits

Author SHA1 Message Date
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
cahrens
8e00f6dc3b Restore the ability to drag at any level inside a vertical and clean up templates. 2014-05-02 15:09:24 -04:00
Andy Armstrong
c1fd0ca34e Switch the container page to use the new view 2014-05-02 15:09:23 -04:00
Frances Botsford
fd7142bcde dnd container page styling 2014-05-02 15:09:23 -04:00
cahrens
fb150bcf64 Drag and drop on container page. 
STUD-1309
 2014-05-02 15:09:15 -04:00
David Baumgold
71a50c58d7 Show error page templates 2014-05-02 13:41:34 -04:00
Adam Palay
7c13ba0c3b Disable draft and edit links during ajax calls 
STUD-1485
STUD-1499
 2014-05-02 09:11:46 -04:00
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS 
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
 2014-05-01 14:04:35 -04:00
cahrens
d250f1f086 Minor reword to server timed out message. 2014-04-30 09:33:29 -04:00
Adam Palay
c806c8a954 fix wiki hide button not working in firefox (STUD-1581) 2014-04-29 15:17:53 -04:00
frances botsford
021b41c297 Merge pull request #3516 from edx/frances/bug/xblock-studio-editor 
Fix for xblock settings scroll
 2014-04-29 12:46:21 -04:00
Frances Botsford
8ed92f3c5b temporary fix for xblock settings scroll 
UX-623
 2014-04-29 10:27:21 -04:00
zubair-arbi
87408d2399 Revert "remove location of item from loc_mapper and cache" 
This reverts commit d2b8b4f0dd.
 2014-04-29 18:53:35 +05:00
muhammad-ammar
dfa45eac16 Merge pull request #3440 from edx/ammar/config-youtube-stub-for-bok-choy 
Configure youtube stub for bok-choy
 2014-04-28 17:32:33 +05:00
David Baumgold
7aa627b1fa Merge pull request #3145 from carsongee/cg/course_import_validation 
Add test in import code to make sure two overlapping courses aren't imported
 2014-04-25 16:03:55 -04:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
David Baumgold
0a022e13ba Merge pull request #3371 from carsongee/cg/pdf_textbook_urls 
Switch PDF Textbooks to use portable URLs
 2014-04-25 13:46:28 -04:00
Andy Armstrong
f6fc10f34b Merge pull request #3463 from aboudreault/xblock-initialization-issue 
XBlocks are something initialized before all resources (url) are loaded
 2014-04-25 13:09:49 -04:00
Alan Boudreault
901920b0cd no need for $.when() here.. 2014-04-25 11:51:08 -04:00
Waheed Ahmed
49ef8c5686 Added code to remove css on closing cheatsheet. 2014-04-25 11:35:52 +05:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
Alan Boudreault
4d1d1a75ce Wait that all resources are loaded and fragments rendered before initializing the xblock 2014-04-24 15:54:23 -04:00
cahrens
29d32d35ff Tests for raw editor and minor wording changes. 2014-04-24 14:18:13 -04:00
cahrens
ad3d8c7871 Add support for raw HTML editor. 
STUD-1562
 2014-04-24 14:18:12 -04:00
Andy Armstrong
f4e4082b7d Make TinyMCE more tolerant about HTML elements 
STUD-1565
 2014-04-24 14:17:42 -04:00
zubiar-arbi
7b5c647c8e properly remove users from instructor/staff groups on a course delete 
STUD-1555
 2014-04-24 17:11:19 +05:00
zubair-arbi
c9b419d5ad Merge pull request #3250 from edx/zub/bugfix/std1441-editdiscussioncomp 
remove location of item from loc_mapper
 2014-04-23 14:40:17 +05:00
zubiar-arbi
d2b8b4f0dd remove location of item from loc_mapper and cache 2014-04-23 13:29:39 +05:00
Waheed Ahmed
df96c17e65 Fixed toggle cheatsheet not working on component editors. 
STUD-1514
 2014-04-23 11:08:12 +05:00
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00