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
Jason Bau
829d0d5dd0
Merge pull request #1174 from edx/jbau/fix/optional-enable-shopping-cart
...
make ENABLE_SHOPPING_CART truly optional
2013-09-30 11:05:38 -07:00
Jason Bau
06cac195f0
make ENABLE_SHOPPING_CART truly optional
...
course_about was throwing 500s if ENABLE_SHOPPING_CART=False
2013-09-30 09:09:17 -07:00
Carlos Andrés Rocha
2e7e354076
Fix course enrollment count in instructor dashboard
...
Fix AN-115
2013-09-30 11:41:49 -04:00
Vik Paruchuri
c11f708d0f
Merge pull request #1080 from edx/fix/vik/oe-problems
...
Clean up open ended problems view and fix error.
2013-09-27 14:12:15 -07:00
Calen Pennington
37627704dc
Merge pull request #1117 from cpennington/manage.py-only-tests
...
Move nose arguments around so that we can run tests with manage.py
2013-09-27 13:13:03 -07:00
Vik Paruchuri
9a6ae8f740
Clean up open ended problems view and fix error.
2013-09-27 16:02:12 -04:00
Vik Paruchuri
4ab47c4d05
Fix mako syntax in rubric template.
2013-09-27 15:57:41 -04:00
Usman Khalid
bc56ab7c13
Merge pull request #1057 from edx/usman/lms-1114-pdf-arrows
...
Disables the previous/next arrows on pdf books on the first/last pages
2013-09-27 12:50:38 -07:00
Calen Pennington
67ccf1e3bb
Move nose/django arguments for tests out of rake so that raw manage.py works when running tests
2013-09-27 15:41:58 -04:00
Usman Khalid
316b4eee95
Merge pull request #1073 from edx/usman/lms1026-find-courses-link-optional
...
Added setting to disable 'find courses' links
2013-09-27 12:40:07 -07:00
Greg Price
3e3ad4393e
Merge pull request #1161 from edx/gprice/forums-labels
...
Add accessible labels for forum post body inputs
2013-09-27 11:37:45 -07:00
Giulio Gratta
d75cdda064
An assortment of small OE changes, both for ICE and standard
...
- Changed save OE message text
- Fix ICE legend positioning and content
- Add space to "offensive" checkbox
- Change tracker variable in undo to correct one
2013-09-27 11:29:06 -07:00
Greg Price
f4971e753b
Add accessible labels for forum post body inputs
2013-09-27 13:47:45 -04:00
Greg Price
44b4204aa0
Merge pull request #1155 from edx/sarina/ins-dash-student-admin-2
2013-09-27 10:35:34 -07:00
Calen Pennington
d77491e46a
Pull XModule attributes out into a mixin that can be applied to xblocks
2013-09-27 13:11:05 -04:00
Greg Price
6b5d12e491
Merge pull request #1159 from edx/gprice/forum-focus-color
...
Make discussion elements change color on focus
2013-09-27 09:55:14 -07:00
Sarina Canelake
3813e51cfb
Add more feedback for instructors on Student Admin section of the dash.
2013-09-27 12:18:01 -04:00
Sarina Canelake
91d85f5c2a
Enable alerts when a task succeeds.
...
Note: Alerts are pop-up boxes. Not sure if this is desireable, but I couldn't figure out
how to make a success message show up in the same place that error messages do.
2013-09-27 12:17:53 -04:00
Sarina Canelake
086f544a1a
Fix, and add more, tests
2013-09-27 12:17:45 -04:00
Sarina Canelake
07e76b3b2f
Enable use of student usernames on student admin page
...
This is in addition to email addresses, which also work.
2013-09-27 12:17:35 -04:00
Sarina Canelake
8a2bd25b7c
Visual rearrangement of new dash "Student Admin" page
2013-09-27 12:17:24 -04:00
