Commit Graph

7527 Commits

Author SHA1 Message Date
Dave St.Germain
a6797899da Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections. 2014-02-05 11:32:08 -05:00
Dave St.Germain
9132009fd3 Merge pull request #2463 from edx/dcs/a11y-progress-delistify
Converted <ol> to <div> to prevent a11y confusion on course progress page.
[LMS-1727]
2014-02-05 11:16:41 -05:00
Brian Talbot
26068a982f LMS: removing redundancy and markup reliability from progress-page Sass selectors 2014-02-05 10:49:37 -05:00
Calen Pennington
6d67d0c677 Merge pull request #1949 from cpennington/xblock-studio-js-and-css
Enable XBlock js and css in Studio
2014-02-05 08:19:45 -05:00
Jason Bau
70762d1ab7 Merge pull request #2307 from edx/jbau/allow-unset-course-startdate
Handle taking registrations on a course with TBD start date
2014-02-04 16:07:23 -08:00
chrisndodge
3f43fb6436 Merge pull request #1967 from edx/feature/cdodge/cap-num-enrollments
Add ability to cap number of enrollments in a course
2014-02-04 13:38:52 -08:00
Calen Pennington
818ad15967 Merge pull request #2304 from cpennington/less-initialization
Don't force modulestore initialization when running lms manage.py, only when running via the wsgi file
2014-02-04 13:27:01 -08:00
Calen Pennington
f6731342de Make Studio load XBlock fragment js and css on the client-side
[LMS-1421][LMS-1517]
2014-02-04 15:38:13 -05:00
Calen Pennington
13c894eb31 Remove extraneous configuration 2014-02-04 15:35:26 -05:00
Chris Dodge
ad7348ec11 Allow author to cap enrollments in course
add a test case for enrollment caps

pep8 fix
2014-02-04 15:32:36 -05:00
Julia Hansbrough
aeb7bbf260 Merge pull request #2461 from edx/flowerhack/fix/csv-using-read-replica
Fixed 500ing CSV reports
2014-02-04 11:56:54 -08:00
Usman Khalid
0eb9c34341 Merge pull request #2396 from edx/usman/lms2090-instructor-task-transactions
instructor_task: Distribute extra items among subtasks of last query.
2014-02-04 11:17:20 -08:00
Dave St.Germain
b0af0b18b9 Converted <ol> to <div> to prevent a11y confusion. 2014-02-04 14:00:17 -05:00
Usman Khalid
95a112a3dd instructor_task: Distribute extra items among subtasks of last query.
When creating an instructor task total_num_items may change between the
time it and the number of subtasks is calculated and the time the
subtasks are actually queued (all of this cannot happen in one transaction).
In such a case the extra items are distributed among the subtasks of the
last query.

LMS-2090
2014-02-04 23:30:02 +05:00
Carson Gee
69097e7b4a Merge pull request #2032 from carsongee/cg/ssl-studio
More fully integrate and test ssl external auth in CMS
2014-02-04 09:54:17 -08:00
Julia Hansbrough
891465d1b0 Fixed 500ing CSV reports 2014-02-04 16:38:08 +00:00
Carson Gee
8cbe263ca0 Rename of feature AUTH_USE_MIT_CERTIFICATES to AUTH_USE_CERTIFICATES across platform.
Caution! This is backwards incompatible
2014-02-04 10:50:48 -05:00
Calen Pennington
49217ebe8b Allow multiple client-side runtimes on a single page
Make XBlock client-side runtimes proper classes, so that handlerUrl can
be defined in a per-runtime way, and we can have multiple runtimes on a
single page.

[LMS-1630][LMS-1421][LMS-1517]
2014-02-04 08:55:36 -05:00
Jason Bau
7ac13bf81e Don't show course start date if it hasn't been set.
If neither start nor advertised_start has been changed from default
don't show the course start date.

This allows us to accept course registrations for courses whose start
date is yet TBD.
2014-02-03 16:20:39 -08:00
Dave St.Germain
0f8919a6ba Merge pull request #2441 from edx/dcs/info-remove-title
Removed extraneous title block that was replacing the breadcrumbs
2014-02-03 14:28:56 -08:00
Julia Hansbrough
5f325a4b89 Merge pull request #2447 from edx/flowerhack/fix/update-language-settings
Removed LANGUAGE from devstack settings
2014-02-03 14:22:25 -08:00
Giulio Gratta
a76e5bd6e2 Merge pull request #2442 from edx/giulio/fix-disabled-about-page-button
fixing layout/style of disabled register button
2014-02-03 13:45:44 -08:00
Julia Hansbrough
cd95469b18 Removed LANGUAGE from devstack settings 2014-02-03 21:44:04 +00:00
Feanil Patel
5e5c59cab2 Merge remote-tracking branch 'origin/release'
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml.py

Took the changes that were on the release branch.
2014-02-03 16:39:40 -05:00
Giulio Gratta
1e1826af18 fixing layout/style of disabled register button 2014-02-03 13:17:15 -08:00
Giulio Gratta
5a722b9048 Merge pull request #2436 from edx/giulio/add-og-info-about-pages
Add OG title and description to course about pages
2014-02-03 13:02:21 -08:00
Giulio Gratta
879a849eea Add OG title and description to course about pages 2014-02-03 12:36:43 -08:00
Dave St.Germain
ac8eeac798 Removed extraneous title block that was replacing the breadcrumbs 2014-02-03 15:22:25 -05:00
Calen Pennington
a3146cd7aa Merge pull request #2388 from cpennington/initial-languages
Add initial languages, ready for dark-launch
2014-02-03 11:52:32 -08:00
jsa
95b87f0683 Allow new response pagination parameters to pass through thread model.
JIRA: FOR-374
2014-02-03 13:41:48 -05:00
Calen Pennington
f5ffc94d16 Prep for initial language release 2014-02-03 13:35:56 -05:00
Jay Zoldak
7e075eece1 Merge pull request #2433 from edx/zoldak/fix-tests-unicode
Mark strings that were causing test failures as unicode
2014-02-03 10:23:00 -08:00
Adam
f48a456b8c Merge pull request #2429 from edx/adam/fix/login-i18n
i18n input field on login page (LMS-2159)
2014-02-03 10:01:22 -08:00
Jay Zoldak
5ab0c9adb5 Mark strings that were causing test failures as unicode 2014-02-03 12:52:45 -05:00
Greg Price
4e1c595472 Merge pull request #2377 from edx/gprice/forum-thread-pagination
Add pagination of responses to forum threads
2014-02-03 08:55:20 -08:00
Adam Palay
ca7faaa715 i18n input field on login page (LMS-2159) 2014-02-03 11:21:19 -05:00
Will Daly
eae4adeb9b Merge pull request #2361 from edx/will/bok-choy-upgrade-and-lms-tests
Bok-choy upgrade, LMS tests, cleanup
2014-02-03 08:11:03 -08:00
Jason Bau
51e6d5fb68 Merge pull request #2386 from edx/jbau/fix-title-stanford-theme
fix main.html template -- <title> was eating everything
2014-01-31 16:31:12 -08:00
Greg Price
062025eeec Add pagination of repsonses to forum threads
Users will first be shown the first 25 responses of a viewed thread and
then have the option of loading 100 more at a time until all responses
have been loaded. This mitigates the performance impact of very large
threads by avoiding the need to render and transfer over the network
all content of a large thread at once. It will also allow students with
slower browsers to interact with large threads even if they cannot load
all of the responses.
2014-01-31 18:17:04 -05:00
Giulio Gratta
a7048f92a0 Merge pull request #2394 from edx/giulio/highlight-notification-checkbox
Make notification checkbox more obvious
2014-01-31 15:00:09 -08:00
Julia Hansbrough
cac83948b1 Merge pull request #2156 from edx/flowerhack/feature/basic-reverify-flow
Follow-On Verification
2014-01-31 14:51:16 -08:00
Giulio Gratta
90e9938e66 Make notification checkbox more obvious
- Clarify checkbox description wording
- Wrap checkbox and envelope icon in div to make it stand out
- Added styling for wrapper div
- Wrap label element around div to allow clicking the envelope to activate the checkbox
- Indented HTML and fixed if wrapping issue
2014-01-31 14:37:44 -08:00
Julia Hansbrough
17869c5eee Midcourse reverification: i18n fixes
Fixed i18n in templates
2014-01-31 22:20:33 +00:00
Julia Hansbrough
e50ef39bee Midcourse reverification: Events 2014-01-31 22:20:33 +00:00
Frances Botsford
63a22ad0e5 PR review changes for LMS reverification 2014-01-31 22:20:32 +00:00
Julia Hansbrough
69b5b033fd Midcourse reverifications: dismissal banner
Added a banner that students can use to dismiss the "you have failed reverification" message.  Also, removed unused code, wired up the sidebar for design
2014-01-31 22:20:32 +00:00
Frances Botsford
436a1ec7f6 downstairs fixxup on lms reverification 2014-01-31 22:11:57 +00:00
Julia Hansbrough
3aa80654cb Midcourse reverification: fixing broken tests
Also, refactored code representing ReverifyInfo
2014-01-31 22:08:09 +00:00
Frances Botsford
86588c492b added notification styles for re-verification and general on LMS 2014-01-31 22:08:09 +00:00
Julia Hansbrough
3e1519c62a Midcourse reverification: increased quality
Also, removed an unused template
2014-01-31 22:08:09 +00:00