Commit Graph

23043 Commits

Author SHA1 Message Date
Carson Gee
74578cd720 Merge pull request #3493 from carsongee/cg/sysdash_git_info
Adding additonal path to search for git information on sysadmin dashboard
2014-05-09 15:14:10 -04:00
Sarina Canelake
193a816395 Merge pull request #3609 from edx/sarina/i18n-cleanup
Clarify strings for i18n
2014-05-09 15:00:36 -04:00
Dave St.Germain
eab8445eb1 Merge pull request #3156 from edx/dcs/LMS-1740
Fixes LMS-1740 by activating the zooming diagram with the spacebar.
2014-05-09 14:28:24 -04:00
Ned Batchelder
4ea3945d78 Merge pull request #3667 from edx/ned/more-links-in-pr-guidelines
Add more links in the PR guidelines.
2014-05-09 14:01:41 -04:00
Ned Batchelder
c7543dd33d Add more links in the PR guidelines. 2014-05-09 13:53:16 -04:00
Carson Gee
379745e3a4 Merge pull request #2686 from edx/feature/ichuang/add-reset-links-to-staff-debug
add problem reset link to staff debug page
2014-05-09 13:29:29 -04:00
srpearce
d756b4a96d Merge pull request #3617 from edx/sylvia/docs/DOC-359
Sylvia/docs/doc 359
2014-05-09 13:26:39 -04:00
Sylvia Pearce
28a2efeace Add VitalSource information 2014-05-09 13:25:38 -04:00
srpearce
fa0e958b43 Merge pull request #3650 from edx/sylvia/docs/DOC-206
Sylvia/docs/doc 206
2014-05-09 12:38:05 -04:00
Sylvia Pearce
c1ef41fe6a Update Video component UI text 2014-05-09 12:37:28 -04:00
Mark Hoeber
dbb87e2609 Merge pull request #3663 from edx/markhoeber/documentation/doc-309
Note about course staff and discussion admin roles
2014-05-09 12:05:33 -04:00
Mark Hoeber
3a185b2656 Note about course staff and discussion admin roles
doc-309
2014-05-09 11:36:32 -04:00
Carson Gee
7c1e6d83e4 Fix message handling to be more internationalizable 2014-05-09 11:21:39 -04:00
Greg Price
8f90dd835d Merge pull request #3653 from edx/gprice/discussion-link-command
Add command to get discussion_link for a course
2014-05-09 10:34:45 -04:00
Sarina Canelake
81a8bc39f6 Clarify strings for i18n 2014-05-09 10:23:46 -04:00
srpearce
f4d97ca55d Merge pull request #3652 from edx/sylvia/docs/DOC-390
Fixed typos in example code for drag and drop problems
2014-05-09 09:51:30 -04:00
muhammad-ammar
50a99de6e1 Merge pull request #3634 from edx/ammar/bok-choy-video-tests-batch6
Bok-Choy Video Tests Batch6
2014-05-09 18:31:04 +05:00
Adam
efcd13e836 Merge pull request #3511 from edx/adam/wiki-hide-fix-firefox
fix wiki hide button not working in firefox (STUD-1581)
2014-05-09 07:04:03 -05:00
Waheed Ahmed
31f3ef0ab3 Merge pull request #3632 from edx/waheed/lms2617-verify-mode-none
Redirected to dashboard if course mode is none.
2014-05-09 16:37:54 +05:00
Waheed Ahmed
40a03ebb79 Redirected to dashboard if course mode is none.
LMS-2617
2014-05-09 15:34:26 +05:00
Muhammad Ammar
aa0e8041af Bok-Choy Video Tests Batch6 2014-05-09 07:22:03 +00:00
Carson Gee
b3ec4d1b6b Switching to new dashboard API and adding rescore to actions list 2014-05-08 19:03:14 -04:00
Greg Price
5e849bfb76 Add command to get discussion_link for a course
This will be used to detect courses that are linking to Stack Exchange
sites so we can handle them specially when generating data dumps.
2014-05-08 17:40:13 -04:00
Sylvia Pearce
91534bf0f0 Fixed typos in example code for drag and drop problems 2014-05-08 17:00:59 -04:00
Mark Hoeber
2d132e10eb Merge pull request #3649 from edx/markhoeber/documentation/doc-344
Added warnings about file size
2014-05-08 15:54:53 -04:00
Mark Hoeber
95e1ee6e7b Added warnings about file size
doc-344
2014-05-08 15:54:07 -04:00
David Baumgold
43b4a6b40e Merge pull request #3646 from edx/db/mysql-python-upgrade
Upgrade mysql-python to 1.2.5
2014-05-08 14:36:55 -04:00
Jason Bau
78950bb501 Merge pull request #3566 from edx/jbau/django-1.4.12
Bump django 1.4 minor version to 1.4.12 to pick up patches
2014-05-08 11:06:38 -07:00
David Baumgold
175180d022 Upgrade mysql-python to 1.2.5 2014-05-08 13:19:01 -04:00
Carson Gee
c23a05b50d Merge pull request #3213 from carsongee/cg/video_transcript_static
Add static fallback method for video transcripts
2014-05-08 11:51:04 -04:00
David Baumgold
e1e87e1a15 Merge pull request #3570 from edx/db/pr-table-for-release
Make release table by PR, instead of by commit
2014-05-08 10:42:36 -04:00
Feanil Patel
1a9b505572 Merge pull request #3622 from edx/feanil/fix_enrollment_bug
Field name is 'username' not 'user'
2014-05-08 09:44:12 -04:00
muhammad-ammar
e3f3841bf8 Merge pull request #3518 from edx/ammar/bok-choy-video-tests-batch4
Bok-Choy video tests batch4
2014-05-08 18:23:19 +05:00
Muhammad Ammar
af6c5efbb3 Bok-Choy video tests batch4 2014-05-08 10:53:08 +00:00
David Baumgold
b319086589 get_github_creds() returns a two-tuple 2014-05-07 16:42:05 -04: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
David Baumgold
c1f5fe6ed9 wordsmithing 2014-05-07 16:16:54 -04:00
Carson Gee
2998a2e9b7 Code review changes
i18n
2014-05-07 16:16:37 -04:00
Mark Hoeber
37ce55ce16 Fixed typo
doc-308
2014-05-07 16:16:01 -04:00
David Baumgold
ab94cb023f move comment 2014-05-07 16:08:28 -04:00
David Baumgold
911405cd41 make sure the script works with the table flag 2014-05-07 16:05:53 -04:00
David Baumgold
6e48d54a7d Refactor to support two-factor authentication 2014-05-07 15:58:26 -04:00
Carson Gee
c0644dc984 Only do static transcript redirect for english language, and don't offer static redirect for download
Rename video test to real YouTube-ID
2014-05-07 15:11:41 -04:00
Carson Gee
ab6c82342e Add last resort method to download and showing of video transcript 2014-05-07 15:11:41 -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
David Baumgold
d49c97bd27 return tuple, not list
so the output can be memoized
2014-05-07 11:12:46 -04:00
David Baumgold
a5f078c6c4 include commits-without-prs table 2014-05-07 11:06:45 -04:00