Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
Gregory Martin
6fd51467c9 repair signal config 2017-07-14 12:14:53 -04:00
Jillian Vogel
0fcdcb02bb Use ORA2 django storage on openstack and devstack. 
Default ORA2 storage settings use AWS, so no change required to aws envs.
 2017-07-14 11:23:15 -04:00
muhammad-ammar
edcd64e90f edx-videoi-id strip fix 
LEARNER-1871
 2017-07-14 19:17:16 +05:00
Tim Krones
cbd3660cdc Merge pull request #15383 from edx/saleem-latif/ENT-367-updates 
ENT-367: Remove enterprise cookie when it is not needed any further.
 2017-07-14 14:57:46 +02:00
Robert Raposa
22c8e4c6ad Redirect Course Home for course that hasn't started. 
Includes the following:
- Move the redirect logic for before course that hasn't started to
share between Course Info and Course Home.
- Add audit comments for Course Info vs Course Home
- Other minor clean-up.

LEARNER-613
 2017-07-14 01:47:32 -04:00
Harry Rein
3dbe04811a Merge pull request #15518 from edx/HarryRein/updating-bootstrap-theming 
Harry rein/updating bootstrap theming
 2017-07-13 16:56:28 -04:00
Alex Dusenbery
a0da9b895c Turn down course_grade_factory.py logging. 2017-07-13 15:48:31 -04:00
Harry Rein
6d89cc1bd1 Updating themes for bootstrap. 
LEARNER-1785

This story was to update the existing custom themes to work with the flexible bootstrap design. It also updates the red theme to more closely resemble the real implementation on openedx.
 2017-07-13 15:25:40 -04:00
George Song
06c9826904 Merge pull request #14845 from Salomari1987/salah/password_reset_email_subject 
Use platform_name instead of site_name in password reset email
 2017-07-13 05:52:21 -07:00
Vedran Karačić
2ffabe6333 Merge pull request #15539 from edx/vkaracic/update-settings 
Add COURSE_CATALOG_API_URL settings value to devstack_docker
 2017-07-13 06:51:56 +02:00
Albert (AJ) St. Aubin
c78b84ca3f Merge pull request #15480 from edx/staubina/ed-592 
Staubina/ed 592
 2017-07-12 17:24:53 -04:00
George Song
1f6a4f22d1 Merge pull request #15549 from edx/george/git-import-sysadmin 
Disable Git Import view for professor's who are not staff
 2017-07-12 13:20:15 -07:00
edx-pipeline-bot
0e9f5b3d24 Merge pull request #15553 from edx/release-mergeback-to-master 
Merge release back to master
 2017-07-12 15:39:36 -04:00
mrey
d682802f58 Disable view of Git Import when user is professor of course but not staff user 
Reason: Before this fix, if the user is not staff (user.is_staff=0) and ENABLE_SYSADMIN_DASHBOARD=True
happens that the user can access the Git Import in Sysadmin dashboard and get to see the links in the menu
of the sysadmin dashboard (Users, Courses, Staffing and enrollment). When this user clicks on one of
these links, it gets an error from the server.
 2017-07-12 10:36:35 -07:00
Christina Roberts
04f9db20c0 Merge pull request #15533 from edx/christina/remove-mustache 
Remove last Mustache usage.
 2017-07-12 12:58:21 -04:00
Alex Dusenbery
6919fc8ce8 Use kwargs right. 2017-07-12 12:51:42 -04:00
Albert St. Aubin
b8b0110d15 Ui updates, Error messaging shown when discussion scheme is not selected 2017-07-12 12:49:54 -04:00
cahrens
bddc29a850 Remove last Mustache usage. 2017-07-12 12:08:59 -04:00
Matt Tuchfarber
3be1da942d Center password reset page 
The screen the set a new password after a reset is currently misaligned
on prod. It's pushed to the left side due to an inline-block display
property. Changed to block and fixed margins.
 2017-07-12 10:38:33 -04: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
Vedran Karacic
3916759ded Add COURSE_CATALOG_API_URL setting to devstack_docker. 
LEARNER-1115
 2017-07-12 13:48:47 +02: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
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
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
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
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
Andy Armstrong
a815003b3b Handle anonymous and unenrolled users on the new course home page 
LEARNER-1696
 2017-07-10 17:52:28 -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
Sofiya Semenova
d01d165e4c Merge pull request #15386 from edx/sofiya/ed-378 
Add group_moderator role
 2017-07-10 14:13:09 -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
Omar Al-Ithawi
8816b85464 Use the marketing contact us page in email confirm change message 2017-07-10 10:24:49 -04:00
Omar Al-Ithawi
071f35ba12 Deleted unused template: emails_change_successful.html 2017-07-10 10:24:49 -04:00
Brian Beggs
1720bcf356 Merge pull request #15345 from edx/bbeggs/host_fixes 
ADD LMS_BASE and CMS_BASE to devstack_docker config files
 2017-07-09 12:11:42 -04:00
Brian Beggs
83e52905cf ADD LMS_BASE and CMS_BASE to devstack_docker config files 2017-07-07 17:02:51 -04:00
Simon Chen
82a7a79264 Update the admin table to allow the insert of course cert settings LEARNER-1787 2017-07-07 16:05:26 -04:00
Gregory Martin
16f06bf651 Generate eligible certificates on learner track change 2017-07-07 16:04:05 -04:00
Andy Armstrong
7077ea0601 Merge pull request #15497 from edx/andya/fix-styling-bug 
Fix styling on non-Bootstrap pages
 2017-07-07 13:30:41 -04:00
Andy Armstrong
71baa6af0e Fix styling on non-Bootstrap pages 
LEARNER-1798
 2017-07-07 12:12:35 -04:00
Andy Armstrong
a113ab51d9 Removed unused accessible_modal template 2017-07-07 11:37:53 -04:00
Sofiya Semenova
f111655484 Test 2017-07-07 14:37:54 +00:00
Ibrahim Ahmed
4ec9563806 Revert "remove the word Institutions if there is no authoring organization" 2017-07-07 15:45:26 +05:00