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

24668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave St.Germain
a6b7fa216c Merge pull request #4615 from edx/dcs/enrollment_count_dashboard 
Show the enrollment counts for each mode on the instructor dashboard.
 2014-08-01 12:18:49 -04:00
Dave St.Germain
eb1d046352 Show the enrollment counts for each mode on the instructor dashboard. 2014-08-01 12:17:36 -04:00
Jesse Zoldak
a0b4f8b6c6 Merge pull request #4643 from edx/zoldak/disable-video-handout-tests 
Disable video handout tests
 2014-08-01 07:14:30 -04:00
Anton Stupak
1ebb4c5304 Merge pull request #4629 from edx/anton/disable-css-animations-in-bok-choy 
Disable css3 animations in bok-choy tests.
 2014-08-01 13:23:05 +03:00
Sarina Canelake
0217ef80d7 Merge pull request #4351 from lduarte1991/lduarte-harvardx-pr8 
Annotation Tool: Bug Fix Filtered Personal Annotations on Page Load
 2014-07-31 20:19:23 -04:00
Jesse Zoldak
49e0d6b5f9 Disable video handout tests 2014-07-31 18:44:25 -04:00
srpearce
20d3eaa4f6 Merge pull request #4637 from edx/sylvia/docs/relnotesupdate 
Removed info about ORA-51
 2014-07-31 17:01:59 -04:00
Sylvia Pearce
5002513df0 Removed info about ORA-51 2014-07-31 16:53:10 -04:00
Sarina Canelake
2bb9498844 Merge pull request #4166 from lduarte1991/lduarte-harvardx-pr5 
Annotations Tools: Sharing Plugin Fixed with Proper URI
 2014-07-31 16:47:24 -04:00
lduarte1991
6a281dd80b Annotation Tools: Spacing Issues fixed for catch.js 2014-07-31 15:44:02 -04:00
lduarte1991
df8d51b9b9 Annotation Tool: Bug Fix Filtered Personal Annotations on Page Load 
- Made sure that all highlights were removed.

- Forgot closing parens

- added comments to fix
 2014-07-31 15:44:02 -04:00
polesye
7217dd460d Disable css3 animations in bok-choy tests. 2014-07-31 21:58:07 +03:00
lduarte1991
98446d1c6d Annotation Tools: Code clean-up, formatting, spacing 2014-07-31 14:48:25 -04:00
lduarte1991
9751244e2e Annotation Tools: Fixed Share button to allow selection of text box 2014-07-31 14:48:25 -04:00
lduarte1991
4ce70630b4 Annotation Tools: Fixing Share Indentation, Grep Functions and Equality 2014-07-31 14:48:25 -04:00
lduarte1991
eace1413b7 Image Annotation Tool: Fixed Viewport Timeout Issue 2014-07-31 14:48:25 -04:00
lduarte1991
e80992cc1e Annotation Tool: Fixing Table Share bug (2b) 2014-07-31 14:48:25 -04:00
lduarte1991
28f5ed1cf9 Annotations Tools: Sharing Plugin Fixed with Proper URI 2014-07-31 14:48:25 -04:00
Renzo Lucioni
3c37b9723c Merge pull request #4620 from edx/renzo/fix-instructor-analytics 
Renzo/fix instructor analytics
 2014-07-31 14:12:47 -04:00
Alison Hodges
91db097259 Merge pull request #4483 from edx/ahodges/documentation/FOR662 
Ahodges/documentation/for662
 2014-07-31 13:42:41 -04:00
Alison Hodges
c2d603acfc Add a post/response/comment in preparation for new Question type post 2014-07-31 13:41:39 -04:00
David Baumgold
548e96126c Merge pull request #4626 from edx/db/revert-dep-upgrades 
Downgrade scipy, lxml, boto, edx-ora2
 2014-07-31 13:37:37 -04:00
David Baumgold
c4505e7350 Downgrade scipy, lxml, boto, edx-ora2 2014-07-31 12:06:13 -04:00
Ben McMorran
640ea444f8 Merge pull request #4608 from edx/benmcmorran/fix-blank-xblock-names 
Show category when an xblock does not have a default display name
 2014-07-31 11:49:59 -04:00
David Baumgold
9ba5fb52ae Merge pull request #4624 from edx/db/update-ora2 
new release of edx-ora2
 2014-07-31 11:07:36 -04:00
Greg Price
b10c4b146f Merge pull request #4599 from Stanford-Online/u/forum/upload-file-size 
Fix incorrect max upload file size on forums
 2014-07-31 10:31:16 -04:00
David Baumgold
e3804d8bbf Merge pull request #3665 from edx/db/update-lxml 
Update lxml to 3.3.5
 2014-07-31 10:15:56 -04:00
David Baumgold
44f987138e Update lxml to 3.3.5 2014-07-31 10:13:03 -04:00
David Baumgold
adee992106 new release of edx-ora2 2014-07-31 10:06:43 -04:00
David Baumgold
3040bee3f6 Update boto to 2.30.0 2014-07-31 10:01:04 -04:00
David Baumgold
64eee5012f Merge pull request #4582 from itsbenweeks/itsbenweeks/update_scipy 
Updating SciPy
 2014-07-31 09:57:08 -04:00
Renzo Lucioni
ab067046e3 Fully rename instructor dashboard analytics app 2014-07-31 09:45:44 -04:00
Don Mitchell
437a3bf93e Merge pull request #4542 from edx/split/perf_test 
Split/perf test
 2014-07-31 09:14:15 -04:00
Oleg Marshev
36d47dd05e Merge pull request #4527 from edx/oleg/xml-course-transcripts-fix 
Fix transcripts in XML course when no static_asset_path is set.
 2014-07-31 10:35:44 +03:00
Mark Hoeber
d76c89f8ad Merge pull request #4619 from edx/markhoeber-release-notes-image-fix 
Fixed image paths
 2014-07-30 18:04:25 -04:00
Mark Hoeber
13707714ec Fixed image paths 2014-07-30 18:04:03 -04:00
Mark Hoeber
67c8d88b9f Merge pull request #4618 from edx/markhoeber-release-notes-index 
Fix release notes index
 2014-07-30 17:52:26 -04:00
Mark Hoeber
7ceaad0fb9 Fix release notes index 2014-07-30 17:51:59 -04:00
Don Mitchell
02e21d8ab7 fixup! Count & compare db hits between old and split mongo LMS-11090 2014-07-30 17:44:45 -04:00
Don Mitchell
4d51906761 fixup! Test both split and old mongo 2014-07-30 17:44:45 -04:00
Don Mitchell
d4776a151b Test both split and old mongo 2014-07-30 17:44:45 -04:00
Don Mitchell
0f0d75fce8 Convert toc test to use mongo not xml ms 
Included adding a general create_toy_course and create_sample_course method for tests
 2014-07-30 17:44:44 -04:00
Don Mitchell
9a90579f02 Move test_path_to_location to mixed testing 2014-07-30 17:44:44 -04:00
Don Mitchell
8268724ee5 check 0 sends means 0 not ignore 2014-07-30 17:44:44 -04:00
Don Mitchell
1c17e05608 Count & compare db hits between old and split mongo 
LMS-11090
 2014-07-30 17:44:44 -04:00
Don Mitchell
37c873db90 Serialize using to_json on fields 2014-07-30 17:44:44 -04:00
Renzo Lucioni
3599e2eec7 Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"" 
This reverts commit 079808ee47.
 2014-07-30 17:01:52 -04:00
srpearce
ee9fd348b2 Merge pull request #4596 from edx/sylvia/docs/relnotes_7_30 
Sylvia/docs/relnotes 7 30
 2014-07-30 16:34:40 -04:00
Sylvia Pearce
09a92b16b7 Release notes 7-30 2014-07-30 16:34:04 -04:00
Julia Hansbrough
14dc3ce853 Merge branch 'release' 2014-07-30 19:35:51 +00:00