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

38641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christina Roberts
4c8be2bfd2 Merge pull request #13557 from edx/rc/2016-09-27 
Release Candidate rc/2016-09-27
 2016-09-28 09:25:37 -04:00
Christina Roberts
0561533b03 Merge pull request #13580 from edx/revert-13567-aj/fix-celery-email-sending-on-registration 
Revert "Fix user registration "
 2016-09-27 10:56:45 -04:00
attiyaishaque
e8f109a328 Revert "ECOM-5281 Add retires for email sending while registering." 
This reverts commit 4bbeaf32ae.
 2016-09-27 17:21:24 +05:00
attiyaishaque
648bc7efb4 Revert "Adding celery task for sending activation email." 
This reverts commit fe136122db.
 2016-09-27 17:20:57 +05:00
Awais Jibran
b74e964d7c Revert "Fix user registration " 2016-09-27 16:19:34 +05:00
Christina Roberts
2845b66d26 Merge pull request #13568 from open-craft/haikuginger/update-dnd-2.0.10 
[SOL-2077] Re-updating DnDv2 to 2.0.10
 2016-09-26 13:14:42 -04:00
Awais Jibran
0a1f5c4032 Merge pull request #13567 from edx/aj/fix-celery-email-sending-on-registration 
Fix user registration
 2016-09-26 22:08:54 +05:00
Jesse Shapiro
bea2d8faf2 Re-updating DnDv2 to 2.0.10 2016-09-26 09:46:17 -04:00
Awais Jibran
10f6bd1703 Celery need to serialize the arguments for a task. Here, user is not serializable,replace it with ID. ECOM-5784 2016-09-26 18:15:25 +05:00
Ben Patterson
07af5211ed Merge pull request #13556 from edx/revert-13555-haikuginger/update-dnd-2.0.10 
Revert "[SOL-2077] Update DnDv2 version to 2.0.10"
 2016-09-23 12:42:45 -04:00
Ben Patterson
9fac9fb11a Revert "[SOL-2077] Update DnDv2 version to 2.0.10" 2016-09-23 12:39:27 -04:00
Jesse Shapiro
8c3d122002 Merge pull request #13555 from open-craft/haikuginger/update-dnd-2.0.10 
[SOL-2077] Update DnDv2 version to 2.0.10
 2016-09-23 11:43:57 -04:00
Alison Hodges
11892dcbe4 Merge pull request #13452 from shailysangwan/master 
replaced static with dynamically generated copyright year
 2016-09-23 11:19:03 -04:00
Jesse Shapiro
b3feb7f3ff Update DnDv2 version to 2.0.10 2016-09-23 09:29:11 -04:00
Shaily Sangwan
fc639afa11 replaced static with dynamically generated copyright year 2016-09-23 18:01:46 +05:30
Attiya Ishaque
c3580e207b Merge pull request #13392 from edx/atiya/add-retries-in-registration 
ECOM-5281 Add retires for email sending while registering.
 2016-09-23 16:06:26 +05:00
attiyaishaque
fe136122db Adding celery task for sending activation email. 2016-09-23 11:43:26 +05:00
attiyaishaque
4bbeaf32ae ECOM-5281 Add retires for email sending while registering. 2016-09-23 11:43:26 +05:00
Awais Jibran
45e243da5c Merge pull request #13480 from edx/aj/fix-password-rest-confirm 
Show error on password reset form
 2016-09-23 09:56:25 +05:00
alisan617
fb35ffb07d Merge pull request #13449 from edx/alisan/discussion-sidebar-topics-menu-TNL-5169 
Add aria attributes to discussion topics sidebar
 2016-09-22 17:48:57 -04:00
Ned Batchelder
358788255c Merge pull request #13546 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-09-22 17:12:47 -04:00
Douglas Hall
a9939fa1a6 Merge pull request #13543 from edx/douglashall/AC-578/fix_typo 
AC-578 Fix marketing link key typo
 2016-09-22 15:54:48 -04:00
alisan617
0ffeb4639b Make the left sidebar in Discussion page accessible 
TNL-5169
 2016-09-22 15:28:29 -04:00
Douglas Hall
9f29a889a6 Fix marketing link key typo 2016-09-22 14:18:50 -04:00
Eric Fischer
1b1bb94887 Merge pull request #13522 from edx/efischer/standardize_grades_logging 
Standardize logged errors
 2016-09-22 13:51:18 -04:00
Ned Batchelder
0a2e7363e7 Update translations (autogenerated message) 2016-09-22 17:35:44 +00:00
Nimisha Asthagiri
4202546158 Merge pull request #13533 from edx/beryl/integration-tests 
Grades python integration tests
 2016-09-22 13:24:37 -04:00
Andy Armstrong
810835700a Merge pull request #13527 from edx/release 
Release
 2016-09-22 13:05:33 -04:00
Nimisha Asthagiri
613652b74a Test: Rescoring problem updates grades accordingly 
TNL-5465
TNL-802
 2016-09-22 12:01:19 -04:00
Nimisha Asthagiri
e1f5e40f69 Test: Changing assignment weight changes course grade 
TNL-5465
 2016-09-22 11:58:41 -04:00
Eric Fischer
9b9ab2e44f Standardize logged errors 
For easier consumption by splunk, match the pattern used by other grades-
related log statements. Also, reduce the firehose of events being logged
in splunk.
 2016-09-22 11:53:12 -04:00
Asad Iqbal
0b7ec75a3f Merge pull request #13492 from edx/asadiqbal08/WL-603-edx 
WL-603 load locale paths for themes directories
 2016-09-22 16:28:19 +05:00
asadiqbal
2833d1e9a5 WL-603 load locale paths for themes directories 2016-09-22 13:26:11 +05:00
Awais Jibran
3f21b0718f Show error message on password reset if provided passwords does not match. 2016-09-22 10:36:53 +05:00
Andy Armstrong
1360804842 Merge pull request #13530 from edx/hotfix/2016-09-21 
Revert "[SOL-1953] Update Commerce Configuration"
 2016-09-21 17:11:12 -04:00
Calen Pennington
d145457bb4 Merge pull request #13152 from edx/add-openedx-yaml 
Add an OEP-2 compliant openedx.yaml file
 2016-09-21 16:51:27 -04:00
Michael Frey
c52ba6ac75 Revert "[SOL-1953] Update Commerce Configuration" 2016-09-21 15:33:02 -04:00
sanfordstudent
5b7f48c5ed Merge pull request #13495 from edx/beryl/test-explicit-graded 
tests for changing grade policy
and moving progress page tests into separate file
 2016-09-21 12:28:33 -04:00
Chris
4f28b81fee Merge pull request #13334 from edx/clrux/ac-571-video-transcript-download 
AC-571 updating video download/transcript area
 2016-09-21 10:32:20 -04:00
Sanford Student
a98e33afd8 TNL-5466 tests for changing grade policy 
and moving progress page tests into separate file
 2016-09-21 09:48:46 -04:00
Albert (AJ) St. Aubin
13d7ea46d5 Merge pull request #13524 from Stanford-Online/giulio/revert-ajax-fa-spinner 
Revert "Add fa loading spinner to CAPA problems"
 2016-09-21 07:54:13 -04:00
Andy Armstrong
777964b9aa Merge pull request #13501 from edx/rc/2016-09-20 
Release Candidate rc/2016-09-20
 2016-09-20 21:59:12 -04:00
Ned Batchelder
2e91174411 Merge pull request #13523 from stvstnfrd/up/clean/delete-course 
Remove outdated comment
 2016-09-20 16:56:35 -04:00
Giulio Gratta
0eca0eadaf Revert "Add fa loading spinner to CAPA problems" 
This reverts commit a3eb726f5f.
 2016-09-20 12:56:20 -07:00
stv
8a27ba05e3 Remove outdated comment 
The `commit` argument had already been removed from code [1][2][3],
prompted by the django18 upgrade.

[1] https://github.com/edx/edx-platform/pull/10927
[2] 07f015bb57
[3] a4006c8604
 2016-09-20 12:21:52 -07:00
Andy Armstrong
1b39ca124e Merge pull request #13519 from edx/bjacobel/TNL-5586 
Fix alignment of "mark as answer button" by adding btn-link class
 2016-09-20 13:51:11 -04:00
Brian Jacobel
1c90b3186a Fix alignment of "mark as answer button" by adding btn-link class 
TNL-5586
 2016-09-20 11:30:49 -04:00
Douglas Hall
2a0bdeb386 Merge pull request #13508 from edx/douglashal/HULL-103/provide_course_root_to_email_template 
HULL-103 Add the course root to the bulk email template context so that templa…
 2016-09-20 06:31:00 -04:00
Chris Rodriguez
0ebc90472c AC-571 updating video download/transcript area 2016-09-20 06:22:24 -04:00
wajeeha-khalid
eb11c6299d Merge pull request #13431 from edx/jia/MA-2663 
MA-2663: Donot mark thread unread on any action but creation
 2016-09-20 14:57:39 +05:00