cahrens
46100fd258
Cleanup.
2013-05-02 12:32:32 -04:00
Brian Talbot
7705941a65
edx.org - added in isolated register button styling/states for <iframe>-based registration fix
2013-05-02 11:54:16 -04:00
cahrens
93f10ae8a0
Only save changed metadata fields.
2013-05-02 11:41:38 -04:00
Steve Strassmann
c9a80ded25
formatted using sublime/formatjs
2013-05-02 10:59:02 -04:00
cahrens
01ede40b03
Switching branches
2013-05-02 09:43:03 -04:00
Steve Strassmann
485d07a722
tabbing
2013-05-02 09:31:53 -04:00
Steve Strassmann
7c972ebf6e
fix date interpolation
2013-05-02 09:29:27 -04:00
marco
d55527b693
changes with aria
2013-05-01 17:22:09 -04:00
marco
e697e495ca
Merge branch 'master' into ux/marco/studio-componentsettings
2013-05-01 17:21:16 -04:00
brianhw
3650316ff5
Merge pull request #1922 from MITx/fix/cdodge/jsi18n-include
...
add leading slash to the jsi18n include
2013-05-01 13:06:38 -07:00
Chris Dodge
d807b955f7
add leading slash to the jsi18n include
2013-05-01 15:27:36 -04:00
Nate Hardison
1e21526dab
Merge pull request #1853 from MITx/feature/nate/updated-dev-env-setup
...
Feature/nate/updated dev env setup
2013-05-01 10:24:51 -07:00
Nate Hardison
2b17904c93
Replacing .rvmrc with .ruby-gemset
...
In order to avoid duplicating the Ruby version between the `.rvmrc`
and the `.ruby-version`, we'll get rid of the `.rvmrc` and use the
`.ruby-gemset` file to specify the gemset. These files are supported
by RVM as documented [here](https://gist.github.com/fnichol/1912050 ).
2013-05-01 10:22:57 -07:00
Nate Hardison
61ca49ac36
Adding a check for an existing virtualenv
...
This way, packages won't be inadvertently installed into the wrong
virtual environment. I tried to have the check just run `deactivate`,
but I couldn't figure out how to get that working, so the script
just bails.
2013-05-01 10:22:57 -07:00
Nate Hardison
a3bb4bfb9f
Updating dev environment setup
...
* Script now installs RVM in conventional location (~/.rvm) by
default, though it allows for the override if desired. This will
enable folks to install edX alongside other Ruby projects also
using RVM.
* Script now uses virtualenvwrapper to ease the process of enabling
the edX virtualenv and to allow for easy switching back and forth
between virtualenv projects. It now also installs the "mitx"
virtualenv in the conventional location of ~/.virtualenv.
* Adding a .rvmrc file so that the Ruby environment will be
automatically activated (via `rvm use`) whenever the user hits
the `mitx/` directory.
2013-05-01 10:22:57 -07:00
Jay Zoldak
bdfe1cff39
Remove localization middleware from jasmine test execution
2013-05-01 11:34:28 -04:00
Jay Zoldak
f2fd90bc61
Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests
...
Fix/cale/lms jasmine tests
2013-05-01 08:23:41 -07:00
Jay Zoldak
7f93443dfb
Make the test_root/db directory and add a .gitignore for the db files that will be created there.
2013-05-01 10:53:58 -04:00
Sarina Canelake
2cb3af1e35
Only throw factorial-related exception on factorial raised exception
2013-05-01 10:53:22 -04:00
cahrens
6ee2ab8664
Merge branch 'master' into feature/christina/fields
2013-05-01 09:34:25 -04:00
cahrens
13fe9c11cb
Merged with master.
2013-05-01 09:33:35 -04:00
cahrens
1c8cef32ef
Remove unused import.
2013-05-01 09:30:20 -04:00
cahrens
94e41319ee
Unit test, remove display_name for now so there is no visible change.
2013-05-01 09:09:33 -04:00
Christina Roberts
a537bd7f05
Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo
...
Fix/btalbot/studio courseinfo
2013-04-30 13:34:52 -07:00
Ned Batchelder
cc1a8a4bc7
Merge pull request #1918 from MITx/ned/personal-requirements
...
Ned/personal requirements
2013-04-30 13:13:01 -07:00
Ned Batchelder
5b82ffd2ad
A little documentation.
2013-04-30 16:11:22 -04:00
Ned Batchelder
091ca9c3f0
Add a private-requirements.txt for personal changes to how things are installed. Good for installing libs as working dirs.
2013-04-30 16:11:22 -04:00
Christina Roberts
3e314a2c9e
Merge pull request #1915 from MITx/feature/christina/xblock-version
...
Change xblock version.
2013-04-30 13:03:15 -07:00
Jay Zoldak
aa4e29d2f1
Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs
2013-04-30 15:22:08 -04:00
dcadams
6a1a907339
Fix pep8 violations.
2013-04-30 11:48:23 -07:00
dcadams
7c7471d31c
Merge branch 'master' of github.com:MITx/mitx into feature-dcadams-usermanagement
2013-04-30 11:40:09 -07:00
Calen Pennington
76599863e6
Compile all coffee and sass before running jasmine tests
2013-04-30 14:09:58 -04:00
Calen Pennington
771937b3da
Remove duplicate libraries used while jasmine testing the LMS (as they are also defined in vendor)
2013-04-30 14:09:42 -04:00
Calen Pennington
dfd369b9e9
Make ordering of js bundles during jasmine tests consistant
2013-04-30 14:09:17 -04:00
John Jarvis
aa895cbc6b
Adding mktg_iframe.html
2013-04-30 13:13:31 -04:00
Christina Roberts
4c97f92245
Merge pull request #1916 from MITx/fix/cdodge/more-broken-template-images
...
add more images to support templates
2013-04-30 09:50:41 -07:00
Chris Dodge
c5d520574d
also move the MIT dome image in Latex to be in our source pack
2013-04-30 12:02:58 -04:00
Chris Dodge
1f1a6e3ec5
add more images to support templates
2013-04-30 11:46:49 -04:00
cahrens
63371135e5
Change xblock version.
2013-04-30 11:24:45 -04:00
Sarina Canelake
95a224fcea
Fix pep8 violations
2013-04-30 11:21:20 -04:00
cahrens
a9a234f018
Change xblock version.
2013-04-30 11:19:20 -04:00
Sarina Canelake
573116073e
Add error message when factorial given non-integral value
2013-04-30 11:16:14 -04:00
Christina Roberts
1e8619288a
Merge pull request #1912 from MITx/fix/cdodge/broken-template-image
...
add dependent image for the image response template
2013-04-30 08:11:11 -07:00
Chris Dodge
02ed9f26c4
add dependent image for the image response template
2013-04-30 10:07:42 -04:00
John Jarvis
01f8c4c816
Adding iframe view
...
example:
http://localhost:8000/courses/HarvardX/CB22x/2013_Spring/mktg-about
2013-04-30 09:44:21 -04:00
marco
30240ff01a
non revision
2013-04-29 19:53:16 -04:00
dcadams
44bdea0044
Merge branch 'master' of github.com:MITx/mitx into feature-dcadams-usermanagement
2013-04-29 14:35:45 -07:00
Brian Talbot
886205dec3
revised placeholder course overview HTML value
2013-04-29 17:23:14 -04:00
Steve Strassmann
d4ec592a58
Merge pull request #1910 from MITx/bug/straz/i18n
...
fix bad url for jsi18n
2013-04-29 14:19:08 -07:00
Steve Strassmann
cdfd7c807f
fix bad url for jsi18n
2013-04-29 17:13:24 -04:00
