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

3109 Commits

Author SHA1 Message Date
Agha Awais
0acb2289e1 Merge pull request #18688 from edx/awais/lett_2_bc_advance_settings_III 
advanced settings bokchoy tests III
 2018-08-04 00:52:29 +05:00
Agha Awais
202e990498 Merge pull request #18686 from edx/awais/lett_2_bc_grading_II 
Grading bokchoy tests II
 2018-08-04 00:52:09 +05:00
Agha Awais
e6a63b5693 Grading bokchoy tests II 2018-08-03 12:09:21 +00:00
Agha Awais
be5ccf92e7 advanced settings bokchoy tests III 2018-08-03 12:06:23 +00:00
Kevin Falcone
8594c904fe Reset to master's migrations 
I rolled back to when we added the oauth2_provider migrations and caused
deployment issues, but they were added to the bok choy cache.

Since we're re-applying those migrations, this should reset bok choy to
a point where it can run our new migrations.
 2018-08-02 14:09:57 -04:00
Kevin Falcone
5050d8c629 Revert "Updating migrations" 
This reverts commit a21b963446.
 2018-08-02 14:01:36 -04:00
Kevin Falcone
8b739fc411 Revert "Updating migrations" 
This reverts commit b890399257.
 2018-08-02 14:01:29 -04:00
Kevin Falcone
e9f6e5ab49 Revert "Updating migrations" 
This reverts commit 80d9bec5a4.
 2018-08-02 14:01:20 -04:00
Awais Jibran
62559011dc Revert "fix poster display issue with hls" 
This reverts commit b9ebe5ea686fc1b16fccd0f276fbc1d53a5c3468.
 2018-08-02 19:53:40 +05:00
Agha Awais
469d871994 Merge pull request #18702 from edx/awais/lett_2_bc_textbook 
bokchoy tests for textbook page
 2018-08-02 16:43:41 +05:00
Cole Rogers
1c05308d4a Add credit pathway caching 2018-08-01 10:18:10 -04:00
Agha Awais
2f94817118 bokchoy tests for textbook page 2018-08-01 12:42:47 +00:00
Agha Awais
a3f8fe49cb Merge pull request #18690 from edx/awais/lett_2_bc_discussion_components 
discussion component bokchoy tests
 2018-08-01 16:44:54 +05:00
Michael Roytman
e5521d9ec2 Merge pull request #18661 from edx/mroytman/bok-choy-tests-course-outline 
bok choy tests for course outline status section
 2018-07-31 13:08:31 -04:00
Michael Roytman
7e8de93d05 bok choy tests for course outline status section 2018-07-31 12:00:44 -04:00
Agha Awais
a72beed4ec discussion component bokchoy tests 2018-07-31 14:29:49 +00:00
Jeremy Bowman
4241249119 TE-2524 Stop using nose.plugins 2018-07-30 21:11:05 -04:00
muhammad-ammar
c360b4effb fix poster display issue with hls 
EDUCATOR-2606

another approach
 2018-07-30 12:11:00 +05:00
Agha Awais
a4547183da Merge pull request #18497 from edx/awais/lett_2_bc_course_create 
TE-2622: Course Create bokchoy tests
 2018-07-27 14:56:55 +05:00
maiazadhun1
7faf59ff7a course create bokchoy tests 2018-07-26 11:45:06 +00:00
Agha Awais
8b9048bf8c Merge pull request #18498 from edx/awais/lett_2_bc_grading 
TE-2624: Grading bokchoy tests
 2018-07-26 12:50:39 +05:00
Agha Awais
442a0f510a Merge pull request #18515 from edx/awais/lett_2_bc_advanced_settings_II 
TE-2621: Advanced settings bokchoy tests 2
 2018-07-26 11:34:22 +05:00
Jeremy Bowman
84dc5c6c2a Merge pull request #18617 from edx/jmbowman/TE-2635 
TE-2635 Upgrade bok-choy
 2018-07-23 16:13:11 -04:00
Stu Young
bace18baa7 Merge pull request #18627 from edx/testeng/bokchoy_auto_cache_update_b28d5405ce2ffb838559cd5e0664bb9e742ad03d 
Bokchoy db cache update
 2018-07-23 15:52:42 -04:00
Jeremy Bowman
41a49f5f07 TE-2635 Upgrade bok-choy 2018-07-23 15:25:01 -04:00
edx-cache-uploader-bot
80d9bec5a4 Updating migrations 2018-07-23 15:12:10 -04:00
Bill Filler
df52ff0038 Merge pull request #18395 from edx/whitelabel/journal 
Add journals support in LMS
 2018-07-23 15:10:38 -04:00
Bill Filler
c746a4e630 Add Journals support 
Enable the journal app in LMS. Add support to display Journals on index
and courseware pages and dashboard.
 2018-07-23 13:11:26 -04:00
maiazadhun1
c7c38863dc Grading bokchoy tests 2018-07-23 12:12:33 +00:00
Agha Awais
51a2679333 Advanced settings bokchoy tests II 2018-07-23 10:45:08 +00:00
edx-cache-uploader-bot
b890399257 Updating migrations 2018-07-18 17:03:03 -04:00
lduarte1991
a9b61c06d3 Remove the annotations feature introduced by Harvard. 
There are other annotations features still in the platform but this one
is the one that works with an annotations server that was specialized
and not generally used by most instances of the platform.

The initial PR to remove this was made by 'lduarte1991' and can be found
here: https://github.com/edx/edx-platform/pull/17299

The work done based on the squashed commits:
removed advanced modules config for annotations
remove module files and config for annotations
remove js and css files related to annotations, under ova folders
removed js and css annotator file configs for cms and lms
remove template html files for annotations
removed annotations options from static html book
Added back some files that were originally marked "for OVA" but others used as per acceptance tests
Added back css file configs incorrectly marked as ova
Remove annotation related advanced settings from test.
Correct hls require.js pathing.
 2018-07-16 16:55:08 -04:00
edx-cache-uploader-bot
a21b963446 Updating migrations 2018-07-13 09:51:40 -04:00
Robert Raposa
d410d6d8ff Remove flaky test_edit_raw_html. 
EDUCATOR-3186
 2018-07-12 13:08:29 -04:00
Robert Raposa
e784f439bb Merge pull request #18570 from edx/feanil/remove_flaky_test 
Remove flaky studio unit test.
 2018-07-12 12:40:05 -04:00
Feanil Patel
9775af8620 Remove flaky studio unit test. 2018-07-12 11:26:19 -04:00
Robert Raposa
764ea22e3d Remove flaky test_library_content_side_bar_help. 
EDUCATOR-3183
 2018-07-12 10:53:27 -04:00
Jeremy Bowman
c962e7914c TE-2631 Fix notes bok-choy tests in devstack 2018-07-05 11:55:24 -04:00
Jeremy Bowman
b74131a726 TE-2630 Fix discussions bok-choy tests in devstack 2018-07-03 14:33:54 -04:00
Jeremy Bowman
addbf0f0e6 Merge pull request #18503 from edx/jmbowman/TE-2586 
TE-2586 Add missing time zone data to bok-choy fixtures
 2018-07-03 11:35:44 -04:00
Feanil Patel
aa3b6643b7 Merge pull request #18505 from edx/feanil/remove_flaky_content_library_test 
Remove flaky content library test.
 2018-07-03 10:01:54 -04:00
Feanil Patel
1caeb3283e Remove flaky video test. 
This test failed on commit 7083797c54 even though
that change has nothing to do with the video tests.
 2018-07-02 15:02:45 -04:00
Feanil Patel
99dcf32eee Remove flaky content library test. 
This test failed on commit 7083797c54 even though
that change has nothing to do with the content library.
 2018-07-02 15:02:14 -04:00
Jeremy Bowman
451514e930 TE-2586 Add missing time zone data to bok-choy fixtures 2018-07-02 13:55:54 -04:00
aghaawais01
f4e4f7c96f bokchoy conversion of advanced settings 2018-07-02 13:56:01 +00:00
Awais Jibran
4b81ab6312 Merge pull request #18367 from edx/aj/EDUCATOR-3035/screenreader-issue 
Screen reader issue with structure of LMS course outline
 2018-07-02 15:33:54 +05:00
edx-cache-uploader-bot
c8ad22f457 Updating migrations 2018-06-29 15:08:44 -04:00
edx-cache-uploader-bot
41d0e56a0e Updating migrations 2018-06-29 15:08:43 -04:00
edx-cache-uploader-bot
48889c13f8 Updating migrations 2018-06-29 15:08:42 -04:00
edx-cache-uploader-bot
6670883b4d Updating migrations 2018-06-29 15:08:41 -04:00