Nimisha Asthagiri
780792134a
Merge pull request #7130 from edx/django-upgrade/upgrade-south
...
Django upgrade/upgrade south
2015-02-26 15:56:07 -05:00
Nimisha Asthagiri
d757029fc8
Upgrade South to 1.0.1
2015-02-26 14:57:28 -05:00
Clinton Blackburn
59b4b64937
Fixed Sorting Bug
...
Sorting on unicode value of course ID since CourseLocator objects cannot be compared to SlashSeparatedCourseKey objects.
2015-02-26 14:30:18 -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
Calen Pennington
bbab3a393c
Merge pull request #7127 from edx/django-upgrade/reload-user-session-in-test
...
Reload the user to get the cached profile attribute
2015-02-26 13:55:05 -05:00
Daniel Friedman
e622e63c7b
Catch PluginMissingError when generating component templates
2015-02-26 13:46:28 -05:00
Nimisha Asthagiri
bee58106d7
Merge pull request #7129 from edx/django-upgrade/spelling-errors
...
minor fixes found from the django-upgrade work.
2015-02-26 13:39:59 -05:00
Clinton Blackburn
6a54b1d610
Merge pull request #7126 from edx/django-upgrade/simplejson-to-json
...
Replaced simplejson with json
2015-02-26 13:13:08 -05:00
Daniel Friedman
3538074c7a
Merge pull request #7125 from edx/django-upgrade/backport-changes/SECRET_KEY
...
Backport dummy SECRET_KEYs from django 1.5 upgrade
2015-02-26 12:47:13 -05:00
ahsan-ul-haq
f908059067
Merge pull request #7068 from edx/ahsan/tnl-1511-courseware-section-nav-accessibility-issue
...
<nav> for the courseware section does not include aria label
2015-02-26 22:34:51 +05:00
Calen Pennington
6c0982b214
Force GitExportError messages to be unicode objects
2015-02-26 12:31:41 -05:00
Nimisha Asthagiri
052dd52ae4
minor fixes found from the django-upgrade work.
2015-02-26 12:26:13 -05:00
Calen Pennington
3d8e1d092c
Reload the user to get the cached profile attribute
2015-02-26 12:23:31 -05:00
Clinton Blackburn
2fca3f032f
Replaced simplejson with json
...
simplejson has been removed from future versions of Django (which we will eventually use).
2015-02-26 12:13:46 -05:00
Daniel Friedman
fa968c6218
Backport dummy SECRET_KEYs from django 1.5 upgrade
2015-02-26 11:54:37 -05:00
Sarina Canelake
81ee300132
Merge pull request #7115 from openfun/fun/authors-add-sylvain
...
Added Sylvain to authors.
2015-02-26 11:38:25 -05:00
Ahsan Ulhaq
2caafb22f1
Missing accessible label in lms <nav> elements.
...
many of the nav elements in the lms dont have the accessible labels
TNL-1554
2015-02-26 20:50:29 +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
Jim Abramson
353b8ea45e
Merge pull request #5460 from Kelketek/forum-tracking
...
Do event tracking for major forum events.
2015-02-26 10:14:04 -05:00
Lazybird
8df6500ada
Added Sylvain to authors.
2015-02-26 11:02:03 +01:00
Jonathan Piacenti
be02613aac
Do event tracking for major forum events.
2015-02-25 23:30:30 +00:00
Christina Roberts
9d956e03e7
Merge pull request #7053 from edx/christina/account-api
...
User account API
2015-02-25 17:11:55 -05:00
Christine Lytwynec
8bdd90a5b1
Merge pull request #7037 from edx/clytwynec/flaky_test_decorator
...
Clytwynec/flaky test decorator
2015-02-25 16:35:01 -05:00
cahrens
ae0333cb61
Convert empty string to None for "select" fields, other cleanup.
2015-02-25 15:59:02 -05:00
Ben Patterson
c877c604ef
Merge pull request #7099 from edx/benp/disable-sol-430
...
Disable flaky test.
2015-02-25 14:18:33 -05:00
Ned Batchelder
bcec664329
Merge pull request #7109 from edx/ned/add-spaces
...
Fix sentences jammed together.
2015-02-25 14:16:03 -05:00
Daniel Friedman
086a2ba783
Merge pull request #6771 from edx/dan-f/forums-filter-discussion-modules
...
Check access for discussion modules in forums tab
2015-02-25 13:09:24 -05:00
Ned Batchelder
dd436ed8f9
Fix sentences jammed together.
2015-02-25 12:22:32 -05:00
Martyn James
a44132ec18
Merge pull request #6903 from edx/mjames/SOL-200
...
Adds google drive components to whitelist
2015-02-25 12:04:15 -05:00
Fred Smith
c8f8704a7a
Merge pull request #7107 from edx/ahsan/tnl-1382-css-background-used-home-link-issue-stage
...
CSS issue of the change on the stage
2015-02-25 11:57:21 -05:00
Daniel Friedman
c8434ef9c8
Check access for discussion modules in forums
...
TNL-650
2015-02-25 11:31:18 -05:00
Will Daly
70455d3e36
Merge pull request #7090 from edx/will/cors-debugging
...
Expose CORS_ORIGIN_ALLOW_ALL setting
2015-02-25 11:08:54 -05: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
Ahsan Ulhaq
7c8bdb9d6d
CSS issue of the change on the stage
2015-02-25 19:29:35 +05:00
Awais Qureshi
d9d7899426
Merge pull request #7069 from edx/awais786/ECOM-1086-analytics-certs
...
ECOM-1086 adding tracking event for cert generation.
2015-02-25 18:22:09 +05:00
Awais Qureshi
a36c615c60
Merge pull request #7084 from edx/awais786/ECOM-985-enforce-single-login
...
ECOM-985 fixing the 'NoneType' object has no attribute 'profile'.
2015-02-25 18:21:05 +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
Ben Patterson
c7042bcc81
Disable flaky test.
2015-02-25 07:14:23 -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
Awais
28b633f9df
ECOM-1086 adding tracking event for cert generation.
2015-02-25 10:12:23 +00:00
Awais
1e53a79705
ECOM-985 fixing the 'NoneType' object has no attribute 'profile'.
2015-02-25 10:10:16 +00:00
Ahsan Ulhaq
c0dc67820d
changed aria label messages
2015-02-25 14:24:29 +05:00
Christine Lytwynec
d14c7cf14f
Use flaky from clytwynec fork
2015-02-24 17:34:42 -05:00
Christine Lytwynec
371f7ca403
fix extra_args for lib tests
2015-02-24 17:33:38 -05:00
Christine Lytwynec
35b6e15d9f
add --with-flaky in jenkins script
2015-02-24 17:33:38 -05:00
Christine Lytwynec
ac03f87442
add flaky decorator to StudioLibraryContainerTest.test_out_of_date_message
...
Relates to: TE-745
2015-02-24 17:32:30 -05:00
Christine Lytwynec
c229fcad84
add flaky to requirements file
2015-02-24 17:29:07 -05:00
Clinton Blackburn
c92c8fce7a
Merge pull request #7091 from edx/clintonb/cs-api-fix
...
Fixed Course List Endpoint
2015-02-24 16:24:52 -05:00
Clinton Blackburn
6f7a06657f
Merge pull request #7089 from edx/clintonb/cs-api-fix
...
Fixed Course List Endpoint
2015-02-24 16:24:22 -05:00
