Waheed Ahmed
40a03ebb79
Redirected to dashboard if course mode is none.
...
LMS-2617
2014-05-09 15:34:26 +05: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
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
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
David Baumgold
edab57d6c7
Removed message about non-affiliated open source contributors
2014-05-06 16:35:12 -04:00
David Baumgold
24bb331b06
memoized function
2014-05-06 16:34:41 -04:00
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
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
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
