Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28,888 Commits 1 Branch 0 Tags
70db28bbcfe0e6e4f4cddd5ceea176cb1aef8449
Commit Graph

5733 Commits

Author SHA1 Message Date
Andy Armstrong
dfe0057b79 Implement profile API 
TNL-1491

See the API design here:

https://openedx.atlassian.net/wiki/display/TNL/User+API
 2015-03-02 16:28:52 -05:00
Alison Hodges
5acc13269a Merge pull request #7133 from edx/ahodges/hackathon 
Alison's Hackathon9 changes
 2015-03-02 09:38:30 -05:00
Waqas Khalid
a9b83a5ae9 Merge pull request #7096 from edx/jeskew/PLAT_454_import_500_error 
PLAT-454: Fix import error when exported course edited.
 2015-03-02 19:01:51 +05:00
Waqas Khalid
4b9dc74cad Add tests for rename import error 2015-03-02 16:09:34 +05:00
Alison Hodges
4666caa63d Fixes DOC-1472, DOC-1713, DOC-1613, DOC-1714, DOC-1715 2015-02-27 16:22:01 -05:00
stv
4131898180 Remove "nopep" pragma 2015-02-27 11:49:51 -08:00
Daniel Friedman
0c1cc07b8c Merge pull request #7131 from edx/django-upgrade/backport-changes/misc-code-changes 
Django upgrade/backport changes/misc code changes
 2015-02-27 11:17:20 -05:00
Calen Pennington
8e93c1891f Merge pull request #6016 from cpennington/django-toolbar-upgrade 
Upgrade django-debug-toolbar to 1.2.2
 2015-02-27 10:39:32 -05:00
Braden MacDonald
88747024b5 Upgrade django-debug-toolbar to 1.2.2 
This is compatible with Django > 1.5, and allows us to re-enable the ProfilingDebugPanel
 2015-02-26 15:57:03 -05:00
Calen Pennington
80eed36c2f Merge pull request #7124 from edx/django-upgrade/unicode-export-errors 
Force GitExportError messages to be unicode objects
 2015-02-26 14:10:11 -05:00
Daniel Friedman
e622e63c7b Catch PluginMissingError when generating component templates 2015-02-26 13:46:28 -05:00
Calen Pennington
6c0982b214 Force GitExportError messages to be unicode objects 2015-02-26 12:31:41 -05:00
Daniel Friedman
fa968c6218 Backport dummy SECRET_KEYs from django 1.5 upgrade 2015-02-26 11:54:37 -05:00
Xavier Antoviaque
7ac581293d Merge pull request #7059 from open-craft/library-comments 
Make UI styling consistent between libraries and courses tabs when empty (SOL-232)
 2015-02-26 16:41:05 +01:00
Martyn James
b2b56d067b Adds google drive components to whitelist, and imports xblock-google-drive and xblock-utils 2015-02-25 10:35:51 -05:00
Jonathan Piacenti
f952a33ec3 Make UI styling consistent between libraries and courses tabs when empty. 2015-02-24 20:29:54 +00:00
Dino Cikatic
b597df2e39 Changing search_reindex call to be more inline with DRF convention 2015-02-24 10:58:50 -05:00
Sarina Canelake
6900bd27fe Merge pull request #7013 from stvstnfrd/pylint/low 
Fix Pylint violations (easy)
 2015-02-20 16:36:52 -05:00
Jesse Zoldak
047ca495c6 Disable flakily failing JS tests TNL-559 2015-02-20 10:35:54 -05:00
muzaffaryousaf
a31e38416d Adds content group "Delete" and "Usage" functionality to group configurations page on cms. 
TNL-1185
 2015-02-20 14:56:22 +05:00
stv
69695a8f12 Fix Pylint: W0107(unnecessary-pass) 2015-02-19 19:56:52 -08:00
stv
66f28fd8da Fix Pylint: I0022(deprecated-pragma) 2015-02-19 19:56:51 -08:00
Jesse Zoldak
44ff43ab1f Disable flakily failing JS tests TNL-559 2015-02-19 07:24:27 -05:00
Xavier Antoviaque
132cadb517 Merge pull request #2968 from edx-solutions/xblock-external-ui 
xblock-external-ui: Add XBlock API call to render XBlock views
 2015-02-18 08:58:33 +01:00
Xavier Antoviaque
05c857478b xblock-external-ui: Adds support for CORS headers (cross-domain request) 
xblock-external-ui: Alternate referer check for CORS requests
xblock-external-ui: Allow to disable httponly on session cookies
xblock-external-ui: Add a unit test for CorsCSRFMiddleware
 2015-02-17 10:24:27 +01:00
Waqas Khalid
a730f81132 Missing discussion blackout throwing exception 
When the list is empty in discussion blackout
on studio side it causes the exception on lms
side when we try to access the discussion. We
were expecting the values and try to parse it
in two values start and end date whereas parsing
empty values to two values causing the exception.
Now values will be parse when value exists. Empty
value will be ignored.

TNL-1390
 2015-02-16 19:43:03 +05:00
Clinton Blackburn
052fa8eafc Merge pull request #6935 from edx/clintonb/course-structure 
Generating Course Structure Asynchronously on Course Publish
 2015-02-13 13:37:05 -05:00
Muzaffar yousaf
5d4e84eb37 Merge pull request #6984 from edx/muzaffar/studio-group-config-tnl1446 
Applying unicode to the content experiment display name.
 2015-02-13 20:58:41 +05:00
Sarina Canelake
1b07bcdf67 Merge pull request #6949 from stvstnfrd/gettext/empty 
Remove superfluous empty string check
 2015-02-13 08:31:31 -05:00
muzaffaryousaf
bff205579b Minor refactoring. 
TNL-1146
 2015-02-13 14:56:33 +05:00
muzaffaryousaf
4189bd19f7 Applying unicode to the usage label with test. 
TNL-1146
 2015-02-13 14:54:34 +05:00
cahrens
0d2969909f Enable course reruns by default. 
TNL-1380
 2015-02-11 17:16:52 -05:00
David Ormsbee
24fcab7f24 Very rough cut at generating a course outline after publishing. 2015-02-11 16:13:10 -05:00
Adam Palay
d4fff463d1 fix unicode error on cms settings page 2015-02-11 11:02:26 -05:00
Adam
296167e531 Merge pull request #6950 from edx/release 
Release
 2015-02-10 16:06:24 -05:00
stv
405f03a6e9 Remove superfluous empty string check 
Since we began monkey-patching `django.utils.translation` [1], we no
longer need to check for empty strings before translating them.
Previously, the empty string would be translated into translation
metadata. Now, translating the empty string intuitively yields the empty
string.

[1] 86633df3db
 2015-02-10 09:47:48 -08:00
Martyn James
a46b4daf7f Merge pull request #6937 from edx/mjames/SOL-353 
Reorganise reindexing operation
 2015-02-10 10:58:49 -05:00
Calen Pennington
89d4749057 get the raw DescriptorSystem, not the CombinedSystem when instantiating xmodules (TNL-1226) 
get the raw DescriptorSystem, not the CombinedSystem when instantiating xmodules (TNL-1226)

quality fixes

remove trailing comma
 2015-02-10 09:47:44 -05:00
Martyn James
181d0e46c5 Reorganise reindexing operation 2015-02-09 22:13:25 -05:00
Braden MacDonald
2982ecd40d Disabled flaky JS tests pending refactor to Backbone 2015-02-09 15:00:17 -08:00
cahrens
d88b0c488e store.has_course fails on old mongo with unicode chars. 
xml_importer now calls store.has_course even if create_course_if_not_present is False.
 2015-02-09 10:00:33 -05:00
cahrens
78a8fd807a If existing course is found on import, make sure dest_course_id is correct. 
TNL-1362
 2015-02-09 10:00:33 -05:00
cahrens
149c4e78c1 Update tests in reaction to ModuleStoreTestCase cleanup. 2015-02-09 10:00:32 -05:00
cahrens
a89304b991 Cleanup to make tests agnostic to the modulestore being used. 2015-02-09 10:00:32 -05:00
cahrens
040f96223c Update for split modulestore as default. 2015-02-09 10:00:14 -05:00
cahrens
f5d3d6050d Test of draft content depends on old mongo. 2015-02-09 10:00:12 -05:00
cahrens
840b42a9f1 Specify old mongo modulestore. 
Testing migration from old mongo to split.
 2015-02-09 09:26:06 -05:00
cahrens
b5e798062b Specify old mongo modulestore. 
Tests verify operation counts for old mongo. Should be extended to split in the future.
 2015-02-09 09:26:06 -05:00
cahrens
818a950815 Change to work with split modulestore. 
Cannot create an xblock in a course that doesn't exist.
 2015-02-09 09:26:05 -05:00
cahrens
e9f2f626ca Change to work with split modulestore. 
make_asset_key does not start with "/" for split locators.
 2015-02-09 09:26:05 -05:00