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

1790 Commits

Author SHA1 Message Date
Don Mitchell
3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize 
loc mapper memoize
 2013-12-16 10:34:12 -08:00
Don Mitchell
f6de4f2186 Location map uses a separate cache and defaults to general 2013-12-16 12:31:19 -05:00
Don Mitchell
3f420e3d63 loc_mapper memoize all translations 
STUD-1048
 2013-12-16 11:43:28 -05:00
Carson Gee
ccc87337d6 Add sysadmin dashboard 
For seeing overview of system status, for deleting and loading
courses, for seeing log of git imports of courseware.  Includes command
for importing course XML from git repositories.

Added a lot of tests for additional coverage with some minor fixes
those tests discovered
 2013-12-15 19:06:05 -05:00
David Baumgold
3d2ad59c51 Merge pull request #1907 from edx/db/whitespace-fixes 
whitespace-only changes
 2013-12-13 11:40:54 -08:00
Don Mitchell
3bd76f98e9 Use mongo indices for all queries 
STUD-1039
 2013-12-13 14:34:34 -05:00
Don Mitchell
f4beb8b8c3 Reduce sql queries for groupname tests. 
Conflicts:
	cms/djangoapps/auth/authz.py
 2013-12-13 14:33:11 -05:00
Christina Roberts
17b5c2126c Merge pull request #1910 from edx/christina/locations 
Create explicit Locations.
 2013-12-13 09:18:21 -08:00
cahrens
ec55d8c1a9 Create explicit Locations. 
STUD-1030
 2013-12-11 10:03:34 -05:00
David Baumgold
2bc4198760 Merge pull request #1853 from edx/db/update-comments 
Updating comments and docs for MITx -> edX transition
 2013-12-10 11:10:37 -08:00
David Baumgold
fb13bed947 Updating comments and docs for MITx -> edX transition 2013-12-10 13:21:18 -05:00
David Baumgold
28f22393bf whitespace-only changes 2013-12-10 11:45:49 -05:00
Calen Pennington
137c54b2c7 Add debug logging of exceptions that happen during rending of studio_view or student_view in Studio 2013-12-09 16:27:49 -05:00
Don Mitchell
0684f6a40a Merge pull request #1878 from edx/dhm/pymongo_client 
Upgrade pymongo usage from deprecated connection to client
 2013-12-06 13:14:28 -08:00
Christina Roberts
95c86248bd Merge pull request #1869 from edx/christina/export-error 
On export error, handle quotes within string.
 2013-12-06 09:54:25 -08:00
cahrens
bbeded71ec On export error, handle quotes within string. 
STUD-1013
 2013-12-06 12:02:02 -05:00
Don Mitchell
b5691cd4d1 Upgrade pymongo usage from deprecated connection to client 
LMS-1551
 2013-12-06 10:47:06 -05:00
David Baumgold
d8103d4377 course.save() is no longer necessary 2013-12-05 13:21:55 -05:00
David Baumgold
c93198235e Pass PDF textbooks to template separately 2013-12-05 13:19:00 -05:00
David Baumgold
0d3490374e Refactor textbooks to use locator URLs 
STUD-945
 2013-12-05 13:13:28 -05:00
polesye
b4f82b3837 BLD-438: Fix clear and download buttons. 2013-12-05 11:43:29 +02:00
David Baumgold
d1f3e3a6b5 Merge pull request #1827 from edx/db/remove-mitx-from-features 
settings.MITX_FEATURES => settings.FEATURES
 2013-12-04 07:13:19 -08:00
Christina Roberts
2682a14d43 Merge pull request #1790 from edx/christina/transcripts 
Change video transcripts to use locators instead of locations.
 2013-12-04 06:41:44 -08:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
69899e24df Merge pull request #1823 from edx/db/mitxmako-edxmako 
mitxmako => edxmako
 2013-12-03 11:36:50 -08:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Don Mitchell
9dc68b03a0 Improve auth handling of Locators 
Ensure user admin screen gets the union of all possibly matching group names.
Smarter default group naming.
STUD-1003
 2013-12-02 15:28:22 -05:00
Valera Rozuvan
d75b580f8f Enabled back turned off Video acceptance tests. 
Updated comments.

BLD-537
 2013-11-29 10:53:31 +02:00
Ned Batchelder
c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 2013-11-27 11:55:44 -05:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
cahrens
5fdfc60957 Change video transcripts to use locators instead of locations. 
Part of STUD-870
 2013-11-26 16:52:56 -05:00
Calen Pennington
6d613f9d4e Enable un-authenticated handler urls 
Updates to depend on the latest version of XBlock, which includes
support for service-to-service (thirdparty) handler urls, which aren't
authenticated with a user (unlike handler requests coming from the
xblock client-side javascript).

Co-author: Ned Batchelder <ned@edx.org>
 2013-11-26 16:29:34 -05:00
Will Daly
761699bf74 Disabled another video test that failed in master 2013-11-26 14:01:58 -05:00
Will Daly
d00e5a4503 Disabled video caption tests that failed in master 2013-11-26 12:07:04 -05:00
Don Mitchell
7f91ce40ae Restful api for course advanced settings 
STUD-948
 2013-11-26 10:17:52 -05:00
cahrens
b5d72a38d3 Updates from code review. Includes backing out the 
"as_published" changes I previously put in, as now we
are not adding @draft to locations converted from locators.
 2013-11-25 13:55:33 -05:00
cahrens
50128cfb5c Convert edit_subsection, edit_unit, and publishing to RESTful URLs. 
STUD-844
 2013-11-25 13:55:33 -05:00
Don Mitchell
7ab31f5478 Merge pull request #1710 from edx/dhm/restful_settings 
Restful course settings
 2013-11-22 08:23:12 -08:00
Don Mitchell
17864353a5 Restful course settings 
STUD-946
STUD-947
 2013-11-22 10:55:35 -05:00
Александр
3bbc7430f2 BLD-530: Fix 500 error in transcripts. 2013-11-22 10:06:03 +02:00
Christina Roberts
3f44ff2f4b Merge pull request #1675 from edx/christina/tab-new 
Convert tabs to use RESTful API
 2013-11-21 07:39:31 -08:00
cahrens
1b2be30c45 Convert tabs to RESTful URL. 
STUD-850
 2013-11-21 10:19:43 -05:00
Christina Roberts
99cf0ec54a Merge pull request #1727 from edx/christina/public 
Minor cleanup around public RESTful URLs.
 2013-11-21 06:57:24 -08:00
zubair-arbi
df97df6fde Merge pull request #1606 from zubair-arbi/zub/bugfix/std293-coursehandout 
Show error on invalid html in course handout edit
 2013-11-21 01:53:08 -08:00
polesye
538be891bc Merge pull request #1725 from edx/anton/transcripts-fix-acceptance-test 
BLD-524: Add missing assert in video test.
 2013-11-20 11:44:15 -08:00
cahrens
d1c19cb563 Minor cleanup around public RESTful URLs. 
STUD-849
 2013-11-20 14:20:59 -05:00
cahrens
f01b36b5d4 Test for i4x on returned pages. 
STUD-941
 2013-11-20 12:48:24 -05:00
Christina Roberts
c9416925e1 Merge pull request #1680 from edx/christina/preview 
Change preview view method to use RESTful URL.
 2013-11-20 06:12:19 -08:00
Will Daly
29c8a0e2c5 Merge pull request #1722 from edx/will/fix-html-failure 
Increased timeout for element count in HTML test
 2013-11-20 06:08:27 -08:00
polesye
cc2f1e73bf BLD-524: Add missing assert in video test. 2013-11-20 15:48:15 +02:00