Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,351 Commits 1 Branch 0 Tags
7a8f372e259daec1a09cd94271b72c5b9a412987
Commit Graph

7563 Commits

Author SHA1 Message Date
Sarina Canelake
5386d0a4ca Merge pull request #10845 from edx/kill-ora1 
Remove ORA1: Main Pull Request
 2015-12-11 17:31:41 -05:00
Sarina Canelake
2e4bba0a79 Remove ORA1 test units from xmodule test courses 2015-12-11 15:07:12 -05:00
Sarina Canelake
6280ccdbcf Remove combined_open_ended XModule CSS (ORA1) 2015-12-11 15:07:11 -05:00
Sarina Canelake
9d6ae576da Remove combined_open_ended XModule JS code (ORA1) 2015-12-11 15:07:11 -05:00
Sarina Canelake
f689271639 Remove combined_open_ended XModule Python code (ORA1) 2015-12-11 15:07:10 -05:00
Sarina Canelake
2431baff8f Remove notification_image_for_tab logic (ORA1) 2015-12-11 15:07:08 -05:00
Sarina Canelake
fbe7f46f47 Adjust Mongo tests to account for removal of ORA1 2015-12-11 15:05:02 -05:00
Sarina Canelake
e023fb258b Remove ORA1 XModule JS specs and fixtures 2015-12-11 15:05:01 -05:00
Sarina Canelake
9c656b3ddb Remove ORA1 XModule Python tests 2015-12-11 15:05:01 -05:00
Sarina Canelake
f691b7b664 Remove all references to open_ended and s3 interfaces (ORA1) 2015-12-11 15:05:00 -05:00
Sarina Canelake
46bbd0a668 Remove outdated abtest_module 2015-12-11 14:54:45 -05:00
Sarina Canelake
ade863e994 Remove CMS Course Checklists feature 2015-12-11 10:32:14 -05:00
Nimisha Asthagiri
c14c146d0e Merge pull request #10841 from edx/mobile/optimize-course-api 
Optimize Course Catalog using CourseOverview
 2015-12-11 10:03:35 -05:00
Nimisha Asthagiri
aef4da86fe Refactor Course Catalog fields in CourseDescriptor 2015-12-10 17:15:41 -05:00
David Adams
66a52497b4 Remove unused filter field from Randomized Content Block edit form. 2015-12-10 11:48:38 -08:00
Renzo Lucioni
6d09a5b585 Merge pull request #10923 from edx/renzo/robust-modified-courseware 
Make modifies_courseware robust to exceptions raised during tests
 2015-12-10 11:26:17 -05:00
Renzo Lucioni
124afe4873 Make modifies_courseware robust to exceptions raised during tests 
Guarantees that SharedModuleStoreTestCase's reset() method is always called, regardless of whether decorated test cases raise exceptions.
 2015-12-10 10:36:21 -05:00
Ned Batchelder
43ac38aa87 Add autospec to all mocks 2015-12-09 09:44:22 -05:00
Sarina Canelake
edf6730ca0 Pylint fixes to symmath module 2015-12-08 22:56:28 -05:00
Sarina Canelake
8caad15188 Remove This Awful Code 2015-12-08 17:51:13 -05:00
Syed Hasan raza
9fc7c73bf0 Merge pull request #10854 from edx/shr/impr/TNL-3076-Tests-improvement 
Course_key naming convention
 2015-12-08 12:50:30 +05:00
Chris Rodriguez
4161ae9980 Tests 2015-12-07 14:05:07 -05:00
Chris Rodriguez
bb3ac95f24 Fix: correcting play/skip icon for bumper 2015-12-07 14:05:07 -05:00
Chris Rodriguez
c7ade04090 Xmodule: darkening 'correct' green color for WCAG AA requirements 2015-12-07 11:59:57 -05:00
Syed Hassan Raza
9ff080f650 Course_key naming convention 2015-12-07 21:24:50 +05:00
clrux
62039f70e3 Merge pull request #10798 from edx/clrux/ac-256 
Xmodule: syncing link color with LMS
 2015-12-07 11:16:15 -05:00
clrux
5cf41a0586 Merge pull request #10800 from edx/clrux/ac-261 
Xmodule: darkening gray text for WCAG AA requirements
 2015-12-07 11:15:42 -05:00
Sarina Canelake
337eabbb00 Merge pull request #10836 from edx/kill-foldit 
Remove 'FoldIt' XModule
 2015-12-07 10:18:40 -05:00
Syed Hasan raza
4f131fec9c Merge pull request #10806 from edx/shr/bug/TNL-3076-Handout-links-not-updated-at-import 
Update handout link with current course_id
 2015-12-07 14:13:47 +05:00
Syed Hassan Raza
706716694a Update handout link with current course_id 2015-12-07 13:21:10 +05:00
Sarina Canelake
84a96e40c4 Remove 'Fold It' XModule 2015-12-06 11:38:05 -05:00
Sarina Canelake
2cfeb34f45 Merge pull request #10825 from edx/kill-psycho 
Remove psychometrics app
 2015-12-04 17:23:20 -05:00
Sarina Canelake
e932632b49 Remove psychometrics app 2015-12-04 16:37:34 -05:00
Nimisha Asthagiri
d6ced072c4 Refactor CourseDetails 2015-12-04 16:03:05 -05:00
Ned Batchelder
d344d6f80a Merge pull request #10815 from edx/ned/add-translator-comments 
Add translator comments
 2015-12-03 16:46:03 -05:00
Ned Batchelder
ed96a9d87a Add translator comments 
There are English words in these strings, but they are actually specific
values that must appear as these English words, and so should not be
translated.
 2015-12-03 14:47:08 -05:00
Ned Batchelder
67c1cdf5f4 Fix missing translator comments 
Turns out if the string literal starts on the next line after the
translation function, then the translator comment is lost.  So, either
close up short strings, or add a dummy empty string on the first line to
concatenate with the real string.

Ugh.
 2015-12-03 13:45:01 -05:00
Chris Rodriguez
b69787481f Xmodule: darkening gray text for WCAG AA requirements 2015-12-02 15:09:46 -05:00
Chris Rodriguez
07944b0852 Xmodule: syncing link color with LMS 2015-12-02 14:29:06 -05:00
Michael Frey
29b6ccf5e4 Added new Course List API. 2015-11-24 15:54:03 +00:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations 
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
 2015-11-23 15:32:54 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Sarina Canelake
256dc5b6f8 Reword default about page questions 2015-11-19 15:44:54 -05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
Chris Rodriguez
78c6a38ca6 LMS: new UI for video player + AFontGarde iconfonts 2015-11-12 16:37:29 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Cliff Dyer
27b85fb737 Merge pull request #10554 from edx/release 
Verifying release branch for release-2015-11-09
 2015-11-09 13:26:01 -05:00
louyihua
73d8f06499 Fix gettext guidance violation 
1. No string concatenation should be used in the gettext function.
2. Some extra parentheses should be used in coffee script, to avoid the following situation: in coffee script, the call ```gettext "text to be extracted" + "text should not be extracted"``` will be translated into ```gettext("text to be extracted" + "text should not be extracted")``` rather than ```gettext("text to be extracted") + "text should not be extracted"```.
 2015-11-07 13:55:10 +08:00
Adam Palay
33d9185d5d Revert "Disable submit button on save click" 
This reverts commit 99cca05730.
 2015-11-06 11:34:33 -05:00
Adam Palay
bc87ec15a9 Revert "add test for disabling check button while clicking save" 
This reverts commit bc6caea6a6.
 2015-11-06 11:33:52 -05:00