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

3029 Commits

Author SHA1 Message Date
John Eskew
3b57542ab0 Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance" 
This reverts commit f97f052591, reversing
changes made to 800bcd8e20.
 2017-05-30 12:42:54 -04:00
Clinton Blackburn
74f9858b77 Optimized all imports in common.test.acceptance 
- Removed unused imports
- Ran isort to properly order/style imports
 2017-05-28 00:59:22 -04:00
John Eskew
76389d8678 Run all files touched in inheritance/partition work through isort. 2017-05-25 13:24:08 -04:00
John Eskew
66f3aa5ccf Move fields.py, inheritance.py, and partitions to openedx/core. 2017-05-25 13:24:08 -04:00
Saleem Latif
727dd9f90b Success Message for Account Activation for logged out users. 2017-05-22 16:38:47 +05:00
sanfordstudent
3278fcf1d6 Merge pull request #15045 from edx/neem/handle_unrescorable 
400 for non-rescorable blocks
 2017-05-16 10:36:33 -04:00
Sanford Student
8cfff9a883 400 for non-rescorable blocks 2017-05-16 09:45:37 -04:00
Attiya Ishaque
0b098ef274 Merge pull request #15124 from edx/ai/EDUCATOR-312-remove-flaky 
EDUCATOR-312 Remove flaky decorator from test_timed_exam_flow.
 2017-05-16 17:55:47 +05:00
attiyaishaque
5d3cbc76d1 EDUCATOR-312 Remove flaky decorator from test_timed_exam_flow. 2017-05-16 14:31:57 +05:00
attiyaishaque
6ee2c9543c EDUCATOR-278 Remove flaky decorator from test_can_reset_attempts. 2017-05-15 20:07:08 +05:00
Brian Jacobel
9c6d94ada0 Require and Webpack can eat the same files 2017-05-12 14:40:31 -04:00
Brittney Exline
69d85dc103 Merge pull request #14985 from open-craft/jill/update-registration-login 
ENT-332/ENT-333 Updates Register and Login as per new design
 2017-05-12 11:07:10 -04:00
Renzo Lucioni
78a9b1f0ae Remove use of read_cached_programs switch 
The read_cached_programs switch was used to control the release of changes for reading programs exclusively from the cache. With those changes stable, the switch is no longer necessary.

LEARNER-382
 2017-05-12 11:06:08 -04:00
Jillian Vogel
71ba54a963 Updates combined Register, Login, and Password Reset views as per new design 
* Reorders form fields, and updates labels, placeholders, and tip text
* Increases clickable area for links and labels.
* Removes "*" markers from required fields, and instead adds
  "(optional)" labels to visible optional fields.
* Updates font colors and sizes, and removes box shadows
* Adds custom drop-down styles
* Improves responsive design scaling for small screens
* Make Terms of Service and Honor Code open in new window to avoid losing form
  field values.
 2017-05-12 09:18:36 -04:00
attiyaishaque
9188dbdb47 EDUCATOR-283 Old mathjax not load in preview box. 2017-05-11 15:02:17 +05:00
attiyaishaque
377283a353 EDUCATOR-293 Remove flaky decorator from test_proctored_exam_flow. 2017-05-10 21:32:18 +05:00
Carol Tong
9442a2629c DOC-3411 Update lms_config.ini for instr dash landing page 2017-05-10 10:58:41 -04:00
Andy Armstrong
2e8c68e609 Make tests and coverage work with openedx/features 2017-05-04 09:28:16 -04:00
Robert Raposa
963519b86f Merge pull request #15032 from edx/robrap/TNL-6906-mark-flaky 
Mark test_proctored_exam_flow as flaky.
 2017-05-04 09:14:34 -04:00
Ned Batchelder
6be4337c7d Merge pull request #14898 from edx/nedbat/help-tokens-app 
Use a new external app for help tokens
 2017-05-03 18:08:27 -04:00
Robert Raposa
a47e1a84de Mark test_proctored_exam_flow as flaky. 2017-05-03 15:57:23 -04:00
Andy Armstrong
2167584e5e Unify the home and course tabs 
LEARNER-609
 2017-05-01 17:22:28 -04:00
Ben Patterson
449228ec31 Update lettuce db cache for faster test set-up. 2017-05-01 11:32:57 -04:00
Ben Patterson
0959399849 Merge pull request #14998 from edx/benp/update_bokchoy_db_cache 
Update bok-choy cache files.
 2017-05-01 09:24:02 -04:00
Ben Patterson
4d3f4f8596 Update bok_choy_data_default.json 
Fix errors
 2017-04-27 16:04:38 -04:00
Ben Patterson
7bafafac84 Update bok-choy cache files. 
This should provide some performance improvements when running
bok-choy tests, particularly during set-up.
 2017-04-27 14:44:38 -04:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -04:00
Ned Batchelder
2f1936ce73 Replace context processor with new help-tokens app 
This makes it possible to refer to multiple book from a single app.

This also means that Open edX branches will be able to pass bok-choy
tests (at least if the books have already been built.)
 2017-04-27 10:34:09 -04:00
M. Rehan
19961dc750 Merge pull request #14918 from edx/mrehan/course-sharing-utm-parameters 
Add utm parameters to course sharing url
 2017-04-26 13:00:56 +05:00
attiyaishaque
4316731f70 TNL-4412 user is not enrolled as a beta tester when account is unactivated. 2017-04-26 10:54:15 +05:00
Diana Huang
c14f0b14ea Course jump tos should go to the main course home page. 2017-04-25 11:33:14 -04:00
Qubad786
c28d7cd5f9 Add utm parameters to course sharing url 2017-04-24 23:01:21 +05:00
Muhammad Ammar
c3d0a50d42 Merge pull request #14514 from edx/ammar/tnl-6513-frontend-hls-support 
HLS playback support in video player
 2017-04-21 12:38:11 +05:00
Jeremy Bowman
f2f9874f73 Upgrade to bok-choy 0.7.0 2017-04-20 11:25:59 -04:00
Ivan Ivic
b682c43d48 Update Order History page to reflect bundled purchase 
LEARNER-381
 2017-04-20 12:24:34 +00:00
cahrens
5e14a35607 Change "Choose one" to "Select a group type". 2017-04-19 14:32:44 -04:00
Christina Roberts
5599a4513d Merge pull request #14803 from edx/aj/TNL-6743_GroupConfigEnrollmentPartition 
Aj/tnl 6743 group config enrollment partition
 2017-04-19 14:27:06 -04:00
Albert St. Aubin
59c6218885 Show Enrollment Tracks in Group Configurations. 
TNL-6743
 2017-04-19 12:35:15 -04:00
Eugeny Kolpakov
e03b3914f8 Merge pull request #14737 from open-craft/mit-capa-hide-correct 
MIT CAPA improvements: Add show_correctness field
 2017-04-19 07:03:46 +08:00
Christina Roberts
529df7c6d9 Merge pull request #14863 from edx/christina/tnl-6746 
Show messages about component visibility.
 2017-04-18 14:53:58 -04:00
Brian Jacobel
447f5c2b99 Merge pull request #14859 from edx/bjacobel/outline-details 
Implement minor UI/A11Y fixes for outline
 2017-04-18 10:20:09 -04:00
attiyaishaque
25435cfc98 TNL-5515. Fix discussion topic navigation and sorting option. 2017-04-17 17:05:12 +05:00
Noraiz Anwar
a26560de84 Merge pull request #14891 from edx/noriaz/ECOM-7537 
ECOM-7537 Priortize advertised start date to diplay on learner's dashboard
 2017-04-17 11:46:34 +05:00
noraiz-anwar
a7ceb880c8 Priortize advertised start date to diplay on learner's dashboard 2017-04-14 18:59:05 +05:00
Qubad786
8d0b6ccc0b Use get_link_for_about_page utility for social sharing on dashboard 2017-04-14 16:52:03 +05:00
Rabia Iftikhar
2ee13c1221 Merge pull request #14818 from edx/ri/TNL-6740-fix-previously-cohorted-discussion-posts 
TNL-6740 Fix previously cohorted discussion posts still show cohorting visibility message.
 2017-04-14 11:38:41 +05:00
Jillian Vogel
f18a2be837 Implement optional hiding of capa assessment results 2017-04-13 15:52:57 -07:00
Brian Jacobel
89fc9fb3e6 Implement minor UI/A11Y fixes for outline 2017-04-13 16:05:16 -04:00
Robert Raposa
0899ac56e3 Fix review comments. 2017-04-13 14:39:38 -04:00
Diana Huang
aafd6a03ce Add 'format' as a requested field. 2017-04-13 14:39:37 -04:00