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

5756 Commits

Author SHA1 Message Date
Sarina Canelake
4133740a2f Add default logo to Studio 2015-03-06 13:05:03 -05:00
David Baumgold
dca05a6095 Merge branch 'release' 2015-03-06 08:54:22 -05:00
Xavier Antoviaque
7338cc1286 Merge pull request #7148 from open-craft/library-selector 
Show a select box when editing a library content block (SOL-123)
 2015-03-06 09:16:02 +01:00
John Eskew
4cb4557176 Merge pull request #7151 from open-craft/ekolpakov/settings-service 
SettingsService for accessing django settings from XBlock
 2015-03-05 15:56:11 -05:00
ahsan-ul-haq
c430eaed55 Merge pull request #7086 from edx/ahsan/tnl-1520-studio-nav-label-accessibility-issue 
Studio header nav label accessibility issue
 2015-03-06 00:27:06 +05:00
E. Kolpakov
c225d86e83 SettingsService for accessing server-wide settings from XBlock 2015-03-05 18:24:47 +03:00
Ahsan Ulhaq
4b92a16689 add generic sr for <h2> 2015-03-05 15:38:20 +05:00
Greg Price
83c474622e Fix 500 errors on video upload page 
Some status strings were accidentally tuples thanks to stray commas, and
ugettext raised an exception as a result.

JIRA: MA-323
 2015-03-04 18:15:48 -05:00
Braden MacDonald
93e5a56d79 Show a select box when editing a library content block 2015-03-04 13:32:15 -08:00
Ned Batchelder
7641fbf5d9 Merge pull request #6505 from mitocw/cg/add_sga 
Add Staff Graded Assignments XBlock to edx-platform
 2015-03-04 13:15:02 -05:00
Sarina Canelake
2a95fe6228 Merge pull request #7101 from openfun/fun/xblock-authoring-fix-settings-import 
Fixed an import issue with django settings - in xblock authoring module.
 2015-03-04 11:23:40 -05:00
ahsan-ul-haq
635194a9eb Merge pull request #7092 from edx/ahsan/tnl-1523-studio-footer-accessible-label-issue 
footer <nav> accessibility issue
 2015-03-04 21:01:41 +05:00
ahsan-ul-haq
4ee02e2317 Merge pull request #7098 from edx/ahsan/tnl-1531-inaccessible-label-for-page-action-nav-studio 
Inaccessible label for the page action Navigation
 2015-03-04 21:01:15 +05:00
ahsan-ul-haq
52ab7ec545 Merge pull request #7100 from edx/ahsan/tnl-1532-course-settings-nav-accessibility-issue 
Course settings nav accessibility issue Studio
 2015-03-04 21:00:52 +05:00
Carson Gee
da9154d10e Add Staff Graded Assignments XBlock to edx-platform 2015-03-04 10:35:54 -05:00
Will Daly
7bad603978 Merge pull request #7076 from edx/will/deprecate-embargo 
Deprecate old embargo implementation.
 2015-03-03 15:54:41 -05:00
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
Lazybird
7148af88df Fixed an import issue with django settings - in xblock authoring module. 
Now importing settings module from 'django.conf' instead of 'cms.envs.common'.
 2015-02-25 14:09:28 +01:00
Ahsan Ulhaq
2f79948982 Course settings nav accessibility issue Studio 
course settings <nav> elements in the studio does not include accessible
label which results into much confusion for the screen reader users.

TNL-1532
 2015-02-25 17:47:08 +05:00
Ahsan Ulhaq
ed944fdb0e Inaccessible label for the page action Navigation 
<nav> elements for the actions a user can perform on a perticular
page contain inaccessible label whic causes screen reader users
confusion regarding to their current navigation.

TNL-1531
 2015-02-25 16:40:03 +05:00
Ahsan Ulhaq
c0dc67820d changed aria label messages 2015-02-25 14:24:29 +05:00
Jonathan Piacenti
f952a33ec3 Make UI styling consistent between libraries and courses tabs when empty. 2015-02-24 20:29:54 +00:00
Ahsan Ulhaq
e0aa5c509e footer <nav> accessibility issue 
<nav> in the footer of the studio does not have accessible label(aria-label,
aria-labelledby) which causes accessibility issues for the screen reader users.

TNL-1523
 2015-02-24 20:58:51 +05:00
Dino Cikatic
b597df2e39 Changing search_reindex call to be more inline with DRF convention 2015-02-24 10:58:50 -05:00
Ahsan Ulhaq
2be5e70056 Studio header nav label accessibility issue 
<nav> in the header of studio does not have accessible label. this causes
some issues for screen reader users.

TNL-1520
 2015-02-24 19:37:49 +05:00
Will Daly
ae8ddc8aee Deprecate old embargo implementation. 
The new "country access" implementation replaces the old
implementation.  Middleware and tests have been updated
accordingly, but deprecated models are preserved
for backwards compatibility.
 2015-02-23 15:48:04 -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