Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,459 Commits 1 Branch 0 Tags
5fc5587f9ef26128e396831fd80d3d2dcaad0f00
Commit Graph

6563 Commits

Author SHA1 Message Date
David Baumgold
4879b06c2a Merge pull request #1235 from edx/db/tie-i18n-to-debug 
Tie the USE_I18N setting to DEBUG setting
 2013-10-09 05:45:20 -07:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Calen Pennington
d785b1e213 Convert due_date_display_format tests to use factories 
Previously, these tests modified due_date, which failed due to the new
restrictions on writing to Scope.settings from the LMS.
 2013-10-08 15:29:17 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class 
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
 2013-10-08 15:29:17 -04:00
Julia Hansbrough
d93e96cbc3 Defined baseUrl in the LMS template, fixing a bug where HTML editors called within LMS would fail to load 2013-10-08 17:03:52 +00:00
David Baumgold
15b65fbecc Fix static links for footer images 2013-10-08 11:39:22 -04:00
Ned Batchelder
a03a11e0e7 Merge pull request #1253 from edx/ned/use-assertisinstance 
Use assertIsInstance where we can
 2013-10-08 07:47:21 -07:00
Will Daly
7f29ac56fe Merge pull request #1244 from edx/will/fix-wordcloud 
Remove unnecessary call from wordcloud test
 2013-10-08 07:40:55 -07:00
Valera Rozuvan
e3c0bb839b Merge pull request #1183 from edx/valera/add_option_transcripts_remove_onhover 
Valera/add option transcripts remove onhover
 2013-10-08 07:37:02 -07:00
Valera Rozuvan
de1381dbfc Added acceptance tests. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
812b085b84 Added hard-coded flag to video.html that turns on/off autohiding of captions. 
Front-end functionality was not removed. When flag is set to "True", old
behaviour of autohiding of controls and captions will be enabled.
 2013-10-08 12:00:06 +03:00
Ned Batchelder
a4bf549af4 Use assertIsInstance instead of assertTrue(type(x) == y) 2013-10-07 18:20:31 -04:00
Adam Palay
c64399424e re-enable some buttons on instr dash 2013-10-07 18:13:21 -04:00
Will Daly
4effdbb4b2 Remove unnecessary call from wordcloud test 2013-10-07 18:09:54 -04:00
David Ormsbee
8ea3e2047c Merge pull request #1231 from edx/ormsbee/verify_tests3 
Model tests for verify_student flow.
 2013-10-07 12:57:24 -07:00
David Ormsbee
02fc6a40db Add model tests to verify_student flow. 2013-10-07 15:56:38 -04:00
David Baumgold
fd7e8baccb Tie the USE_I18N setting to DEBUG setting 
We want USE_I18N to be on in development, but off in production. Tying
this setting to the DEBUG setting accomplishes that neatly.
 2013-10-07 15:04:15 -04:00
Adam
faf796b574 Merge pull request #1125 from edx/adam/remove-instr-dash-buttons 
disable buttons for legacy and beta instr dash
 2013-10-07 10:36:51 -07:00
Brian Talbot
8ec583c355 LMS: abstracts consistent message/copy color styling from Instructor Dashboard view 
LMS: adds message styling to the separate instructor_2 Sass file
 2013-10-07 10:14:10 -04:00
Adam Palay
197f9015aa disable buttons for large courses on legacy and beta instr dash 
set max enrollment for downloads to 200
 2013-10-07 10:11:08 -04:00
Will Daly
3257a7baf2 Refactored navigation feature 
Fixed grading tests
 2013-10-07 09:41:18 -04:00
David Baumgold
715aa6985e Merge pull request #662 from edx/db/requirejs 
requirejs in Studio
 2013-10-04 11:42:07 -07:00
Usman Khalid
a47442ed01 Merge pull request #1222 from edx/usman/lms1112-register-form-help-text 
register.html: Corrected help text for username & name fields
 2013-10-04 11:28:31 -07:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Diana Huang
f51a99c9bc Add in the static namespace to the new template 2013-10-04 13:28:33 -04:00
Will Daly
54ea98d249 Merge pull request #1219 from edx/will/run-individual-tests 
Allow rake test to run individual tests again
 2013-10-04 07:27:30 -07:00
Diana Huang
3ec8df9f5e Merge pull request #1216 from edx/diana/dashboard-cleanup 
Some dasbhoard template cleanup
 2013-10-04 06:17:06 -07:00
Usman Khalid
f80a32e082 Register.html: Corrected help text for username & name fields 2013-10-04 17:12:23 +05:00
Diana Huang
6bb2ba283b Remove more unnecessary imports 2013-10-03 16:34:16 -04:00
Diana Huang
ed5168ec61 Move more dashboard logic into the views 2013-10-03 16:22:00 -04:00
Will Daly
b0878d3d43 Allow rake test to run individual tests again 2013-10-03 16:15:33 -04:00
Sarina Canelake
66b8e1fc8e Merge pull request #1195 from edx/sarina/more-ins-dash 
Sarina/more ins dash
 2013-10-03 12:58:40 -07:00
Sarina Canelake
1251003d10 Remove enrollment from Student Admin page of new instructor dash 2013-10-03 15:57:31 -04:00
Sarina Canelake
d9f7f8cf98 I18n Student Admin page of new instructor dash 2013-10-03 15:57:31 -04:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Diana Huang
7ba38c0ff3 Refactor out logic for individual course listings. 2013-10-03 14:08:38 -04:00
Ned Batchelder
2a11ff0bdb Merge pull request #1198 from edx/ned/fix-calling-classmethods 
No need to invoke classmethods through self.__class__
 2013-10-03 10:28:39 -07:00
Diana Huang
51f44e02a6 Delete Pearson code from the dashboard page. 2013-10-03 11:53:08 -04:00
Ned Batchelder
a1be970153 Merge pull request #1194 from edx/ned/quiet-tests 
Quiet down exceptions at startup, and during tests
 2013-10-03 08:21:37 -07:00
Adam
246db90674 Merge pull request #1206 from edx/adam/unicode-error-instr-dash 
small unicode fix in instr dash
 2013-10-03 07:07:27 -07:00
David Ormsbee
cd7d75af72 Merge pull request #1184 from edx/ormsbee/vcerts_accept_tests_cleanup 
Re-enable verify student identity acceptance tests
 2013-10-03 06:08:12 -07:00
David Ormsbee
634da27347 Add AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING flag so that acceptance tests can run through certificate identity verification flow. 2013-10-02 18:09:00 -04:00
Adam Palay
c9ce25bcb2 small unicode fix in instr dash 2013-10-02 16:24:13 -04:00
jmclaus
9d418755a6 Added changes made to video.html to fixtures. Addressed latest PR comments 2013-10-02 16:54:48 +02:00
Ned Batchelder
3bbdd2f4c3 No need to invoke classmethods through self.__class__ 2013-10-02 10:35:58 -04:00
jmclaus
d201ce1035 Addressed PR comments 2013-10-02 15:55:23 +02:00
jmclaus
e5895adb2b Progress slider announces its nabe and value to screen readers 2013-10-02 15:55:22 +02:00
jmclaus
ce976a80c8 All buttons have an ARIA role, name , and state 2013-10-02 15:55:22 +02:00
Ned Batchelder
50aa37be57 Quiet down exceptions at startup, and during tests 
There's no need to display a traceback for every failed content load,
the comment before the log line even says so.

The exceptions shown before tests are run are because of the eager
initialization of the modulestores.  They don't need to be initialized
then, that just speeds the responsiveness of servers.  Putting off the
initialization means they get inited as needed, and the log lines get
 2013-10-01 18:13:06 -04:00
marco
81a2ac413d Merge branch 'release' 
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
 2013-10-01 17:05:02 -04:00