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

5933 Commits

Author SHA1 Message Date
sanfordstudent
07ad189b9d Merge pull request #15263 from edx/sstudent/grade-override 
Learner grade override
 2017-07-18 14:33:27 -04:00
Sanford Student
932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. 2017-07-18 13:51:56 -04:00
Andy Armstrong
33bee3f70b Refactor learner profile into openedx/features directory 
LEARNER-1855
 2017-07-18 12:30:12 -04:00
Andy Armstrong
3e786ec6c5 Show page banner for anonymous and unenrolled users 
LEARNER-1697
 2017-07-17 22:19:40 -04:00
Andy Armstrong
a077a5e364 Add support for page banner status messages 
LEARNER-1890
 2017-07-17 12:17:32 -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
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
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
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
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
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
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
Ibrahim Ahmed
4ec9563806 Revert "remove the word Institutions if there is no authoring organization" 2017-07-07 15:45:26 +05:00
Albert St. Aubin
6cdcf8e9b8 Discussion group moderation 2017-07-06 13:39:03 -04:00
Ibrahim Ahmed
f6ad15bb59 Merge pull request #15462 from edx/ibrahimahmed443/WL-1083-remove-institutions 
remove the word Institutions if there is no authoring organization
 2017-07-06 17:53:42 +05:00
muhammad-ammar
763f0051bd video thumbnail ui 2017-07-06 12:35:04 +05:00
Matjaz Gregoric
c448426cd3 Add chromeless class to the wrapper when in chromeless mode. 
This makes it easier for CSS rules to target chromeless mode. This is
useful for xblocks which want to use some CSS tweaks specific to the
chromeless view.
 2017-07-06 09:18:57 +02:00
Sven Marnach
7ac436c28e Add flag to configure whether "Notify users by email" is checked by default. 2017-07-05 11:19:02 +02:00
Harry Rein
7ea3b013ad Style LMS header, footer and nav for Bootstrap. 2017-07-04 17:24:12 -04:00
Andy Armstrong
3cd985da20 Implement a skeleton page with Bootstrap 
LEARNER-1174
 2017-07-04 15:55:06 -04:00
Ibrahim
d3b68dc173 remove the word Institutions if there is no authoring organization 
WL-1083
 2017-07-04 17:20:25 +05:00
Robert Raposa
a864b450a8 Merge pull request #15436 from edx/robrap/rename-xss-linter 
Rename xss linter.
 2017-06-30 16:22:38 -04:00
Robert Raposa
b370fe2314 Part II: Rename xss linter. 2017-06-30 13:20:23 -04:00
Robert Raposa
a087ce4854 Merge pull request #15416 from edx/robrap/LEARNER-1604-waffle-default 
LEARNER-1604: Change default and refactor old unified_course_view flag.
 2017-06-29 15:37:38 -04:00
Ned Batchelder
bf0f7ce704 Merge pull request #15433 from edx/nedbat/pedantic-footer-2 
Correct spelling of 'Open edX', and pedantic typography in the copyright footer
 2017-06-29 12:15:14 -04:00
Robert Raposa
2e80c1e66b Refactor, enhance, and adjust unified_course_view flag. 
This includes several general enhancement in addition
to the fixes for unified_course_view:
1. Add support for default when no waffle flag defined.
2. Add support for table_blacklist to assertNumQueries.
3. Rename flag to 'course_experience.course_outline_page'.
4. Change flag default to True when it is not defined.
 2017-06-29 11:04:35 -04:00
Ned Batchelder
01018ec418 Correct spelling of 'Open edX', and pedantic typography in the copyright footer 2017-06-29 10:22:38 -04:00
Ibrahim
44f1f7f975 start button fix in mobile 2017-06-29 13:06:19 +05:00
Salah Alomari
8dba6c49a6 Use platform_name instead of site_name in password reset email subject 2017-06-28 02:30:58 +03:00
Salah Alomari
4f6eaa59d1 Use platform_name instead of site_name in password reset email 2017-06-28 02:30:17 +03:00
Sven Marnach
3460adc824 Merge pull request #14831 from open-craft/smarnach/immutable-emails 
Add feature flag to disable email address changes.
 2017-06-26 16:49:52 +02:00
Harry Rein
aea407b13e Merge pull request #15355 from edx/HarryRein/LEARNER-1485-course-reviews-tool 
LEARNER-1485: Adding a reviews page and link from the course tool bar
 2017-06-23 13:09:13 -04:00
Marko Jevtic
75531b2fef [LEARNER-437] Reflect discount on the Program About Page (WL) 2017-06-23 17:34:06 +02:00
Harry Rein
82daaa5ad3 Adding a reviews page to the course and updating the reviews module on the course about page. Removed the existing coursetalk implementation and put it in a fragment, removed the tests as well. Added configuration settings to specify the reviews template as well as the reviews provider. This is all protected by a waffle flag. 2017-06-23 11:27:48 -04:00
Marko Jevtic
d48100d386 [LEARNER-1367] Move Program Marketing page from private themes repo to edx platform repo 
[LEARNER-311] Enable a purchase button on the Program page - platform (WL)
 2017-06-23 16:27:37 +02:00
Sven Marnach
f127a29d62 Add feature flag to disable email address changes. 2017-06-21 15:15:52 +02:00
Clinton Blackburn
dd1f834697 Displaying verification denial reasons on dashboard 
Learners now see (on the dashboard) a list of reasons why their verifications were denied.

LEARNER-1486
 2017-06-20 17:44:13 -04:00
John Eskew
fd86e1b4b2 Merge pull request #15357 from edx/jeskew/django1.11_future_templates_PLAT_1562 
Use standard 'url' templatetag - deprecated/removed from future.
 2017-06-20 14:02:36 -04:00
Sofiya Semenova
bf577fffa3 Merge pull request #15298 from edx/sofiya/preregister-cohorts 
Assign users to cohorts before registration
 2017-06-20 11:59:23 -04:00
Ned Batchelder
03c725ef9a Merge pull request #15281 from edx/nedbat/footer-edx-link 
edx.org link for Open edX footer
 2017-06-20 11:15:06 -04:00
John Eskew
cb4ae4619b Use standard 'url' templatetag - deprecated/removed from future. 2017-06-20 10:44:16 -04:00
Ned Batchelder
6adca0ff11 Add a link to edx.org in the default Open edX footer 2017-06-20 10:18:54 -04:00