Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,979 Commits 1 Branch 0 Tags
af6c5efbb3b2e483b39668bde675b71b0bb50edc
Commit Graph

22979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Muhammad Ammar
af6c5efbb3 Bok-Choy video tests batch4 2014-05-08 10:53:08 +00:00
Mark Hoeber
04376e085e Merge pull request #3637 from edx/markhoeber/documentation/doc-308 
Fixed typo
 2014-05-07 16:32:03 -04:00
srpearce
828cff4971 Merge pull request #3635 from edx/sylvia/docs/TIM-464 
Add peer- and self- only information
 2014-05-07 16:31:41 -04:00
Mark Hoeber
37ce55ce16 Fixed typo 
doc-308
 2014-05-07 16:16:01 -04:00
Giulio Gratta
6963d24e5d Merge pull request #3597 from caesar2164/giulio/help-modal-features 
Changes for Help Modal to work on Stanford Site
 2014-05-07 10:32:22 -07:00
Sylvia Pearce
febadfa638 Add peer- and self- only information 2014-05-07 11:22:17 -04:00
Ned Batchelder
5e34c21ff4 Merge pull request #3628 from edx/ned/fix-ignorable-404-ends 
IGNORABLE_404_ENDS is wrong and unused
 2014-05-07 11:17:05 -04:00
Alison Hodges
4a06fcc8c0 Merge pull request #3568 from edx/ahodges/documentation/DOC258 
Ahodges/documentation/doc258
 2014-05-07 09:14:49 -04:00
Alison Hodges
0d4df33379 Describe date format for close/reopen discussions 2014-05-07 09:13:08 -04:00
Anton Stupak
f2086f2336 Merge pull request #3586 from edx/anton/i18n-custom-response 
CustomResponse i18n.
 2014-05-07 15:13:13 +03:00
Anton Stupak
ed70a0823c Merge pull request #3608 from edx/anton/i18n-code-response 
CodeResponse i18n.
 2014-05-07 13:39:28 +03:00
Waheed Ahmed
7b92d52f9f Merge pull request #3510 from edx/waheed/stud1583-toggle-cheatsheet-not-working 
Fixed cheatsheet for open ended editor.
 2014-05-07 14:12:18 +05:00
Waheed Ahmed
998af82baa Fixed cheatsheet for open ended editor. 
STUD-1583
 2014-05-07 12:58:35 +05:00
muhammad-ammar
ca0315ed9b Merge pull request #3492 from edx/ammar/bok-choy-youtube-stub-video-tests 
Convert lettuce video tests specifically using youtube stub
 2014-05-07 12:48:56 +05:00
Muhammad Ammar
411a13b56c Convert lettuce video tests specifically using youtube stub 2014-05-07 06:11:07 +00:00
Ned Batchelder
4d4390c0c9 IGNORABLE_404_ENDS is wrong and unused 
This setting is only used if SEND_BROKEN_LINK_EMAILS is true, which it
is not, and it is deprecated, and this value for it is wrong, since it
is used as an iterable.
 2014-05-06 18:02:53 -04:00
Ned Batchelder
e25bbde4f2 Merge pull request #3618 from edx/ned/remove-press-stories 
Remove press-page machinery and assets
 2014-05-06 17:35:21 -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
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
Alison Hodges
7830e3f043 Merge pull request #3588 from edx/ahodges/documentation/AN992 
Ahodges/documentation/an992
 2014-05-06 11:56:49 -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
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
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
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
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
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
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
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
cahrens
acd9d7d904 These files are not being used. 2014-05-05 11:36:04 -04:00
Andy Armstrong
7693659e48 Address Christina's review comments 2014-05-05 11:34:55 -04:00
David Baumgold
93b5ccac45 Merge pull request #3503 from edx/db/process-updates 
Reorganize information in CONTRIBUTING.rst, link to ReadTheDocs
 2014-05-05 11:31:55 -04:00
Han Su Kim
36865b8447 flake8 cleanup 2014-05-05 11:31:39 -04:00