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

35257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Armstrong
b46648eebf Merge pull request #11528 from edx/andya/add-js-monitoring-package 
Add monitoring version of package.json
 2016-02-12 13:40:07 -05:00
Andy Armstrong
7a6495ce2f Add monitoring version of package.json 2016-02-12 12:40:01 -05:00
Renzo Lucioni
4c79aba087 Merge pull request #11527 from edx/renzo/unclosed-p-tag 
Close unclosed p tag
 2016-02-12 12:15:27 -05:00
Kevin Falcone
4037b16af6 Merge pull request #11519 from edx/jibsheet/document-nose-breakpoints-twice 
Copy this doc up from the bok_choy tests.
 2016-02-12 11:41:22 -05:00
wajeeha-khalid
7a9fea0236 Merge pull request #11450 from edx/jia/MA-1985 
MA-1985 add analytics event to thread/comment vote
 2016-02-12 21:13:45 +05:00
Usman Khalid
1a66726a50 Merge pull request #11531 from edx/usman/deprecate-randomize 
Add Randomize XBlock to DEPRECATED_BLOCK_TYPES.
 2016-02-12 20:55:11 +05:00
Kevin Falcone
21b75f83aa Copy this doc up from the bok_choy tests. 
It's just as relevant to unit tests and I wish I had seen it earlier.

Stress the transient nature of this debugging step.
 2016-02-12 10:27:03 -05:00
Usman Khalid
ec6a786400 Add Randomize XBlock to DEPRECATED_BLOCK_TYPES. 2016-02-12 19:54:41 +05:00
Eric Fischer
406066ca51 Merge pull request #11525 from edx/efischer/fix_global_message 
Fix config_model admin view
 2016-02-12 08:55:45 -05:00
Eric Fischer
6394238004 Exclude Reverse Foreign Keys from list_display 
These types of fields do not need to be included, and attempting
to do so causes everything to break.
 2016-02-12 08:54:25 -05:00
raeeschachar
04ca0af54c Merge pull request #11500 from edx/raees/chrome-bok-choy-test-stores-speed-for-multiple 
Fixed test_video_component_stores_speed_correctly_for_multiple_videos…
 2016-02-12 11:22:07 +05:00
Renzo Lucioni
60a3029d8b Close unclosed p tag 2016-02-11 22:18:02 -05:00
Andy Armstrong
756c8a4662 Merge pull request #11521 from edx/andya/fix-afontgarde-loading 
Fix bug with loading AFontGarde
 2016-02-11 21:33:20 -05:00
Ned Batchelder
462d0c04de Merge pull request #11524 from edx/ned/merge-dogwood-to-master 
Merge Dogwood to master
 2016-02-11 17:25:30 -05:00
Ned Batchelder
d8b9dec51e Update this command for Django 1.8 2016-02-11 15:39:35 -05:00
Ned Batchelder
432a40f035 Update post_cohort_management_fix to Django 1.8 2016-02-11 15:39:35 -05:00
Jesse Zoldak
794cecec13 Merge pull request #11517 from edx/clintonb/package-uninstall-fix 
Fixed package uninstall for django-oauth2-provider
 2016-02-11 15:25:27 -05:00
Peter Fogg
9b5b7837b5 Merge pull request #11516 from edx/peter-fogg/course-full-logging 
Better error logging for full courses during enrollment.
 2016-02-11 14:04:28 -05:00
Andy Armstrong
2ec7c17a45 Fix bug with loading AFontGarde 
The code isn't ready to start using AFontGarde from
the Pattern Library yet, so I've reverted the code back
to loading the copies from the vendor library.
 2016-02-11 13:52:50 -05:00
Peter Fogg
77343a02d2 Merge pull request #11486 from itsbenweeks/info_display_number_fix 
info page course id -> display_number_with_default
 2016-02-11 12:53:21 -05:00
wajeeha-khalid
72aeb2c8da implemented test event data for thread/comment vote 2016-02-11 22:30:41 +05:00
Clinton Blackburn
8af930d2eb Fixed package uninstall for django-oauth2-provider 
edx-django-oauth2-provider is being mistaken for django-oauth2-provider. Making the filter less liberal ensures we properly uninstall django-oauth2-provider once.

ECOM-3647
 2016-02-11 11:46:38 -05:00
wajeeha-khalid
3312eb2d22 refactored code into exclusive functions 2016-02-11 21:31:44 +05:00
wajeeha-khalid
fe9b1a0d80 add analytics event to thread/comment vote 2016-02-11 21:31:44 +05:00
Calen Pennington
1f9e90ef4b Merge pull request #11468 from cpennington/program-cert-retries 
Program cert retries
 2016-02-11 11:28:10 -05:00
Douglas Hall
d808456452 Merge pull request #11458 from edx/hasnain-naveed/PHX-244 
PHX-244 / Added two extra field in credit API and bump the version up
 2016-02-11 10:46:09 -05:00
Ned Batchelder
588ce63959 Merge pull request #11515 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-02-11 10:32:39 -05:00
Ben Weeks
52e8db34fd course id/org/name -> display_stuff_with_default 2016-02-11 10:25:12 -05:00
Peter Fogg
a7b1f79d3e Better error logging for full courses during enrollment. 
ECOM-3685
 2016-02-11 09:54:15 -05:00
Clinton Blackburn
90e1b62649 Merge pull request #11513 from edx/clintonb/package-uninstall-fix 
Updated expected version for python_uninstall_version.txt
 2016-02-11 08:47:19 -05:00
Ned Batchelder
4b7dcb2bdd Update translations (autogenerated message) 2016-02-11 12:23:55 +00:00
raeeschachar
c6d2373156 Fixed test_video_component_stores_speed_correctly_for_multiple_videos failing on Chrome 2016-02-11 15:47:07 +05:00
Hasnain
d06edc680b Added two fields in credit API 2016-02-11 10:13:37 +00:00
Muzaffar yousaf
a26d576458 Merge pull request #11499 from mehrozezahid/mehrozezahid/TNL-4096 
Added target='_blank' to both cohort external doc links.
 2016-02-11 12:46:32 +05:00
Clinton Blackburn
f78945bd1d Updated expected version for python_uninstall_version.txt 
Follow up to #11432. This value needs to be incremented to ensure the old package is uninstalled.

ECOM-3647
 2016-02-10 19:46:55 -05:00
Renzo Lucioni
074b83ab8b Merge pull request #11511 from edx/renzo/programs-warning 
Address ProgramsApiConfig deprecation warning
 2016-02-10 16:59:51 -05:00
sanfordstudent
d5cee7b376 Merge pull request #11471 from edx/sstudent/MA-1881-null-translation-check 
ma-1881 handling empty translations and testing
 2016-02-10 16:59:09 -05:00
Christina Roberts
fb45a6f33d Merge pull request #11509 from edx/christina/course-global 
Ensure window.course is available before anyone accesses it.
 2016-02-10 16:55:56 -05:00
Clinton Blackburn
219b7f75cf Merge pull request #11432 from edx/clintonb/oauth-client-credentials 
Updated django-oauth2-provider
 2016-02-10 16:44:37 -05:00
cahrens
30c42e724d Ensure that window.course is avaiable before anyone accesses it. 
TNL-4106
 2016-02-10 15:59:45 -05:00
Renzo Lucioni
3809422798 Address ProgramsApiConfig deprecation warning 2016-02-10 15:58:15 -05:00
Sanford Student
24c4c8abed ma-1881 handling empty translations and testing 
using lists for json serializability, if that's a word
 2016-02-10 15:56:42 -05:00
Peter Fogg
5d0ed333a5 Merge pull request #11502 from edx/peter-fogg/audit-cert-cutoff-date 
Explicitly cut off cert eligibility.
 2016-02-10 15:41:16 -05:00
Clinton Blackburn
85591696d8 Merge pull request #11497 from openfun/openfun/fix_generate_course_structure 
Fix generate_course_structure command.
 2016-02-10 13:29:00 -05:00
Calen Pennington
1e74cd0c88 Split up package imports from single name imports 2016-02-10 12:43:51 -05:00
Calen Pennington
5c79e25047 Retry the task to grant Programs credentials (which is idempotent) if any constituent program fails 2016-02-10 12:43:05 -05:00
Calen Pennington
22e91bccde Retry Programs tasks when connection to the API is disabled 2016-02-10 12:36:33 -05:00
Calen Pennington
36b0c593cc Retry failed Programs tasks using exponential backoff and a configurable retry limit 2016-02-10 12:36:30 -05:00
Calen Pennington
3940b1ba44 Add configuration for retries to ProgramsApiConfig 2016-02-10 12:36:29 -05:00
Peter Fogg
2d028f8246 Add an explicit cutoff date for audit cert granting. 
The previous logic was a convoluted way of doing the same thing, and
has already led to one bug. Instead of hoping that the bugs are ironed
out now and that future devs maintain this logic properly, let's just
set a real cutoff date.
 2016-02-10 12:16:37 -05:00