Peter Fogg
d3ec1cb915
Add tests for single-click discussion creation.
2013-06-03 14:57:34 -04:00
Peter Fogg
eff78bfd86
Add doc for click_component_from_menu and make sure css is present in any case.
2013-06-03 14:39:02 -04:00
Peter Fogg
ff0c56b7fb
Cleaning up code -- removed unnecessary lines, fixed indentation, renamed method.
2013-06-03 14:21:50 -04:00
Peter Fogg
2871ce8dee
Fix pep8 violations.
2013-06-03 10:36:46 -04:00
Peter Fogg
457bd30c68
Make sure advanced component creation shows even a single template.
2013-06-03 10:26:52 -04:00
Peter Fogg
55aaa1a8e9
Add lettuce tests for single-click video creation and fix previously failing tests.
2013-06-03 10:20:38 -04:00
Peter Fogg
cce65ce9ae
Merge branch 'master' of github.com:edx/edx-platform into peter-fogg/single-click-video-creation
2013-06-03 09:15:52 -04:00
Peter Fogg
babe46e6f2
Merge pull request #17 from edx/peter-fogg/no-autoplay-studio
...
Peter fogg/no autoplay studio
2013-06-03 06:07:03 -07:00
Peter Fogg
8c5f9e6e41
Fix merge conflict.
2013-06-03 08:49:52 -04:00
Victor Shnayder
1d8e46f01c
Merge pull request #13 from edx/victor/help-button-text
...
Change help button text, fixing LMS-319
2013-06-02 20:47:45 -07:00
Ned Batchelder
4c6e482d39
Merge pull request #24 from edx/ned/remove-test-ike
...
Remove test_ike.py, Ike says we don't need it, and it looks like a test.
2013-06-02 18:45:05 -07:00
Christina Roberts
de743a4812
Merge pull request #39 from edx/fix/marco/studio-latex-compiler
...
hides latex compiler in settings tab by making previously specific css s...
2013-06-02 13:19:32 -07:00
chrisndodge
7735e37585
Merge pull request #8 from edx/valera/fix_videoalpha_studio_integration
...
Added videoalpha to advanced components in component.py file.
2013-06-02 13:04:33 -07:00
Chris Dodge
6fb520f21e
add peer grading to the advanced components check
2013-06-02 14:39:36 -04:00
chrisndodge
cd0f4b8194
Merge pull request #18 from edx/fix/cdodge/bad-link-in-activation-email
...
[STUD-177] Fix/cdodge/bad link in activation page
2013-06-02 11:36:31 -07:00
marco
67a29ea94a
hides latex compiler in settings tab by making previously specific css sibling selector general enough to find and hide the appropriate div
2013-06-02 12:48:54 -04:00
Chris Dodge
91d3f4ddff
add simple content check for the activation page when the user is not logged in
2013-06-02 00:43:17 -04:00
Chris Dodge
c0899463e3
remove unused import reference
2013-06-02 00:18:35 -04:00
Chris Dodge
ba9a5b3824
add simple check on whether the expected advanced modules appear in the edit unit page when turned on
2013-06-02 00:15:34 -04:00
James Tauber
d2bb831781
Merge pull request #34 from antoviaque/install-requirements-pre
...
Install steps - Add numpy requirement in manual installation steps
2013-06-01 19:56:26 -07:00
Christina Roberts
52b76c87f4
Merge pull request #11 from edx/feature/christina/metadata-ui
...
Feature/christina/metadata ui
2013-06-01 16:01:53 -07:00
cahrens
4d311f44cd
Code review feedback.
2013-06-01 18:46:09 -04:00
Xavier Antoviaque
388e6b856f
Install steps - Add numpy requirement in manual installation steps
...
When `pip install -r requirements/edx/pre.txt` is omitted before running
`pip install -r requirements/edx/base.txt`, it would cause API versions
mistmatch when `make cms` is run. `make cms` would automatically run pip
with pre.txt and install a different version of numpy, *after* base.txt
and post.txt have been run through pip.
2013-06-01 14:07:24 -03:00
James Tauber
f27f664d46
Merge pull request #26 from edx/jtauber/fix-overview
...
small tweaks to overview doc
2013-06-01 06:07:46 -07:00
James Tauber
e503da47b9
Merge pull request #31 from edx/nate/edx-platform-ruby-gemset
...
Change Ruby gemset to edx-platform
2013-05-31 19:52:01 -07:00
Nate Hardison
1f1a43a424
Change Ruby gemset to edx-platform
...
The `create-dev-env.sh` script now creates a gemset called edx-
platform, so make sure that this matches.
The right thing to do would be to have `create-dev-env.sh` peek at
this file and create a gemset with the appropriate name.
2013-05-31 17:46:24 -07:00
James Tauber
223c3b238c
updated README with boilerplate
2013-05-31 18:28:39 -04:00
Slater-Victoroff
04842087fc
Merge pull request #25 from edx/slater/new_mac_dev_script
...
Slater/new mac dev script
2013-05-31 15:14:53 -07:00
Slater-Victoroff
57e43770d5
cleaning up, some syntax fixed and edge cases considered
2013-05-31 17:51:03 -04:00
Slater-Victoroff
a267f5ec86
Pull request comments addressed, if else condition cleaned up
2013-05-31 17:28:47 -04:00
Slater-Victoroff
c5b95e393f
merge conflict resolved, whitespace changes
2013-05-31 16:54:16 -04:00
Slater-Victoroff
3fc7bb6e42
Last requirement that was needed on Jonah's machine. Now working on the fresh Ubuntu install there
2013-05-31 16:52:55 -04:00
Slater-Victoroff
68fa1984fa
Last requirement that was needed on Jonah's machine. Now working on the fresh Ubuntu install there
2013-05-31 16:49:03 -04:00
Slater-Victoroff
9e140dcc32
pull request notes attended to
2013-05-31 16:31:00 -04:00
James Tauber
f0abdce65a
small tweaks to overview doc
2013-05-31 16:22:59 -04:00
Peter Fogg
68581610a4
Allow single-click creation of course components that only have one template.
2013-05-31 16:22:51 -04:00
Slater-Victoroff
0b0b36028c
Added ubuntu requirements for better mysql support
2013-05-31 16:10:11 -04:00
cahrens
486d085d1e
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
2013-05-31 16:00:09 -04:00
cahrens
a82daf0710
Change to Backbone collection.
2013-05-31 15:59:53 -04:00
Peter Fogg
5434f2750e
Cleaning up code to fix pylint/pep8 errors.
2013-05-31 15:58:12 -04:00
Ned Batchelder
ae2a507ec8
Remove test_ike.py, Ike says we don't need it, and it looks like a test.
2013-05-31 15:40:51 -04:00
Slater-Victoroff
d7ba5db81a
Added note about the current state of support for debian based systems to accurately reflect state of development
2013-05-31 15:37:30 -04:00
Slater-Victoroff
c87e46969a
files cleaned up and debugging nearing the final steps
2013-05-31 15:32:40 -04:00
VikParuchuri
4a997842c7
Merge pull request #2 from edx/fix/vik/single-step-oe
...
Fix js that prevented single step OE problems (ie only self assessment) ...
2013-05-31 12:10:45 -07:00
Jay Zoldak
cd82bd054d
Merge pull request #20 from edx/zoldak/distribute-version
...
require distribute >= because there is an old branch out there that messes up the build server
2013-05-31 12:09:17 -07:00
Slater-Victoroff
56433729c6
Realized an issue requiring us to remove raring support, fixed a couple more bugs
2013-05-31 15:09:13 -04:00
Slater-Victoroff
3b3b5d97e9
Removed npm requirement due to node version conflicts
2013-05-31 14:58:40 -04:00
Victor Shnayder
e01991eca5
Tweak copy
2013-05-31 14:56:37 -04:00
Frances Botsford
92e159ea37
text and style adjustments to help button modal
2013-05-31 14:31:16 -04:00
Slater-Victoroff
6272e89014
Down to node errors on Ubuntu
2013-05-31 14:30:56 -04:00
