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

28917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ahsan-ul-haq
edb3055207 Merge pull request #7185 from edx/ahsan/tnl-1567-no-main-region-landmark-student-dashboard 
No "Main" region landmark on Student Dashboard
 2015-03-04 21:00:24 +05:00
Ned Batchelder
0b87cef232 Merge pull request #7220 from edx/ned/diff-cover-moved 
Diff-cover moved
 2015-03-04 10:52:08 -05:00
Ned Batchelder
ed2544388a Diff-cover moved 2015-03-04 10:51:38 -05:00
Christine Lytwynec
7676693f4d Merge pull request #7188 from edx/clytwynec/TE-769 
fix bok-choy reporting on failure
 2015-03-04 10:30:07 -05:00
Matt Drayer
119d761cbf Merge pull request #7082 from edx/ziafazal/skip-entrance-exam-am 
Skip entrance exam feature on instructor dashboard
 2015-03-04 07:53:52 -05:00
Zia Fazal
e21ff20375 backend changes based on feedback 
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset

Quality improvements 1/16

added rescore, delete state and task history functionality

added unit tests for entrance exam reset attempts

added unit tests for re scoring of entrance exam and task history

improved test coverage

Got rid of pep violation

feedback changes and added jasmine test

added more jasmine tests for Javascript changes

added bok-choy tests for UI changes

replaced input containing <p> tags with <label>

Removed ee element assertions to avoid js error

Added call to super.setUp()

changes based on feedback on 2/18

Writing tests in JS instead of coffee script

commit related to skip entrance exam 2/13

fixed bad-continuation quality error

fixed broken bok-choy test

changes based on feedback on 2/18

added js tests and removed coffee script tests

fixed broken bok-choy and unit tests

changes left while rebasing

rephrase test titles

do not need these libs

changes based on feedback on 2/24

changes text which was left

Changes based on feedback on 3/3
 2015-03-04 15:32:56 +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
Christine Lytwynec
26d361aca8 Merge pull request #7202 from edx/clytwynec/store_pep8_and_pylint_violation_counts_to_files 
Store count of pep8 and pylint violations to files in reports dir
 2015-03-03 14:34:19 -05:00
Jim Abramson
c351eaf18e Merge pull request #7081 from open-craft/nonunique-discussion-targets 
Fix issues with non-unique discussion targets
 2015-03-03 12:07:26 -05:00
Adam
ff72eada92 Merge pull request #7206 from edx/merge-release-to-master 
Merge release to master
 2015-03-03 11:46:36 -05:00
Sarina Canelake
ba36a26df4 Merge pull request #7207 from delftswa2014/doc_links 
added links to docs for listed libraries in overview.md
 2015-03-03 11:36:09 -05:00
Ben Patterson
375a996dc7 Merge pull request #7200 from edx/benp/flaky-SettingsMilestoneTest-bokchoy 
Flag test as flaky. SOL-449.
 2015-03-03 11:14:10 -05:00
Nimisha Asthagiri
818d59e820 Merge pull request #7197 from edx/bnotions/social-features 
Bnotions/social features
 2015-03-03 11:03:44 -05:00
Adam Palay
b35e43377a Merge remote-tracking branch 'origin/release' into merge-release-to-master 
Conflicts:
	requirements/edx/github.txt
 2015-03-03 11:00:16 -05:00
Adam
e9fed1736e Merge pull request #7201 from edx/hotfix/2015-03-03 
update ora2 hash to address (TNL-1350)
 2015-03-03 10:56:25 -05:00
Matjaz Gregoric
639ab0dc70 Fix issues with duplicate discussion targets. 
When two or more instances of Discussion XBlock were configured
with the same discussion target (Category/Subcategory),
only one of the blocks would be shown on the Course Discussion page.
This was the source of several bugs when trying to edit discussion threads.

This patch adds incrementing numbers to the title of each duplicate
subcategory when rendering the Course Discussion to make sure that
all of the threads are visible in Course Discussion.
 2015-03-03 23:55:15 +08:00
Christine Lytwynec
8919d3f8f7 Store count of pep8 and pylint violations to files in reports dir 2015-03-03 10:47:22 -05:00
Mayank Jain
70db28bbcf added links to docs pages in overview readme 2015-03-03 16:04:55 +01:00
Adam Palay
a6a47c3577 update ora2 hash to address (TNL-1350) 2015-03-03 09:30:36 -05:00
Diana Huang
95387be93b Merge pull request #7193 from edx/diana/enrollment-api-permissions 
Allow the enrollment API to be accessed via API keys.
 2015-03-03 09:19:53 -05:00
Christine Lytwynec
6c93997962 fix bok-choy reporting on failure 2015-03-03 08:52:15 -05:00
chrisndodge
006b06dd21 Merge pull request #7198 from edx/release 
Merge Release back to Master
 2015-03-03 08:49:10 -05:00
Ben Patterson
26d1669f2a Merge pull request #7103 from edx/benp/refactor-events-tests 
Event-testing pattern should be made available in a Mixin.
 2015-03-03 08:45:47 -05:00
Ben Patterson
bda0c06213 Flag test as flaky. SOL-449. 2015-03-03 08:28:57 -05:00
Ben Patterson
3539bac160 Event-testing pattern should be supported by a mixin. 2015-03-03 08:02:29 -05:00
Lee Newton
c375f666d2 bnotions contributions to mobile api 2015-03-02 22:27:27 -05:00
chrisndodge
c8ad51977a Merge pull request #7087 from edx/rc/2015-02-26 
Rc/2015 02 26
 2015-03-02 18:41:37 -05:00
Adam
ee0ae6eef9 Merge pull request #7194 from edx/adam/add-purchasing-logging 
add extra logging for postpay callbacks from cybersource (ECOM-1034) (EC...
 2015-03-02 17:28:08 -05:00
Andy Armstrong
06172e74ef Merge pull request #7137 from edx/andya/profile-api 
Implement profile API
 2015-03-02 17:22:21 -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
Diana Huang
1e4f1b5889 Allow the enrollment API to be accessed via API keys. 
XCOM-107
 2015-03-02 16:07:27 -05:00
Adam Palay
34e8ee6be8 add extra logging for postpay callbacks from cybersource (ECOM-1034) (ECOM-1089) 2015-03-02 16:06:59 -05:00
Will Daly
984f8732f1 Merge pull request #7163 from edx/will/example-certificates 
ECOM-1139: Example certificates.
 2015-03-02 15:38:55 -05:00
Will Daly
4bf608c384 Merge pull request #7191 from edx/hotfix/ecom-1151 
Show the payment section if no contribution amount is selected
 2015-03-02 15:35:04 -05:00
Will Daly
9530021b3f ECOM-1139: Example certificates. 
Add the ability to generate "example" certificates to
test that certificate generation is working correctly for a course.

Add the ability to enable/disable self-generated certificates
on a per-course basis.
 2015-03-02 15:13:26 -05:00
Sarina Canelake
d147a65546 Merge pull request #7192 from edx/sarina/20150302-translations-update 
Update translations (autogenerated message)
 2015-03-02 15:09:25 -05:00
Sarina Canelake
6ccc553fcb Update translations (autogenerated message) 2015-03-02 15:06:43 -05:00
Ben Patterson
28a3e9f5af Merge pull request #7178 from edx/benp/make-pep8-output-easier 
Make pep8 failure output easier to understand.
 2015-03-02 14:01:12 -05:00
Will Daly
c07badecdd Show the payment section if no contribution amount is selected 2015-03-02 14:01:04 -05:00
Ben Patterson
ff2dd93405 Simplify reporting and execution of pep8. 
We are not using the limit flag in the actual run_pep8 method; removing
that from scripts. Operationally, pep8 has been enforcing a limit of
zero for awhile; this finishes that realization.

Also, all pep8 reports now appear under the reports/pep8 folder, rather than
per-system.
 2015-03-02 13:21:35 -05:00
Ben Patterson
7a2384cfd1 Make pep8 failure output easier to understand. 2015-03-02 13:14:23 -05:00
Ben Patterson
ecbfe5c95c Merge pull request #7187 from edx/benp/revert-partof-6998 
Revert "Refactor quality checks"
 2015-03-02 12:49:20 -05:00
Ben Patterson
efbabdb7bb Revert "Extend quality checks to cover more directories" 
This reverts commit 19c767eb52.
 2015-03-02 11:20:53 -05:00
Ben Patterson
9c04df5c7e Revert "Refactor quality checks" 
This reverts commit 747756a911.
 2015-03-02 10:30:21 -05:00
ahsan-ul-haq
57f051b5b2 Merge pull request #7064 from edx/ahsan/tnl-1510-nav-issue-for-footer-and-navigation 
<nav> for the footer and navigation does not include aria-label
 2015-03-02 19:51:21 +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