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

7161 Commits

Author SHA1 Message Date
Christina Roberts
256223d07b Merge pull request #13052 from edx/alisan/capa-problem-button-bar-tnl4880 
Problem (capa) feedback rework
 2016-10-06 21:20:25 -04:00
Andy Armstrong
9f08457c53 Merge pull request #13675 from edx/andy/move-service-status 
Move service_status from common into openedx
 2016-10-06 20:16:07 -04:00
Nimisha Asthagiri
8ebc4106f2 Merge pull request #13673 from edx/common_cleanup/cache_toolbox 
Move cache_toolbox from common to openedx/core
 2016-10-06 18:07:46 -04:00
muhammad-ammar
c3b6b10478 Problem (capa) feedback UX revamp. 
TNL-4877
 2016-10-06 17:34:43 -04:00
Nimisha Asthagiri
2c7975f804 Move cache_toolbox from common to openedx/core. 2016-10-06 16:57:00 -04:00
John Eskew
24d29be3f3 Merge pull request #13667 from edx/jeskew/move_monkey_patch 
Move monkey_patch to openedx.core.djangoapps.
 2016-10-06 14:32:35 -04:00
Andy Armstrong
a63bb0e50f Merge pull request #13664 from edx/andya/common-refactoring 
Move pipeline_js Django app into CMS
 2016-10-06 14:24:45 -04:00
Andy Armstrong
a75f64b6c0 Move service_status from common into openedx 2016-10-06 13:37:35 -04:00
Andy Armstrong
0f18b740c8 Move pipeline_js Django app into CMS 
Note: this used to be in common, but it was only used in Studio.
 2016-10-06 12:08:04 -04:00
Ned Batchelder
4fe01bfb88 Update translations (autogenerated message) 2016-10-06 14:35:43 +00:00
John Eskew
fab11b90d7 Move monkey_patch to openedx.core.djangoapps. 2016-10-06 10:16:14 -04:00
Andy Armstrong
ecf4515b6e Introduce id verification step for proctored exams 
TNL-5083
 2016-10-05 17:22:35 -04:00
Jesse Shapiro
22c42dbf78 Merge pull request #13602 from open-craft/haikuginger/deprecate-dnd-v1 
[SOL-1612] Add DnDv2 to advanced problems; relabel DnDv1 as deprecated
 2016-10-05 15:28:50 -04:00
Jesse Shapiro
47d18c35fe Add DnDv2 to advanced problems; relabel DnDv1 as deprecated 2016-10-05 09:22:35 -04:00
Alison Hodges
9c27a8ec82 Merge pull request #13477 from deepsrijit1105/master 
Lower case the term partner manager in UI strings
 2016-09-30 10:50:42 -04:00
Ned Batchelder
7dce728108 Update translations (autogenerated message) 2016-09-29 14:59:41 +00:00
cahrens
e77b5eb3c3 Merge with release. 2016-09-28 09:58:14 -04:00
Deepa
39ec546e12 Lower case the term partner manager in UI strings 2016-09-28 00:18:19 +05:30
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
Matjaz Gregoric
344c72b3e2 Use non-ascii PLATFORM_NAME in tests. 
It should help catch unicode encoding problems earlier.

This also updates python-saml dependency to a version that includes a
patch for unicode strings.
 2016-09-23 15:38:23 +02: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
Ned Batchelder
0a2e7363e7 Update translations (autogenerated message) 2016-09-22 17:35:44 +00: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
Ned Batchelder
2e91174411 Merge pull request #13523 from stvstnfrd/up/clean/delete-course 
Remove outdated comment
 2016-09-20 16:56:35 -04: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
8b8339b129 Merge pull request #11999 from raccoongang/kssl/show_location_id_xblock 
Show location in the settings xblock.
 2016-09-15 22:38:33 -04:00
Ned Batchelder
ab819d1273 Update translations (autogenerated message) 2016-09-15 11:27:16 +00:00
Oksana Slusarenro
e3f55afc41 Changed "Location ID" to "Component Location ID" 2016-09-15 10:52:00 +03:00
Eric Fischer
31953c5e0c Update correct persistent score 
* First take at forcing a subsection's grade to update when a signal is
  sent that a problem's score has changed
* Refactor signal handler connection.
* Expand bokchoy tests to cover progress page
* Add some grading unit tests

TNL-5394
TNL-5364
 2016-09-08 15:09:05 -04:00
Renzo Lucioni
948c1bd8ae Merge pull request #13408 from edx/renzo/display-catalog-micromasters 
Retrieve marketable MicroMasters from the catalog service
 2016-09-08 09:47:20 -04:00
Renzo Lucioni
37523939f2 Retrieve marketable MicroMasters from the catalog service 
Catalog-based MicroMasters need to be displayed in the LMS. However, the LMS currently retrieves all program data from the soon-to-be-retired programs service. Consuming program data exclusively from the catalog service is out of the question right now; it's too complex to confidently pull off in a week. This is a functional middle ground introduced by ECOM-5460. Cleaning up this debt is tracked by ECOM-4418.
 2016-09-07 17:44:54 -04:00
Matt Drayer
e53721433f Merge pull request #13413 from edx/release 
Merge release back to master
 2016-09-07 11:30:24 -04:00
J. Cliff Dyer
1371739f45 Register block_structure djangoapp. 
TNL-5274
 2016-09-06 11:42:38 -04:00
Oksana Slusarenro
943757a79e Show location in the settings xblock. 2016-09-04 15:12:39 +03:00
Ehtesham
1b960e3e17 requiring codemirror compressed with all addons included 2016-09-02 21:40:20 +05:00
sanfordstudent
b7ac081e49 Merge pull request #13329 from edx/sstudent/TNL-5382-part-1 
creating django admin settings for subsection grades
 2016-09-02 10:52:51 -04:00
Ehtesham
31be6fad43 make CAPA dropdown problems accessible 2016-09-02 19:44:24 +05:00
muhammad-ammar
d14928cc61 separation based on responsetypes poc 
FEDX-176
 2016-09-02 19:44:22 +05:00
Sanford Student
d54a784a43 creating django admin settings for subsection grades 2016-09-02 09:32:33 -04:00
Nimisha Asthagiri
b37d2d739a Make BlockStructure tasks more resilient against failures. 
https://openedx.atlassian.net/browse/TNL-5041
 2016-09-02 08:02:49 -04:00
Ned Batchelder
2932023a51 Merge pull request #13375 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-09-01 15:16:55 -04:00
Peter Desjardins
e276ae2d36 Adds a context-sensitive link to learner documentation from the LMS. The base URL defaults to Open edX learner doc and can be overridden with the base URL for edx.org learner doc. Also relabels the tab for support from help to support. 2016-09-01 10:56:09 -04:00
Ned Batchelder
caa7b472b9 Update translations (autogenerated message) 2016-09-01 11:24:52 +00:00
George Song
5811b92e6e Disable debug-toolbar ProfilingPanel 
There's a [bug](https://github.com/jazzband/django-debug-toolbar/issues/792)
that prevents wrapped views from working properly with the profiling panel.

Disable it by default.
 2016-08-31 13:38:28 -07:00
Douglas Hall
f915befe93 Merge pull request #13359 from edx/release 
Merging rc/2016-08-31 into master
 2016-08-31 11:41:51 -04:00
George Song
4954928215 Merge pull request #13352 from edx/george/update-django-debug-toolbar 
Update to latest `django-debug-toolbar`
 2016-08-31 07:15:45 -07:00
Chris Rodriguez
37b42941f8 AC-570 courseware search contrast enhancement 2016-08-30 14:51:54 -04:00