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

28905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christina Roberts
0eed96c2f3 Merge pull request #7215 from edx/christina/full_name_bug 
Correctly point to MAX_LENGTH instead of MIN_LENGTH.
 2015-03-04 09:27:13 -05:00
Andy Armstrong
1baaf724f8 Merge pull request #7213 from edx/andya/rc-profile-visibility-fix 
Default profile visibility to off for now
 2015-03-03 18:32:35 -05:00
Andy Armstrong
6f118a3d8f Default profile visibility to off for now 2015-03-03 17:52:24 -05:00
cahrens
167bd05ac8 Add bok choy coverage for correctly displayed name and email address. 2015-03-03 17:16:47 -05:00
David Baumgold
67418be9e7 Merge pull request #7214 from edx/clintonb/celery-task-name 
Explicitly naming task
 2015-03-03 17:06:35 -05:00
cahrens
84d91a7901 Correctly point to MAX_LENGTH instead of MIN_LENGTH. 
Bug introduced in recent commit.
 2015-03-03 16:16:20 -05:00
Clinton Blackburn
ebc9c75e36 Explicitly naming task 
This should prevent errors due to relative imports. See http://docs.celeryproject.org/en/latest/userguide/tasks.html#automatic-naming-and-relative-imports for additional information.
 2015-03-03 15:59:19 -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
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
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
Shrhawk
5d34bb0da9 Merge pull request #6859 from edx/shr/bug/TNL-1253-mobile-api-transcript-filname-unicode 
Unicode handling for transcript filename
 2015-03-02 17:36:59 +05:00
Syed Hassan Raza
7b194a3324 Unicode handling for transcript filename 
TNL-1253 https://openedx.atlassian.net/browse/TNL-1253
 2015-03-02 16:39:49 +05:00
Waqas Khalid
4b9dc74cad Add tests for rename import error 2015-03-02 16:09:34 +05:00
Ben Patterson
e8a1e810f7 Merge pull request #7176 from edx/benp/fix-pep8-20150227 
Fix pep8 violation.
 2015-02-28 08:26:51 -05:00
Clinton Blackburn
dc491c4c10 Merge pull request #7156 from edx/clintonb/cs-celery-serialize-fix 
Fixed Celery Serialization Bug
 2015-02-27 19:57:05 -05:00
Ben Patterson
fc0b728939 Fix pep8 violation. 2015-02-27 17:35:44 -05:00
Andy Armstrong
d42adcf46b Merge pull request #7123 from edx/christina/account-api 
Add name and email change requests to accounts API.
 2015-02-27 17:21:17 -05:00