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

1858 Commits

Author SHA1 Message Date
Don Mitchell
6b9797522b Write restful service to find all orphans 
To help fix recent bugs re orphaned discussions and
to prototype a more restful json oriented api.
 2013-10-24 13:18:22 -04:00
Christina Roberts
286ae9e73d Merge pull request #1470 from edx/christina/cleanup-course-index 
Get rid of course_index shim.
 2013-10-24 09:22:36 -07:00
cahrens
12488db015 Get rid of course_index shim. 2013-10-24 11:35:02 -04:00
Don Mitchell
3a6a9ee009 tighten case-insensitive test to require full string match 2013-10-24 11:24:37 -04:00
Don Mitchell
277f327690 Require course ids to be case-insensitively unique 2013-10-23 15:47:07 -04:00
polesye
6c08708131 Merge pull request #1111 from edx/anton/video_subtitles 
Add Timed Transcripts Editor.
 2013-10-23 02:38:39 -07:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
Don Mitchell
1f0ab9e01f Remove as_old_location methods 
They were incorrect if there were periods in the org or name.
 2013-10-22 14:10:20 -04:00
cahrens
ca5d0e8973 Do need context_course variable for segment io. 2013-10-22 11:34:15 -04:00
cahrens
a6faa163f3 Convert checklists to new URL scheme. 2013-10-22 11:34:05 -04:00
Don Mitchell
8902a89fbc Have urls.py fully parse locator url 2013-10-22 10:44:03 -04:00
Don Mitchell
4f60a30afc Remove as_old_location methods 
They were incorrect if there were periods in the org or name.
 2013-10-21 17:17:20 -04:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution 
Add an XBlock javascript runtime, and use it to run XModules
 2013-10-21 05:53:36 -07:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
Don Mitchell
978c19dd2c Merge pull request #1325 from edx/dhm/paginate_assets 
Add asset pagination
 2013-10-17 07:16:09 -07:00
Don Mitchell
010905eb99 RESTful api for getting course listing and opening course in studio. 
Pattern for how to do refactoring from locations to locators and from
old style urls to restful ones.
 2013-10-16 16:54:31 -04:00
Christina Roberts
ccd692dd86 Merge pull request #1133 from edx/jkarni/fix/customtag-error 
Jkarni/fix/customtag error
 2013-10-15 14:23:45 -07:00
Julian Arni
d9ba410388 Review fixes 2013-10-15 16:52:35 -04:00
Julian Arni
b7485fd812 Review fixes 2013-10-15 16:16:09 -04:00
Julian Arni
2721966d76 Added acceptance tests for get_html exception handling 
Make tests conform to new import UI
 2013-10-15 16:16:09 -04:00
Julian Arni
62a8c420ed Check for exceptions when rendering studio and students views. 
Otherwise it's possible to reach stuck states.
 2013-10-15 16:16:09 -04:00
Ned Batchelder
25a027475d Rename contentstore/views/requests to helpers 
This has caused confusion, since this file gets imported when trying to
import the requests library.  And besides, how was this file about
requests in the first place?  Helpers is a much better name.
 2013-10-15 15:53:48 -04:00
Don Mitchell
70f77ce4bf Add pagination to asset retrieval 
and push sorting down to the query
 2013-10-10 17:26:23 -04:00
cahrens
70cb24a37f Delete unused static-pages.html. 2013-10-09 15:06:58 -04:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class 
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
 2013-10-08 15:29:17 -04:00
Julian Arni
bb00924917 Use requirejs for import.js 
And fixes for rebase-breakage.
 2013-10-07 14:07:26 -04:00
Julian Arni
7b3c4945cf Review fixes 
Studio: revises import help/status copy to better reflect/generalize what is done with imported content

Add test cases for import status
 2013-10-07 09:55:46 -04:00
Julian Arni
45ce8d30d9 Use swanky error css for error messages 2013-10-07 09:52:59 -04:00
Julian Arni
a108827564 Route ajax request to appropriate view, and show feedback only then 
Hook up view

Fix getStatus function
 2013-10-07 09:51:19 -04:00
Julian Arni
c62691e9fc Scaffolding for import progress reporting 2013-10-07 09:49:59 -04:00
Julian Arni
f095f3c8c8 Merge branch 'release' 2013-10-04 17:34:49 -04:00
Julian Arni
dadc766fc0 Use wrapped tar extraction 
Signed-off-by: Julian Arni <julian@edx.org>
 2013-10-04 15:47:58 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Nick Parlante
0ed1ee917e Create edit_course_tabs management command 
Just works on the tabs list in mongo, nothing
deeper than that.
Added implementation functions in tabs.py,
providing a first step for some future
GUI editor.
 2013-10-01 10:49:51 -07:00
cahrens
1d7f891145 Delete asset from cache. 2013-09-25 17:29:47 -04:00
cahrens
c64e04d8c2 Add the ability to lock assets. 2013-09-25 17:29:27 -04:00
Don Mitchell
e69955b437 Pylint/pep8 fixes 2013-09-20 11:28:00 -04:00
cahrens
948615d66f Log warning if thumbnail cannot be deleted. 2013-09-20 10:44:55 -04:00
cahrens
fe6ed08518 Code review feedback. 2013-09-20 10:44:55 -04:00
cahrens
01d7d48f8f Create backbone models/views for assets. 
cleanup

Updates.

Testing changes.

Testing changes.

asset-index progress state cleanjup.

cleanup
 2013-09-20 10:44:54 -04:00
Calen Pennington
9643fd463f Rename xblock_field_data to xmodule_field_data 2013-09-18 10:49:41 -04:00
jkarni
0e2d833a2e Merge pull request #830 from edx/jkarni/fix/unicode-import 
Fix import errors with unicode filenames
 2013-09-18 07:23:43 -07:00
Calen Pennington
d35a03a0d6 Merge pull request #908 from cpennington/reference-runtime 
Replace references to .system
 2013-09-18 05:43:20 -07:00
Julian Arni
1813b22ab0 Fix import errors with unicode filenames 2013-09-12 15:47:59 -04:00
Christina Roberts
784115ac79 Merge pull request #901 from edx/christina/dont_import_checklists 
Do not store expanded action URLs.
 2013-09-12 07:54:25 -07:00
Julian Arni
ca2049abd3 Fixes extra 'file' that was leftover locally after import 2013-09-12 10:29:41 -04:00
cahrens
ea26b19d0b pylint/pep8 cleanup. 2013-09-12 09:47:30 -04:00
cahrens
1184a97b0b Do not store expanded action URLs. 
They are not portable. STUD-681.

Minor updates.
 2013-09-12 09:47:30 -04:00