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

38047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renzo Lucioni
c5434c5310 Merge pull request #13125 from edx/renzo/multiple-program-types 
Allow program listing page to display programs from any category
 2016-08-02 13:11:23 -04:00
mikedikan
13c8e39259 Merge pull request #13147 from edx/release 
Release
 2016-08-02 12:29:39 -04:00
mikedikan
e77f91594f Merge pull request #13130 from edx/rc/2016-08-02 
Release Candidate rc/2016-08-02
 2016-08-02 10:28:10 -04:00
alisan617
ba74ba90ea Merge pull request #13035 from OmarIthawi/edraak/rtl-fixups 
Two RTL Fixups in Studio and CAPA problems
 2016-08-02 10:11:45 -04:00
Omar Al-Ithawi
1655625b4b Two RTL Fixups in Studio and CAPA problems 
- Fixed RTL icon margin in the studio
  - Make math equation fields always LTR in CAPA problems
 2016-08-02 11:33:55 +03:00
Saleem Latif
c8fe48b947 Merge pull request #13127 from edx/saleem-latif/MAYN-207 
MAYN-207: Update configuration helpers to take into account microsite configurations
 2016-08-02 09:32:38 +05:00
Renzo Lucioni
8196e1a024 Allow program listing page to display programs from any category 
This work removes most references to XSeries from the LMS in an attempt to be more general. ECOM-5018.
 2016-08-01 16:47:21 -04:00
mikedikan
df63f728db Merge pull request #13135 from edx/release 
Release
 2016-08-01 16:10:04 -04:00
mikedikan
6b9b0925cd Merge pull request #13141 from edx/adam/revert-commit 
Revert "Basic architecture of Maintenance App - SUST-19, SUST-42. Imp…
 2016-08-01 13:05:57 -04:00
Albert (AJ) St. Aubin
153843d784 Merge pull request #13113 from edx/aj/TNL-4950_xBlockCounts 
Script to collect data on the xblock usage within the edx platform, T…
 2016-08-01 12:35:36 -04:00
Chris
685bc2ff81 Merge pull request #13087 from edx/clrux/ac-543 
AC-543 fixing bulk cert exception implicit labels
 2016-08-01 12:16:06 -04:00
Christina Roberts
37db65fa90 Merge pull request #13131 from edx/christina/retry-celery 
Retry on failures (database locking).
 2016-08-01 12:06:46 -04:00
Brian Jacobel
829b7641bf Merge pull request #13081 from edx/bjacobel/eslint 
Replace JSHint with ESLint and the new JavaScript styleguide
 2016-08-01 11:55:00 -04:00
Sven Marnach
d6203b7f43 Merge pull request #13124 from open-craft/smarnach/manage-user 
Add support to set initial password hash to manage_user command.
 2016-08-01 17:53:10 +02:00
Adam Palay
6c743c543a fix failing test by updating require_global_staff decorator 2016-08-01 11:49:51 -04:00
shaunagm
9b48eaf21a Merge pull request #13118 from shaunagm/master 
Change relative paths to absolute paths in in acceptance test imports
 2016-08-01 11:02:12 -04:00
Albert St. Aubin
0d102caa3f Script to collect data on the xblock usage within the edx platform, This script uses the Course block API and returns CSV reports 
Updates for Pep8 compliance

Fixed issues found while testing with greater datasets and found during report review

PR updates (Squash)
 2016-08-01 11:01:15 -04:00
Adam Palay
feb042d474 Revert "Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46" 
This reverts commit 27646b7e6f.
 2016-08-01 10:13:10 -04:00
Saleem Latif
cff28539aa Update configuration helpers to take into account microsite configurations 2016-08-01 18:45:08 +05:00
Aasavari Phanse
8892051070 Merge pull request #13115 from edx/aphanse/modify-coveragerc 
Change python coveragerc file
 2016-08-01 09:10:14 -04:00
Adam
83d0b239c0 Merge pull request #13133 from edx/hotfix/2016-07-29 
test that passing unicode to a youtube id does not throw an error (TN…
 2016-07-29 16:40:16 -04:00
John Eskew
70929ffb12 Merge pull request #13019 from mitocw/fix/aq/emit_course_published_event 
Fixed progress page update on save ccx and grade book crash issue
 2016-07-29 16:02:42 -04:00
Adam Palay
74ab4ad9c8 fix quality failure 2016-07-29 15:28:02 -04:00
Chris Rodriguez
a10b61f8c3 AC-543 fixing bulk cert exception implicit labels 2016-07-29 14:49:23 -04:00
Adam Palay
ec1cbdf513 test that passing unicode to a youtube id does not throw an error (TNL-5127) 2016-07-29 14:07:08 -04:00
Brian Jacobel
9c959b9d3a Add back JSHint tests 2016-07-29 13:27:55 -04:00
Brian Jacobel
af76273393 Install and configure eslint and eslint-config-edx (alongside JSHint for now) 2016-07-29 13:27:55 -04:00
cahrens
7efc7fe40e Retry on failures (database locking). 
TNL-5091
 2016-07-29 11:57:28 -04:00
Amir Qayyum Khan
34034aa6f5 Made ccx id unicode in app 2016-07-29 19:37:46 +05:00
Ben Patterson
2c4ab11658 Merge pull request #12794 from edx/benp/collectstatic-logging 
FEDX-152. Pipe collectstatic results to a file for bok-choy tests.
 2016-07-29 09:58:49 -04:00
Amir Qayyum Khan
d5fcb609e7 Fixed progress page update on save ccx 2016-07-29 18:11:42 +05:00
Ben Patterson
066450d274 FEDX-152. Pipe collectstatic results to a file for bok-choy tests. 2016-07-29 08:11:13 -04:00
wajeeha-khalid
550f8520b4 Merge pull request #12818 from edx/jia/MA-2536 
MA-2536: get 'course_about' url in enrollment
 2016-07-29 16:10:53 +05:00
wajeeha-khalid
986dcff626 MA-2536: get 'course_about' url in enrollment 2016-07-29 14:58:54 +05:00
Sven Marnach
0206dfaea5 Add support to set initial password hash to manage_user command. 2016-07-29 11:19:07 +02:00
wajeeha-khalid
cad10c2302 Merge pull request #13119 from edx/jia/MA-2646 
MA-2646: handle profile_image in requested_fields for anonymous user
 2016-07-29 13:04:24 +05:00
wajeeha-khalid
551fd7eef0 MA-2646: handle profile_image in requested_fields for anonymous user 2016-07-29 11:42:56 +05:00
Shauna Gordon-McKeon
f8d28889b9 Remove unused imports, move too-long imports to multiple lines 2016-07-28 16:35:40 -04:00
Shauna Gordon-McKeon
12a619318e Switch relative to absolute urls in imports (tests/lms part 2) 2016-07-28 16:35:40 -04:00
Shauna Gordon-McKeon
89ed6f1c2b Switch relative to absolute urls in imports (tests/lms part 1) 2016-07-28 16:35:40 -04:00
Shauna Gordon-McKeon
29bb5b50e9 Switch relative to absolute urls in imports (video, discussion, misc) 2016-07-28 16:35:40 -04:00
Shauna Gordon-McKeon
5d50e76eaf Switch relative to absolute urls in imports (tests/studio part 2) 2016-07-28 16:35:40 -04:00
Shauna Gordon-McKeon
787b420539 Switch relative to absolute urls in imports (tests/studio part 1) 2016-07-28 16:35:40 -04:00
Kevin Kim
3a65ca02fe Merge pull request #13023 from edx/kkim/country_tz_api 
Country Time Zone API
 2016-07-28 16:28:47 -04:00
Christina Roberts
a35a6b73e4 Merge pull request #13116 from edx/christina/remove-extra-save 
There is no need to call save after add/remove.
 2016-07-28 15:07:42 -04:00
Kevin Kim
127095b94a Add endpoint for commonly used country time zones 2016-07-28 19:02:55 +00:00
sanfordstudent
194c5096c5 Merge pull request #13123 from edx/sstudent/milestones-fie 
Fixing test failures on master
 2016-07-28 14:59:25 -04:00
Sanford Student
03256937e6 fixing failing tests on master from enabling milestones_app feature flag 2016-07-28 14:18:45 -04:00
PaulWattenberger
59ac60f20e Merge pull request #13117 from edx/pwattenberger/ECOM-5065 
ECOM-5065 Don't retry invalid email response from Sailthru
 2016-07-28 11:15:24 -04:00
PaulWattenberger
dd4bab3cb3 ECOM-5065 Don't treat invalid email response from Sailthru as retryable error 2016-07-28 10:35:10 -04:00