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
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
Jason Zhu
ef257fb50b To support UNICODE xblock.location 
When people use unicode course org name(e.g Chinese) ,urllib.quote cannot format unicode char like:

```shell
>>> import urllib
>>> loc = 'i4x://创联/7302478/chapter/4ab413b41ad9447db41668bed03f149f'
>>> urllib.quote(loc)
'i4x%3A//%E5%88%9B%E8%81%94/7302478/chapter/4ab413b41ad9447db41668bed03f149f'
>>> urllib.quote(unicode(loc))
Traceback (most recent call last):
  File "<console>", line 1, in <module>
UnicodeDecodeError: 'ascii' codec can't decode byte 0xe5 in position 6: ordinal not in range(128)
>>>
```
so I open this pull
 2015-03-03 20:27:54 +08: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
Ben Patterson
eb4f852916 Pipe complexity report to reports dir. 2015-03-02 16:03:31 -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
Ahsan Ulhaq
206961f0b4 No "Main" region landmark on Student Dashboard 
On student dashboard currently there was currently no main region landmark.
So added the role with the main conents of the dashboard.

TNL-1567
 2015-03-02 13:55:58 +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
cahrens
3ed31c2b1b Add name change and email change support to accounts API. 
Name change is immediate, email change is multi-step.
 2015-02-27 16:35:05 -05:00
Alison Hodges
4666caa63d Fixes DOC-1472, DOC-1713, DOC-1613, DOC-1714, DOC-1715 2015-02-27 16:22:01 -05:00
Sarina Canelake
a11f287769 Merge pull request #6998 from stvstnfrd/quality/pep8 
Extend PEP8 coverage
 2015-02-27 15:53:45 -05:00
Christina Roberts
99e85556ea Merge pull request #7140 from edx/christina/delete-enable-new-dashboard 
Delete ENABLE_NEW_DASHBOARD code.
 2015-02-27 15:37:41 -05:00
Calen Pennington
820b0118f4 Merge pull request #7155 from edx/django-upgrade/unicode-csrf-tokens 
Teach edx-mako to force csrf_tokens to unicode (from smart_strings)
 2015-02-27 15:33:43 -05:00
stv
4131898180 Remove "nopep" pragma 2015-02-27 11:49:51 -08:00
stv
747756a911 Refactor quality checks 2015-02-27 11:49:48 -08:00
Calen Pennington
cbcb0ee8ab Teach edx-mako to force csrf_tokens to unicode (from smart_strings) 2015-02-27 13:38:16 -05:00
cahrens
61a108d377 Delete unused code for changing email. 2015-02-27 13:20:57 -05:00
stv
49925873f5 Fix PEP8: W292 no newline at end of file 2015-02-27 10:04:53 -08:00
stv
f994912cd8 Fix PEP8: W291 trailing whitespace 2015-02-27 10:04:53 -08:00
stv
40cb737298 Fix PEP8: E128 continuation line under-indented 
for visual indent
 2015-02-27 10:04:52 -08:00