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

25019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Julia Hansbrough
f02093f010 Merge pull request #4819 from edx/minimaster 
Resolving merge conflict between master and release
 2014-08-13 14:48:21 -04:00
Julia Hansbrough
2204eb7390 Fixed merge conflict between release and master. 2014-08-13 18:11:30 +00:00
cahrens
a35cbf1c63 Verify loading indicator has been hidden. 
STUD-2090
 2014-08-13 13:51:36 -04:00
Christina Roberts
7e975f78d0 Merge pull request #4815 from edx/christina/bug-1999 
jquery.immediateDescendents cannot be loaded until jQuery is loaded.
 2014-08-13 13:19:29 -04:00
Julia Hansbrough
9b53c80993 Merge pull request #4801 from edx/prof-ed-cherry-picked-changes 
hotfix-2014-08-12
 2014-08-13 13:04:41 -04:00
cahrens
1272f049f6 jquery.immediateDescendents cannot be loaded until jQuery is loaded. 
STUD-1999
 2014-08-13 12:31:44 -04: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
Tim Babych
7234d39bcc Documentation: create_sinon.js - update referenced JIRA issue. 2014-08-13 17:57:51 +03: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
681438f093 Merge pull request #4791 from edx/talbs/studio-stylesweep-fontsize 
Studio: Refactoring font-size CSS rules to use Sass mixins/placeholders
 2014-08-13 09:16:01 -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
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
Jesse Zoldak
9f1779ed6e Merge pull request #4795 from edx/zoldak/clean-mako-dir 
Clean out the mako temp dirs before running tests
 2014-08-12 16:12:40 -04:00
Renzo Lucioni
563b62a872 Merge pull request #4797 from edx/lms/add-optimizely 
Factor out Optimizely project ID
 2014-08-12 15:28:23 -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
Diana Huang
d60907d725 Consider profession ed courses as paid courses. 
ECOM-63
 2014-08-12 18:45:22 +00:00
Brian Talbot
5caaec7b82 LMS: adding rendering/styling support for initial professional ed course types on student dashboard 2014-08-12 18:45:10 +00:00
Will Daly
905ce6319c Add integration tests for professional ed flow 2014-08-12 18:44:58 +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
Renzo Lucioni
2ad9557403 Factor out Optimizely project ID 2014-08-12 14:20:30 -04: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
Sarina Canelake
d9a2d229a7 Merge pull request #4768 from edx/sarina/remove-legacy-banner 
Remove banner from instructor dashboard
 2014-08-12 12:21:34 -04:00
Jesse Zoldak
e399c0b198 Clean out the mako temp dirs before running tests 2014-08-12 11:10:53 -04:00
Mark Hoeber
4c065eb670 Merge pull request #4783 from edx/ahodges/documentation/relnotes08_12_14 
Release notes - 8/12/14
 2014-08-12 11:00:11 -04:00
Alison Hodges
927a55f4e4 Release Notes for 8/12/14 2014-08-12 10:56:27 -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
Mark Hoeber
4e8a290220 Merge pull request #4356 from edx/markhoeber/documentation/publishing-changes 
WIP: Documentation for Publishing Changes
 2014-08-12 10:34:57 -04: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
Adam
8e722af080 Merge pull request #4785 from edx/adam/add-link-to-readme 
add how to file a bug report link to readme
 2014-08-12 09:18:58 -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
Mark Hoeber
b7486133cc Doc changes for new publishing workflow 2014-08-11 20:29:21 -04:00
Alison Hodges
41425a4647 Merge pull request #4773 from edx/ahodges/documentation/DOC804 
Ahodges/documentation/doc804
 2014-08-11 18:12:19 -04: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
Alison Hodges
83f1231f5a Updates for Sylvia's edits 2014-08-11 15:45:47 -04:00
Julia Hansbrough
df83f5279f Merge pull request #4766 from edx/flowerhack/update-testing-md 
Update testing.md
 2014-08-11 15:45:37 -04:00
Adam Palay
7720969965 add how to file a bug report link to readme 2014-08-11 15:44:24 -04:00
Julia Hansbrough
f06c99fec6 Update testing.md 2014-08-11 19:39:15 +00:00
cahrens
367bdf18c8 Improve stability of test_studio_outline tests. 
STUD-2084
 2014-08-11 15:13:16 -04:00