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

9029 Commits

Author SHA1 Message Date
David Baumgold
2e02cefc90 Update comments to point to openedx.atlassian.net 
And whitespace corrections (automatically made by my editor, and I'm too lazy
to remove them)
 2014-08-18 15:34:06 -04:00
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
Don Mitchell
3b43f34b20 XML export maps keys into xml expected format 2014-08-15 16:02:48 -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
Christina Roberts
33815f1cc5 Merge pull request #4853 from edx/christina/stud-2093 
Add a request-token to identify which xblock html was rendered as part o...
 2014-08-15 12:55:34 -04:00
polesye
867a5c051f Sync children vertical names with group names in split test module. 2014-08-15 19:34:55 +03:00
Will Daly
3cd4610b5a Merge pull request #4824 from edx/will/auto-register 
Auto enroll students even if there are multiple course modes
 2014-08-15 11:11:19 -04: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
marco
6f810836db Template changes for course track AB-test 2014-08-15 10:26:29 -04:00
Will Daly
714f9bb69f Auto enroll students even if there are multiple course modes 
Add session middleware to an external auth test to fix a test failure with the auto-registration AB-test changes
 2014-08-15 10:26:27 -04:00
Sarina Canelake
f3a0327541 Merge pull request #4841 from edx/sarina/minor-i18n-fixes 
Minor i18n fixes prompted by translators
 2014-08-14 18:03:54 -04:00
Adam
c830537ea3 Merge pull request #4844 from edx/release 
Release
 2014-08-14 17:06:39 -04:00
Sarina Canelake
19ca6c845c Minor i18n fixes prompted by translators 2014-08-14 14:58:26 -04:00
Jesse Zoldak
eee0d35bfe Ignore errors on rmtree cleanup 2014-08-14 13:47:53 -04:00
Adam
0edac1540d Merge pull request #4833 from edx/waheed/hotfix/2014-08-12 
Check REQUEST_CONTEXT.context exists before accessing it.
 2014-08-14 12:53:09 -04:00
Waheed Ahmed
d9ccaa650a Check REQUEST_CONTEXT.context exists before accessing it. 
LMS-11226
 2014-08-14 12:21:54 -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
c285bda69f Merge pull request #4625 from fmyzjs/ipv6 
Support ipv6 in geoinfo and Embargo
 2014-08-14 09:26:57 -04:00
lduarte1991
e19878548a Annotation Tools: Adding Annotator to CMS 2014-08-14 09:14:18 -04:00
lduarte1991
f2b34d80ed - replaced tabs with 4 spaces 
- fixed spaces after commas, if conditions, braces, operators
 - fixed some typecasting issues as well

 - added missing semicolons
 2014-08-14 08:51:52 -04:00
lduarte1991
a00a2de85b Annotation Tools: Explicit typecasting === changes and reorganizing plugins 2014-08-14 08:51:45 -04:00
Jason Zhu
13846e074d Support ipv6 in geoinfo and Embargo 2014-08-14 16:13:35 +08:00
lduarte1991
5c859c7128 Annotation Tools: Adding Annotator to CMS 2014-08-13 21:35:37 -04:00
Sarina Canelake
76516f52b8 Merge pull request #4796 from lduarte1991/lduarte-harvardx-pr18 
Annotation Tools: Fixing implicit typecasting and reordering plugins
 2014-08-13 20:38:09 -04:00
Julia Hansbrough
2204eb7390 Fixed merge conflict between release and master. 2014-08-13 18:11:30 +00:00
lduarte1991
63f1d9834d - replaced tabs with 4 spaces 
- fixed spaces after commas, if conditions, braces, operators
 - fixed some typecasting issues as well

 - added missing semicolons
 2014-08-13 11:46:46 -04:00
Don Mitchell
aa1b9fece9 Properly (de)serialize references in old mongo 
LMS-11204
 2014-08-13 11:26:12 -04:00
Don Mitchell
5789b98b63 Merge pull request #4759 from edx/dhm/key_munging 
Remove hardcoding of key syntax for base url
 2014-08-13 09:36:08 -04: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
Jesse Zoldak
2edf1aef31 Merge pull request #4798 from edx/zoldak/rmtree-cleanup 
Ignore errors on rmtree cleanup
 2014-08-12 17:05:20 -04:00
Diana Huang
d60907d725 Consider profession ed courses as paid courses. 
ECOM-63
 2014-08-12 18:45:22 +00:00
Diana Huang
9aa095dd21 Adapt flow for new 'professional' mode. 
ECOM-41
 2014-08-12 18:44:46 +00:00
Julia Hansbrough
805c325653 Update redirect and wording for prof ed 
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
 2014-08-12 18:44:40 +00:00
cahrens
ee836d4c40 Merge branch 'release' from 2014-08-12 release. 2014-08-12 13:51:58 -04:00
Brian Talbot
e727bd2202 Merge pull request #4790 from edx/talbs/studio-stylesweep-fontweight 
Studio: Refactoring font-weight CSS rules to use Sass placeholders
 2014-08-12 13:20:51 -04:00
Brian Talbot
f8ec92949f Studio: refactoring font-weight CSS rules to use Sass placeholders 2014-08-12 12:31:49 -04:00
Jesse Zoldak
9a25c9ff54 Ignore errors on rmtree cleanup 2014-08-12 12:30:37 -04:00
Oleg Marshev
7e9f917f62 Merge pull request #4237 from starteam/master 
Fix for empty imsx_messageIdentifier
 2014-08-12 17:38:57 +03:00
Christina Roberts
620d31022b Merge pull request #4781 from edx/christina/publishing-tests 
Improve stability of test_studio_outline tests.
 2014-08-12 09:20:19 -04:00
Jesse Zoldak
ab78c758f1 Merge pull request #4638 from edx/zoldak/lettuce-log-js-console 
Capture console log on lettuce test failure
 2014-08-12 09:06:53 -04:00
Ivica Ceraj
be17040f9d Fix for empty imsx_messageIdentifier 2014-08-12 08:30:33 -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
lduarte1991
7114b25a40 Annotation Tools: Explicit typecasting === changes and reorganizing plugins 2014-08-11 17:01:15 -04:00
Calen Pennington
25963797c6 Merge pull request #3227 from FiloSottile/enforce_type 
Enforce type of the XBlocks Fields when set
 2014-08-11 16:13:53 -04:00
cahrens
367bdf18c8 Improve stability of test_studio_outline tests. 
STUD-2084
 2014-08-11 15:13:16 -04:00
Jesse Zoldak
f59dd647c5 Capture console log on lettuce test failure 2014-08-11 14:39:22 -04: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