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

41817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Albert St. Aubin
b8b0110d15 Ui updates, Error messaging shown when discussion scheme is not selected 2017-07-12 12:49:54 -04:00
Diana Huang
267968b029 Merge pull request #15542 from edx/diana/update-naming 
Update names to be more consistent.
 2017-07-12 12:27:33 -04:00
Brian Mesick
fdaf1b4c9a Merge pull request #15472 from edx/bmedx/django_1.11_upgrade_help_tokens_PLAT-1441 
Upgrade help-tokens to 1.0.3
 2017-07-12 11:14:10 -04:00
Brian Mesick
ef0e15af74 Merge pull request #15439 from edx/bmedx/django_1.11_upgrade_crum_PLAT-1478 
Upgrade django-crum to 0.7.2
 2017-07-12 11:13:49 -04:00
Diana Huang
fc9737581e Update names to be more consistent. 
LEARNER-1669
 2017-07-12 10:55:31 -04:00
Michael Roytman
9c7043c226 Merge pull request #15532 from edx/mroytman/PLAT_1487_django_1.11_upgrade_edx-django-sites-extensions 
upgrade edx-django-sites-extensions from 2.1.1 to 2.3.0
 2017-07-12 10:35:13 -04:00
Jeremy Bowman
da32c5af56 Merge pull request #15531 from edx/jmbowman/PLAT-1629 
PLAT-1629 Retry abspath() failures
 2017-07-12 10:24:20 -04:00
M. Rehan
c3e1d59237 Merge pull request #15528 from edx/mrehan/fix-noisy-ajax-captions 
Dont fetch captions while fetching translations
 2017-07-12 18:24:11 +05:00
Ibrahim Ahmed
d8133c3aa1 Merge pull request #15523 from edx/ibrahimahmed443/WL-1079-minor-styling-issues 
fix styling issues in program details page
 2017-07-12 18:14:48 +05:00
Qubad786
c9bbc0b68a Dont fetch caption on getting translations 
This fixes the endless loop of fetchCaptions ajax requests. fetchCaption on error calls fetchAvailableTranslations which again calls fetchCaption on success and so on. We don't see any significance for calling fetchCaption in fetchAvailableTranslations.
 2017-07-12 16:45:17 +05:00
Rabia Iftikhar
aee1b7f412 Merge pull request #15510 from edx/ri/EDUCATOR-810-unicode-decode-error 
EDUCATOR-810 fix UnicodeDecodeError
 2017-07-12 14:13:54 +05:00
rabiaiftikhar
6e873a4838 EDUCATOR-810 fix UnicodeDecodeError 2017-07-12 07:28:46 +00:00
Harry Rein
ead5e9f919 Merge pull request #15498 from edx/HarryRein/LEARNER-1628-write-reviews 
Adding the capability to write reviews to the reviews page.
 2017-07-11 17:07:22 -04:00
Harry Rein
5a2998fb5b Allowing writing of reviews on reviews page. 
LEARNER-1628

This allows enrolled users to write reviews on the reviews page that
can be accessed through the course tools sidebar. A button in the top
corner of the page toggles the widget that is configured with a
setting in the common.py file. The reviews tool is Course Talk.
 2017-07-11 16:16:05 -04:00
Michael Roytman
b4fe08742a upgrade edx-django-sites-extensions from 2.1.1 to 2.3.0 2017-07-11 15:44:14 -04:00
Jeremy Bowman
c0f81cc85c PLAT-1629 Retry abspath() failures 2017-07-11 15:29:22 -04:00
Diana Huang
165c0aae85 Merge pull request #15465 from edx/andya/ccx-redirect 
Implement course home redirect if user cannot enroll
 2017-07-11 15:18:56 -04:00
Sylvia Pearce
1d04f60b77 Merge pull request #15527 from edx/sylvia/video_link_fix 
Fix Studio context-sensitive help link to video documentation
 2017-07-11 15:04:34 -04:00
Anthony Mangano
398fd19ba5 Merge pull request #15502 from edx/LEARNER-1298-LEARNER-1299-send-ui-lang-to-sailthru 
Set ui_lang in Sailthru when creating and updating users
 2017-07-11 14:35:06 -04:00
Andy Armstrong
13854fb8ab Handle anonymous and unenrolled users on the new course home page 
LEARNER-1696
 2017-07-11 14:10:52 -04:00
Sylvia Pearce
121ef86fa1 Fix Studio context-sensitive help link to video documentation 2017-07-11 14:08:23 -04:00
Alex Dusenbery
6dfa47b2fc EDUCATOR-565 | Add POLICY_CHANGE_GRADES_ROUTING_KEY, fix errors in compute_all_grades_for_course circuitry. 2017-07-11 14:01:38 -04:00
Christina Roberts
b14b951122 Merge pull request #15524 from edx/christina/remove-mustache 
Remove unneeded mustache references.
 2017-07-11 13:28:06 -04:00
Kyle McCormick
fade4a10af Implement event for forum thread views 
EDUCATOR-341
 2017-07-11 12:42:49 -04:00
cahrens
21bcf02d97 Remove unneeded mustache references. 2017-07-11 12:06:27 -04:00
Anthony Mangano
4f4f25b432 Set ui_lang in Sailthru when creating and updating users 2017-07-11 11:27:01 -04:00
Ibrahim
1b14d301d9 fix styling issues in program details page 
WL-1079
 2017-07-11 20:14:36 +05:00
Nimisha Asthagiri
4d157db6f1 Merge pull request #15521 from edx/ret/cleanup-planning-prompts 
RET: Cleanup Planning Prompts experimental code
 2017-07-11 11:06:33 -04:00
Michael Roytman
81c70be87e Merge pull request #15520 from edx/PLAT_1486_djano_1.11_upgrade_edx-django-release-util 
upgrade edx-django-release-util to 0.3.1
 2017-07-11 11:00:44 -04:00
adeel khan
4efa47ba4d Merge pull request #15522 from edx/adeel/LEARNER-1188_Setting_connection_timeout_value_for_sailthru_api_call 
Increased timeout value for sailthru api call.
 2017-07-11 19:28:28 +05:00
Christina Roberts
0afd3bad3f Merge pull request #15513 from edx/christina/milestones-upgrade 
Upgrade version of milestones.
 2017-07-11 09:28:28 -04:00
Adeel Khan
a879ad201b Increased timeout value for sailthru api call. 
LEARNER-1186
 2017-07-11 17:46:10 +05:00
Nimisha Asthagiri
66bbe9023b RET: Cleanup Planning Prompts experimental code 2017-07-11 08:35:59 -04:00
Steven Zheng
120c62b3ab Merge pull request #15494 from edx/LEARNER-1499 
[WIP] Add django management command to create course from json
 2017-07-11 08:19:01 -04:00
Andy Armstrong
447bee2e75 Merge pull request #15456 from edx/andya/anonymous-course-access 
Handle anonymous and unenrolled users on the new course home page
 2017-07-10 19:58:01 -04:00
Andy Armstrong
a815003b3b Handle anonymous and unenrolled users on the new course home page 
LEARNER-1696
 2017-07-10 17:52:28 -04:00
Brian Mesick
65f876d728 Merge pull request #15473 from edx/bmedx/django_1.11_remove_django-mako_PLAT-1568 
Remove django-mako requirement
 2017-07-10 16:59:25 -04:00
George Song
d020d7a2f9 Merge pull request #15474 from open-craft/mtyaka/chromeless-class 
Add chromeless class to the wrapper when in chromeless mode.
 2017-07-10 13:32:31 -07:00
Michael Roytman
6f71fb4599 upgrade edx-django-release-util to 0.3.1 2017-07-10 16:19:30 -04:00
George Song
6ec21c0cd9 Merge pull request #15466 from OmarIthawi/omar/deprecate-lettuce 
Deprecate lettuce in testing.rst document
 2017-07-10 13:19:00 -07:00
Steven Zheng
e340b2431e Add django management command to create course from json 2017-07-10 16:02:20 -04:00
George Song
a97425ee85 Merge pull request #15343 from edx/jbarciauskas/disable-creator-group-default 
Don't allow any user to create courses by default
 2017-07-10 12:48:32 -07:00
Joel Barciauskas
6b08528193 Don't allow any user to create courses by default 
* Change settings default
* Set `ENABLE_CREATOR_GROUP` to False for devstack
* Set `ENABLE_CREATOR_GROUP` to False for tests

In f095c5fec6 it was decided to enable
anyone to make courses in Studio by default in order to make things
easier in dev environments. This was before the code was open source.
This default is likely in effect for many Open edX instances, but almost
no one would want this setting outside of development.
 2017-07-10 12:47:42 -07:00
cahrens
e162759a17 Upgrade version of milestones. 
EDUCATOR-773
 2017-07-10 15:03:36 -04:00
Sofiya Semenova
d01d165e4c Merge pull request #15386 from edx/sofiya/ed-378 
Add group_moderator role
 2017-07-10 14:13:09 -04:00
Eric Fischer
05cdc60226 Merge pull request #15501 from edx/efischer/limit_libraries 
Limit libraries as well if course listing is limited
 2017-07-10 12:57:38 -04:00
sarahkf
012064ccfb Merge pull request #15514 from edx/sarahkf/translation-jsx-files 
Update configuration to translate jsx files
 2017-07-10 12:51:28 -04:00
Sarah Fischmann
7ed9ba1934 Update webpack config and translation tools to translate .jsx files 
EDUCATOR-823

Updated confinguration of webpack and translation tools to work with jsx files

EDUCATOR-823

changes to webpack config

Fixed space issue
 2017-07-10 11:48:13 -04:00
Simon Chen
d613f37dad Merge pull request #15503 from edx/schen/LEARNER-1787 
LEARNER-1787 Update the admin table to allow the insert of course cert settings
 2017-07-10 11:13:35 -04:00
Sofiya Semenova
f0c694e562 Review round 1 2017-07-10 14:58:27 +00:00