Commit Graph

28558 Commits

Author SHA1 Message Date
David Baumgold
c5cdfdc885 auto-create OAuth token for Github API 2014-05-06 16:10:25 -04:00
Feanil Patel
f14146a5fa Field name is 'username' not 'user' 2014-05-06 15:39:00 -04:00
Giulio Gratta
ba6b0cf4e7 Changes for Help Modal to work on Stanford Site
- moved zendesk endpoint to new condition
- some help modal styling
2014-05-06 12:06:04 -07:00
marcotuts
8ef2d5ab67 Merge pull request #3620 from edx/adam-add-quotation-mark
Adam add quotation mark
2014-05-06 14:47:57 -04:00
Adam Palay
5613f19994 add quotation mark to _dashboard_course_listing.html 2014-05-06 14:44:40 -04:00
srpearce
07c8e4aca7 Merge pull request #3553 from edx/sylvia/docs/DOC-294
Update LTI settings information
2014-05-06 14:15:05 -04:00
Sylvia Pearce
b8b92b9c8e Update LTI component information per new Studio UI 2014-05-06 14:14:00 -04:00
Ned Batchelder
db8c4de202 Remove press-page machinery and assets 2014-05-06 13:29:17 -04:00
Christina Roberts
ee0970fc04 Merge pull request #3616 from edx/christina/remove-template
Christina/remove template
2014-05-06 13:25:32 -04:00
marcotuts
b0781cdd4a Merge pull request #3614 from edx/waheed/fix-simple-problem-editor
Fixed simple problem editor text showing up in advanced editor
2014-05-06 12:17:37 -04:00
frances botsford
04b35f6a3a Merge pull request #3611 from edx/frances/fix/codemirror-overflow-checkboxes2
Fix for Codemirror overflowing Multiple Choice modal
2014-05-06 12:13:49 -04:00
Calen Pennington
974e66b74f Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates miscellaneous files in common.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-06 12:03:42 -04:00
Alison Hodges
7830e3f043 Merge pull request #3588 from edx/ahodges/documentation/AN992
Ahodges/documentation/an992
2014-05-06 11:56:49 -04:00
cahrens
3c1b363c01 Remove (Grade Me!) template until it can be productized. 2014-05-06 11:49:54 -04:00
Alison Hodges
ee05d018ee Added enrollment events and new member fields 2014-05-06 11:49:36 -04:00
frances botsford
3530721671 Merge pull request #3577 from edx/frances/fix/404-and-500-page-layout
Fix for Studio 404 and 500 page layouts
STUD-864
2014-05-06 11:44:51 -04:00
Waheed Ahmed
b873cfc26d Fixed simple editor text showing in advanced editor. 2014-05-06 20:35:38 +05:00
Don Mitchell
03c9b01213 fixup! Make course ids and usage ids opaque to LMS and Studio [partial commit] 2014-05-06 11:17:38 -04:00
Christina Roberts
df262d4fc7 Merge pull request #3229 from edx/christina/container-dnd
Drag and drop on container page
2014-05-06 11:09:29 -04:00
Frances Botsford
5890bc842c removing larger size for CodeMirror for funky visual behavior on Checkbox problems in release 2014-05-06 10:47:59 -04:00
Calen Pennington
9811926d97 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates lms/djangoapps/courseware.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-06 10:08:32 -04:00
David Baumgold
7de3b4098c Nicer error messaging 2014-05-06 09:42:28 -04:00
Alison Hodges
56924af9ac Merge pull request #3610 from edx/ahodges/documentation/changelogfail
Corrected the change log
2014-05-06 09:38:31 -04:00
Alison Hodges
482931d0cd Corrected the change log 2014-05-06 09:35:55 -04:00
David Baumgold
96122fc9a9 Warn and continue for missing merge commits 2014-05-06 09:34:12 -04:00
Alison Hodges
0f96853c2f Merge pull request #3524 from edx/ahodges/documentation/DOC286
added a new topic on interpreting score histograms
2014-05-06 09:34:12 -04:00
Alison Hodges
41e2241200 added a new topic on interpreting score histograms 2014-05-06 09:33:14 -04:00
Calen Pennington
2248968c57 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds updated requirements.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-06 09:24:00 -04:00
David Baumgold
a31624622f Merge pull request #3603 from edx/db/jenkins-reset-ruby
Reset the jenkins ruby environment before tests run
2014-05-06 09:21:46 -04:00
Anton Stupak
4a80b14ade Merge pull request #3607 from edx/anton/i18n-symbolic-response
SymbolicResponse i18n.
2014-05-06 15:58:49 +03:00
Usman Khalid
bbbfc33e34 Merge pull request #3552 from edx/usman/lms2565-bulk-email-display
When sending bulk email check if course is authorized.
2014-05-06 17:01:02 +05:00
polesye
d8e5647a10 BLD-721: SymbolicResponse i18n. 2014-05-06 12:46:33 +03:00
polesye
0fa910aa3d BLD-714: CustomResponse i18n. 2014-05-06 12:02:26 +03:00
Anton Stupak
6e4cea7bfd Merge pull request #3590 from edx/anton/i18n-string-response
StringResponse i18n.
2014-05-06 11:58:58 +03:00
polesye
7effca9ec6 BLD-722: CodeResponse i18n. 2014-05-06 11:26:49 +03:00
Renzo Lucioni
03e6c10a81 Merge pull request #3606 from edx/renzo/no-ga
Add ability to deactivate GA snippet
2014-05-05 20:14:04 -04:00
Renzo Lucioni
bfee237a0d Add ability to deactivate GA snippet 2014-05-05 17:31:07 -04:00
Sarina Canelake
799c3611de Merge pull request #3602 from edx/sarina/LMS-2644
Ensure system language is released in dark lang middleware
2014-05-05 16:29:37 -04:00
Calen Pennington
c056891332 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds base classes for CourseKeys and UsageKeys,
and Location and SlashSeparatedCourseKey implementations of both.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-05 16:01:48 -04:00
David Baumgold
90723bb53d Reset the jenkins ruby environment before tests run 2014-05-05 15:53:25 -04:00
Sarina Canelake
41b25fec9a Ensure system language is released in dark lang middleware
LMS-2644
2014-05-05 15:42:48 -04:00
Adam
0b8cc25be3 Merge pull request #3582 from edx/adam/some-cleaning
Adam/some cleaning
2014-05-05 15:14:59 -04:00
Han Su Kim
6579364f85 Merge pull request #3593 from edx/han/cert-report
Certificate report improvements
2014-05-05 15:01:58 -04:00
Jay Zoldak
f91b9eec65 Rebalance CMS acceptance test shards 2014-05-05 13:52:34 -04:00
Han Su Kim
8bcb70b8bf Filter just downloadable certs for report 2014-05-05 13:45:07 -04:00
Han Su Kim
4b49159205 Adding additional fields for certificate mode 2014-05-05 13:20:36 -04:00
Adam
5cef9f7a37 Merge pull request #3202 from edx/talbs/lms-dashboard-trackstatus
LMS: Show Enrollment Type on Dashboard
2014-05-05 13:19:49 -04:00
Christina Roberts
759b656ac8 Merge pull request #3594 from edx/christina/delete-dead-files
These files are not being used.
2014-05-05 13:07:25 -04:00
David Baumgold
70562b9dae Merge pull request #3578 from edx/db/500-template-on-studio
Show error page templates on Studio
2014-05-05 12:59:52 -04:00
Adam Palay
3804bb1f8f put google analytics in quotation marks in linkedin email template 2014-05-05 12:08:36 -04:00