Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,077 Commits 1 Branch 0 Tags
70d47fb54d8250ecf6a96354263dbcd06ed826ce
Commit Graph

5070 Commits

Author SHA1 Message Date
Ben McMorran
12a5781725 Add ability to set staff lock from course outline 2014-08-16 15:58:42 -04:00
Don Mitchell
23d78fe7fc Merge pull request #4803 from edx/dhm/import_split_test 
Dhm/import split test
 2014-08-15 17:23:33 -04:00
Alexander Kryklia
ccf85a9431 Merge pull request #4777 from edx/anton/sync-groups-and-verticals 
Anton/sync groups and verticals
 2014-08-15 20:15:12 +03:00
clytwynec
310778dfa7 Merge pull request #4838 from edx/clytwynec/remove_warnings_from_lettuce_test_logs 
set root logging level for acceptance tests to ERROR
 2014-08-15 13:08:56 -04:00
polesye
867a5c051f Sync children vertical names with group names in split test module. 2014-08-15 19:34:55 +03:00
Calen Pennington
50082387eb Add a request-token to identify which xblock html was rendered as part of the current request 
[STUD-2903]
 2014-08-15 11:04:52 -04:00
Jesse Zoldak
4d5b948928 Merge pull request #4748 from Stanford-Online/jbau/parallel-unit-tests 
make unit tests respect mongo port/host settings (with default)
 2014-08-15 10:56:52 -04:00
Christine Lytwynec
bdc4fd4d86 set root logging level for acceptance tests to ERROR 2014-08-14 14:18:51 -04:00
Oleg Marshev
a94e942480 BLD-1125: Validation of content experiments after managing a group. 2014-08-14 16:34:21 +02:00
Sarina Canelake
6dd9d9ec3f Merge pull request #4586 from jazkarta/edx-jsme-1.0 
Release edx-jsme 1.0
 2014-08-14 10:02:55 -04:00
Sarina Canelake
c285bda69f Merge pull request #4625 from fmyzjs/ipv6 
Support ipv6 in geoinfo and Embargo
 2014-08-14 09:26:57 -04:00
Sarina Canelake
244554f71f Merge pull request #4823 from lduarte1991/lduarte-harvardx-pr19 
Annotation Tools: Adding Annotator to CMS
 2014-08-14 09:13:14 -04:00
Tim Babych
c12ed3ae9a Merge pull request #4808 from edx/tim/open-STUD-1264 
Documentation: create_sinon.js - update referenced JIRA issue.
 2014-08-14 12:18:13 +03:00
Jason Zhu
13846e074d Support ipv6 in geoinfo and Embargo 2014-08-14 16:13:35 +08:00
lduarte1991
8cfdb8f14c Annotation Tools: Adding comments and adding CSS groups 2014-08-13 21:35:37 -04:00
lduarte1991
5c859c7128 Annotation Tools: Adding Annotator to CMS 2014-08-13 21:35:37 -04:00
Christina Roberts
c389a445ae Merge pull request #4814 from edx/christina/bug-2090 
Verify loading indicator has been hidden.
 2014-08-13 15:41:42 -04:00
cahrens
a35cbf1c63 Verify loading indicator has been hidden. 
STUD-2090
 2014-08-13 13:51:36 -04:00
cahrens
1272f049f6 jquery.immediateDescendents cannot be loaded until jQuery is loaded. 
STUD-1999
 2014-08-13 12:31:44 -04:00
Don Mitchell
aa1b9fece9 Properly (de)serialize references in old mongo 
LMS-11204
 2014-08-13 11:26:12 -04:00
Tim Babych
7234d39bcc Documentation: create_sinon.js - update referenced JIRA issue. 2014-08-13 17:57:51 +03:00
Brian Talbot
998e33ec37 Studio: refactoring font-size to use existing Sass scale-based placeholders 2014-08-13 08:01:16 -04:00
Brian Talbot
1720ddf93f Studio: refactoring font-size to use Sass mixin 
* moving font-size to use @include font-size() mixin
* re-organizing vendor reset styling into _vendor.scss override rather than _reset.scss
* initial rule re-organization and minor line-height tweaks
 2014-08-12 20:22:06 -04:00
Will Daly
680d5031d7 Merge pull request #4802 from edx/will/unit-test-staticfiles 
Unit tests don't need assets
 2014-08-12 16:42:19 -04:00
Will Daly
a827df27fe Remove update assets from unit test suite 
Update settings so unit tests pass
 2014-08-12 15:08:39 -04:00
cahrens
ee836d4c40 Merge branch 'release' from 2014-08-12 release. 2014-08-12 13:51:58 -04:00
Brian Talbot
f8ec92949f Studio: refactoring font-weight CSS rules to use Sass placeholders 2014-08-12 12:31:49 -04:00
Jason Bau
b55362b925 make unit tests respect mongo port/host settings (with default) 
settings are read in from environment variable
 2014-08-11 14:17:29 -07:00
Tim Babych
e7fbf1327f Merge pull request #4778 from edx/tim/improve-python-group-configuration-tests 
Use UrlResetMixin to test GroupConfiguration feature
 2014-08-11 21:10:47 +03:00
Don Mitchell
05bddae34a Merge pull request #4633 from edx/dhm/create_xthing 
Make import/export work with split mongo, replace create_xmodule with create_xblock
 2014-08-11 12:53:59 -04:00
Don Mitchell
192d701899 Code review changes re split import/export, create_xblock 2014-08-11 12:13:31 -04:00
Tim Babych
06cb6008f0 Use UrlResetMixin to test GroupConfiguration feature 2014-08-11 19:12:30 +03:00
Alexander Kryklia
9643120390 Reenable user partition in Advanced Settings. 2014-08-11 16:41:29 +03:00
Chris Rossi
88af00904f Release edx-jsme 1.0 2014-08-11 09:04:27 -04:00
Muhammad Ammar
936bd4d5ad Bok-Choy CMS Video Tests 2014-08-11 07:50:19 +00:00
Don Mitchell
f69ef41c21 Disable fetching by version guid for now 2014-08-08 15:00:48 -04:00
Don Mitchell
ae4277c402 Use new check counter & bump count 2014-08-08 15:00:48 -04:00
Don Mitchell
e900a47b3f Provide workarounds for skip_draft where other code doesn't want its behavior 2014-08-08 15:00:47 -04:00
Don Mitchell
2726b437bc Trying to get split to work 2014-08-08 14:53:37 -04:00
Nimisha Asthagiri
84992cdfa5 Refactor xml_importer.py for easier reading. 
Remove post-publish step.
 2014-08-08 14:41:57 -04:00
Don Mitchell
47851c5041 Replace create_xmodule with create_xblock 
Refactor all callers (often replacing with more appropriate fn)

Also, added for_branch_setting method to old mongo and removed some
branch verification tests

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
 2014-08-08 14:40:27 -04:00
Oleg Marshev
0577b9d8b9 Allow turning off Video CDN in Studio. 
BLD-1207
 2014-08-08 14:39:19 -04:00
Nimisha Asthagiri
9efe5d92c5 Merge pull request #4720 from edx/split/add-and-fixes 
Split/add and fixes
 2014-08-08 14:12:02 -04:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00
polesye
37c3a50ffa Add tooltip manager in Studio. 2014-08-08 16:31:14 +03:00
Nimisha Asthagiri
775b50a736 Address code coverage and quality. 2014-08-08 08:31:14 -04:00
Nimisha Asthagiri
abbfa95e4c LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL. 
Make default_store thread-safe.
 2014-08-07 18:07:41 -04:00
Nimisha Asthagiri
e9db4ad16d LMS-11019 Add feature flag to create Split Course 2014-08-07 18:07:01 -04:00
Nimisha Asthagiri
ec3011635d LMS-11179 Fix Assets with Split 2014-08-07 17:59:38 -04:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00