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

29453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Martyn James
8acdf532fc Merge pull request #7066 from edx/dcikatic/SOL-259 
SOL-259 Change HTML content listed type in index from HTML Content to Te...
 2015-02-24 16:06:48 -05:00
Martyn James
d879905758 Merge pull request #6914 from edx/dcikatic/courseware_search_index_DRF 
Changing search_reindex call to be more inline with DRF convention
 2015-02-24 16:06:16 -05:00
Jonathan Piacenti
f952a33ec3 Make UI styling consistent between libraries and courses tabs when empty. 2015-02-24 20:29:54 +00:00
David Baumgold
3a9a7961ba Merge pull request #7093 from edx/pylint-6k 
Pylint violations are below 6000
 2015-02-24 15:14:34 -05:00
Clinton Blackburn
0385a8b504 Fixed Course List Endpoint 
Updated filter to ensure only course descriptors are returned.
 2015-02-24 14:42:47 -05:00
David Baumgold
a1fc25b848 Pylint violations are below 6000 2015-02-24 13:14:55 -05:00
Will Daly
e9bb688911 Expose CORS_ORIGIN_ALLOW_ALL setting 2015-02-24 12:05:25 -05:00
Ned Batchelder
d8a4529433 Merge pull request #7088 from edx/ned/move-docs-to-docs 
Move internal documentation to the internal documentation directory
 2015-02-24 12:03:54 -05:00
cahrens
450c0e34f5 Enforce content_type of 'application/merge-patch+json' for merge patch. 2015-02-24 11:32:28 -05:00
David Baumgold
3b06d71198 Merge pull request #7078 from edx/db/upgrade-pip 
Use pip 6.0.8
 2015-02-24 11:03:56 -05: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
Ned Batchelder
1b7e8b784a Move internal documentation to the internal documentation directory 2015-02-24 10:55:16 -05:00
Ned Batchelder
a76e5c68cb Merge pull request #7083 from edx/ned/readme-rst 
Convert README.md to README.rst
 2015-02-24 10:52:00 -05:00
Ben Patterson
954d8ed9a0 Merge pull request #7070 from edx/benp/fix-tnl1479 
Wait for DOM to reflect the selected option.
 2015-02-24 10:49:47 -05:00
Adam
0b9e5719c1 Merge pull request #7080 from edx/adam/merge-release-into-master 
Adam/merge release into master
 2015-02-24 06:40:10 -08: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
Nimisha Asthagiri
b280e44fe1 Merge pull request #7025 from edx/mobile/oauth2-allow-inactive-user 
MA-291 Allow API access without email activation.
 2015-02-24 09:12:30 -05:00
Ben Patterson
8e7c17d50f Wait for DOM to reflect the selected option. 
TNL-1479
 2015-02-24 08:24:39 -05:00
Adam Palay
338ab4a6a9 fix quality violation 2015-02-24 08:20:04 -05:00
Ned Batchelder
0b41d0f226 Convert README.md to README.rst 2015-02-24 07:03:43 -05:00
Nimisha Asthagiri
83a3adb97b MA-291 Allow API access without email activation 2015-02-24 06:05:18 -05:00
Adam Palay
3aca0d5472 Merge remote-tracking branch 'origin/release' into adam/merge-release-into-master 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/bulk_email/tasks.py
 2015-02-23 18:40:45 -05:00
Matt Drayer
9856deedba Merge pull request #6668 from edx/ziafazal/entrance-exam-management-on-instructor-dashboard-am 
Ziafazal/entrance exam management on instructor dashboard
 2015-02-23 16:29:09 -05:00
Adam
320d481250 Merge pull request #7072 from edx/hotfix/2015-02-23 
split up bulk email query for students and unenrolled course staff (TNL-...
 2015-02-23 13:17:26 -08: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
cahrens
09c607c67c Get profile object from user, clarify null or "". 2015-02-23 15:18:15 -05:00