Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,432 Commits 1 Branch 0 Tags
7e12e40164bc4e444b71fa1ecdcf5e19eca30430
Commit Graph

26432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
7e12e40164 Merge pull request #5532 from edx/adam/disable-pycontracts-on-startup 
disable pycontracts except in development environments (PLAT-122)
 2014-10-22 14:17:45 -04:00
Ben Patterson
ed59dfbc15 Merge pull request #5686 from edx/benp/tddium-timeout 
Increase overall build timeout.
 2014-10-22 14:06:37 -04:00
Ben Patterson
8d574a2545 Increase overall build timeout. 2014-10-22 13:36:39 -04:00
Carlos Andrés Rocha
578f5b6299 Merge pull request #5673 from rocha/fix-course-structure-command 
Fix dump course structure when element metadata uses opaque keys.
 2014-10-22 10:22:55 -07:00
Christina Roberts
d4531201e5 Merge pull request #5654 from edx/christina/visible_graded_content 
Tests for conditional content (split_test module).
 2014-10-22 12:55:30 -04:00
Carlos Andrés Rocha
a1a7504f81 Fix dump course structure when element metadata uses opaque keys. 
Make sure that during the serialization, all opaque keys and their
references and serialized using the `unicode` function.

AN-3821
 2014-10-22 12:36:50 -04:00
cahrens
c09632ef69 Tests for conditional content (split_test module). 
TNL-39
 2014-10-22 10:38:50 -04:00
Anton Stupak
ce4fb60ba0 Merge pull request #5598 from edx/anton/maintenance-fonts 
Maintenance page: Serving Fonts through Platform Assets
 2014-10-22 17:19:22 +03:00
Don Mitchell
00ca7cbde5 Merge pull request #5649 from edx/dhm/update_ok 
Update opaque_keys to new release
 2014-10-22 09:42:29 -04:00
Don Mitchell
2ac069a6ae Merge pull request #5653 from edx/dhm/PLAT-189 
Add command line command to create course in either split or mongo
 2014-10-22 09:41:55 -04:00
clytwynec
def3467e45 Merge pull request #5672 from benpatterson/testeng/rebase-upstream 
Testeng/rebase upstream
 2014-10-22 09:19:03 -04:00
polesye
7e6483f7b5 TNL-633: Remove leftover Google Font reference. 2014-10-22 16:11:49 +03:00
Adam
2bb44a001a Merge pull request #5641 from edx/adam/update-latex-data 
update latex problem data (TNL-264)
 2014-10-22 08:52:52 -04:00
Muhammad Ammar
03b9ed744f Publish datadog stats for build 
TE-453
 2014-10-22 00:05:03 +00:00
Ben Patterson
3a6a519bac Upgrade to mongo 2.6.4 2014-10-22 00:05:03 +00:00
Muhammad Ammar
ff0e8c3805 Merge Coverage Reports 
TE-465
 2014-10-22 00:05:03 +00:00
Ben Patterson
5524e0bdee Add quality report capability. 2014-10-22 00:05:03 +00:00
Ben Patterson
a90ba504f7 re-shard lms to fix a failing test. 2014-10-22 00:05:03 +00:00
Ben Patterson
eb0ada02d4 introduce bok-choy shards, new firefox version 2014-10-22 00:05:03 +00:00
Minh Tue Vo
07a723c08e fixing file log error 2014-10-22 00:05:03 +00:00
Minh Tue Vo
bef4e9c584 adding post worker script 2014-10-22 00:05:03 +00:00
Minh Tue Vo
d6434676ca fixed capturing screenshots 2014-10-22 00:05:03 +00:00
Ben Patterson
2b40e26283 Merge PR#3. Solano: Add post worker hook for copying artifacts. 2014-10-22 00:05:03 +00:00
Ben Patterson
7b5e5794b0 add Solano CI. 2014-10-22 00:05:03 +00:00
Adam Palay
becd4c1b9a update latex problem data (TNL-264) 2014-10-21 16:58:30 -04:00
Don Mitchell
0d36dd7264 Merge pull request #5646 from edx/dhm/migrate_bug 
Fix command line migrator
 2014-10-21 16:55:59 -04:00
Don Mitchell
a4d13dc42c Add command line command to create course in either split or mongo 
PLAT-189
 2014-10-21 16:34:36 -04:00
Ben Patterson
bf0378f39f Merge pull request #5669 from edx/benp/solano2-flaky-couse-export 
Add wait to fix flaky tests.
 2014-10-21 15:31:01 -04:00
Carol Tong
47e7dfc135 Merge pull request #5644 from edx/carol/docs/DOC-990 
Update screenshots to show updated text under Advanced Settings discussion blackout period
 2014-10-21 14:43:41 -04:00
David Baumgold
332dc53ee7 Merge pull request #5661 from edx/openedx-confluence-release-pages 
Make release script suggest a release page on openedx.atlassian.net
 2014-10-21 14:40:22 -04:00
David Baumgold
08dbf9f351 Make release script suggest a release page on openedx.atlassian.net 2014-10-21 14:26:53 -04:00
Ben Patterson
f3facddee6 Add wait to fix flaky tests. 2014-10-21 14:21:42 -04:00
Don Mitchell
f89a6944de Re-enable the unit tests and fix 2014-10-21 13:14:21 -04:00
Mark Hoeber
c213f64d4f Merge pull request #5642 from edx/markhoeber-doc1123 
Updated max attempts advanced settings help string
 2014-10-21 11:09:34 -04:00
srpearce
8e0d5bd96b Merge pull request #5354 from edx/sylvia/docs/mobile 
Sylvia/docs/mobile
 2014-10-21 10:46:32 -04:00
Don Mitchell
98f962274c Update opaque_keys to new release 2014-10-21 09:30:33 -04:00
Oleg Marshev
3d149bf5ea Merge pull request #5585 from edx/oleg/giturl-not-deprecate 
GIT URL should not be a deprecated setting (TNL-396).
 2014-10-21 14:52:57 +03:00
Oleg Marshev
f5294358a6 Do not deprecate giturl. 2014-10-21 13:21:38 +03:00
Waheed Ahmed
3ad2959f65 Merge pull request #5639 from edx/waheed/fix-screen-reader-user-issues 
Fixed screen reader issues.
 2014-10-21 14:13:51 +05:00
Waheed Ahmed
9a1bae0453 Merge pull request #5612 from edx/waheed/tnl89-add-missing-required-states-for-video--progress-slider 
Added three missing required states for video progress slider.
 2014-10-21 13:23:42 +05:00
Waheed Ahmed
865850c2ad Fixed screen reader issues. 
TNL-568
TNL-588
TNL-595
 2014-10-21 12:33:51 +05:00
Waheed Ahmed
204b52e92d Added three missing required states for video progress slider. 
TNL-89
 2014-10-21 12:21:16 +05:00
Sarina Canelake
16771e6944 Merge pull request #5634 from Edraak/fix-unicode-error-in-migration 
Fixed UnicodeEncodeError in student`s migrations
 2014-10-20 17:51:23 -04:00
David Baumgold
9c8c33c532 Merge pull request #5603 from lduarte1991/lduarte-harvardx-pr32 
Image Annotation Tool: Border and tag-based coloring
 2014-10-20 16:40:11 -04:00
Alison Hodges
6baae890c0 Merge pull request #5635 from edx/ahodges/doc/DOC1120 
Remove weekly tracking log instructions
 2014-10-20 15:31:05 -04:00
Alison Hodges
8a80934fcb Remove weekly tracking log instructions 
@stroilova, @victor, @mhoeber, @clintonb, @WatsonEmily, please review.
 2014-10-20 15:30:42 -04:00
lduarte1991
464de86c2d Annotation Tool: Search happens when user hits enter 2014-10-20 15:14:36 -04:00
Don Mitchell
4fc8ed8e7a Fix command line migrator 2014-10-20 14:34:33 -04:00
Will Daly
7496041f62 Merge pull request #5567 from edx/will/register-says-enroll 
Change text of registration to enrollment
 2014-10-20 14:20:45 -04:00
Carol Tong
2639b2f191 Update screenshots for discussion blackout setting 2014-10-20 13:55:59 -04:00