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

40590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
be265eca37 Merge branch 'master' into release-mergeback-to-master 2017-03-23 15:59:04 -04:00
Diana Huang
dbdb433fff Merge pull request #14756 from edx/andya/new-bookmarks-page 
Andya/new bookmarks page
 2017-03-23 10:38:12 -04:00
Andy Armstrong
38d73e31be Disable test to get course bookmarks released 2017-03-23 10:34:50 -04:00
Brian Jacobel
46e0b49a4e Fix eslint indentation issues 2017-03-23 10:34:50 -04:00
Andy Armstrong
7b5be9cb76 Address code review feedback 2017-03-23 10:34:50 -04:00
Diana Huang
2c00034966 Add new bookmarks page a11y test. 2017-03-23 10:34:49 -04:00
Diana Huang
9810b5fdf7 Update bok choy tests for new bookmarks page. 2017-03-23 10:34:49 -04:00
Andy Armstrong
91d227f76d Convert course bookmarks into a feature 
LEARNER-39
 2017-03-23 10:34:49 -04:00
Robert Raposa
652ad7ae73 Add course outline bokchoy tests. 
- Rename CourseOutlinePage to StudioCourseOutlinePage in lms tests.
- Introduce CourseHomePage with outline child.
- Add a11y, breadcrumbs, and waffle.
 2017-03-23 10:31:05 -04:00
Brian Jacobel
574d070392 Hide '<- Outline >' link in breadcrumbs if using old course view 2017-03-23 10:31:05 -04:00
Andy Armstrong
a3f32fea5a Make course_experience a feature 2017-03-23 10:31:05 -04:00
Diana Huang
9ca051c527 Beginning of python unit tests. 2017-03-23 10:31:05 -04:00
Brian Jacobel
4c88fdf278 Update to new styling 2017-03-23 10:31:05 -04:00
Brian Jacobel
aff541ec12 Start JS specs for key listeners on course outline page 2017-03-23 10:31:05 -04:00
Brian Jacobel
acc3a045ca Link outline subsections into the course 2017-03-23 10:31:05 -04:00
alisan617
7bef3c0ef2 styling 2017-03-23 10:31:04 -04:00
Brian Jacobel
eca83ba70a Outline will only show section and subsection, not unit 2017-03-23 10:31:04 -04:00
Brian Jacobel
74b789b676 Get the block tree and display it on the outline page 2017-03-23 10:31:04 -04:00
Andy Armstrong
7862e375f1 Implement a stub unified course tab 2017-03-23 10:31:04 -04:00
Adam
4c8dc9044d Merge pull request #14749 from edx/adam/discussion-styling 
remove scss rule that overrides discussion paragraph margins (TNL-6231)
 2017-03-23 07:58:07 -04:00
Andy Armstrong
d16059a6ea Merge pull request #14669 from edx/andya/new-bookmarks-page 
Convert course bookmarks into a separate page
 2017-03-23 07:11:24 -04:00
Andy Armstrong
9df3779ccd Disable test to get course bookmarks released 2017-03-23 00:19:34 -04:00
Brian Jacobel
85e9bbc257 Fix eslint indentation issues 2017-03-23 00:19:33 -04:00
Andy Armstrong
e4d355a686 Address code review feedback 2017-03-23 00:19:33 -04:00
Diana Huang
7ab76e6099 Add new bookmarks page a11y test. 2017-03-22 16:09:13 -04:00
Diana Huang
51f4ac431a Update bok choy tests for new bookmarks page. 2017-03-22 16:09:13 -04:00
Andy Armstrong
89e5c0fd8d Convert course bookmarks into a feature 
LEARNER-39
 2017-03-22 16:09:13 -04:00
Brian Jacobel
596634ebd6 Merge pull request #14426 from edx/andya/new-course-tab 
Implement the new unified course tab with a separate outline page
 2017-03-22 15:35:32 -04:00
Adam Palay
4710f1ad8a remove scss rule that overrides discussion paragraph margins (TNL-6231) 2017-03-22 13:56:33 -04:00
Ned Batchelder
88a74f4291 Merge pull request #14716 from edx/nedbat/refactor-help-links 
An indicator of the Open edX release line, and help tests adapted to same.
 2017-03-22 13:18:35 -04:00
Robert Raposa
c37137a6b5 Add course outline bokchoy tests. 
- Rename CourseOutlinePage to StudioCourseOutlinePage in lms tests.
- Introduce CourseHomePage with outline child.
- Add a11y, breadcrumbs, and waffle.
 2017-03-22 13:00:39 -04:00
Brian Jacobel
e2264d0796 Hide '<- Outline >' link in breadcrumbs if using old course view 2017-03-22 13:00:39 -04:00
Andy Armstrong
435a6f5225 Make course_experience a feature 2017-03-22 13:00:38 -04:00
Diana Huang
6f5249d399 Beginning of python unit tests. 2017-03-22 13:00:38 -04:00
Brian Jacobel
559057591f Update to new styling 2017-03-22 13:00:38 -04:00
Brian Jacobel
10105b7bae Start JS specs for key listeners on course outline page 2017-03-22 13:00:38 -04:00
Brian Jacobel
b63472520c Link outline subsections into the course 2017-03-22 13:00:37 -04:00
alisan617
f531205cd9 styling 2017-03-22 13:00:37 -04:00
Brian Jacobel
db6c2fe8bf Outline will only show section and subsection, not unit 2017-03-22 13:00:37 -04:00
Brian Jacobel
4be657c1ba Get the block tree and display it on the outline page 2017-03-22 13:00:36 -04:00
Andy Armstrong
75d89e8115 Implement a stub unified course tab 2017-03-22 13:00:36 -04:00
Ned Batchelder
4df63b2b2e No need to switch .org -> .io, just use the right URL to begin with 2017-03-22 12:25:47 -04:00
Ned Batchelder
f7b08b16fc Adapt the tests to openedx.core.release.doc_version() 2017-03-22 12:25:46 -04:00
Ned Batchelder
60221dcc13 Get the doc version from openedx.core.release, instead of an ini file 2017-03-22 12:25:46 -04:00
Ned Batchelder
3bb8061f80 An indicator of the Open edX release line 2017-03-22 12:25:46 -04:00
Ben Patterson
4d1d709e5c Merge pull request #14746 from edx/benp/fix-eslint-fails 
upping eslint violation count since a merged commit didn't know about…
 2017-03-22 11:56:38 -04:00
Asad Iqbal
557b4edd80 Merge pull request #14711 from edx/asadiqbal08/ENT-251 
ENT-251 Updated track selection UI for Enterprise context
 2017-03-22 18:42:30 +05:00
Eric Fischer
c5efe52273 Merge pull request #14745 from edx/efischer/ora2_release 
edx-ora2 1.3.0 release
 2017-03-22 09:37:44 -04:00
asadiqbal
bfde6d63c5 ENT-251 Updated track selection UI for Enterprise context 2017-03-22 17:32:58 +05:00
Hasnain Naveed
2105213c5a Merge pull request #14740 from edx/hasnain-naveed/WL-1011 
WL-1011 | Added SiteConfiguration flag 'ENABLE_DONATIONS' to enable t…
 2017-03-22 14:59:09 +05:00