Victor Shnayder
aae40b4378
Press updates
...
LH: 381, 382, 383
2013-05-03 08:55:40 -04:00
Diana Huang
582b23d780
Merge pull request #1933 from edx/diana/drupal/fix-cms-tests
...
Drupal: Add cookie name to the cms settings so we don't error out while looking for it
2013-05-03 05:53:44 -07:00
marco
c842a5fc7c
plugged in more pseudo code for various css class states necessary as well as examples for dropdown case and extra logic required there
2013-05-03 00:33:58 -07:00
marco
fbaed2e28b
added shell of css and html organization
2013-05-03 00:00:10 -07:00
ichuang
60977b0e74
formularesponse requires the "samples" attribute; enforce this,
...
instead of just failing with an obscure error
2013-05-02 18:56:15 -04:00
Diana Huang
182d69e36c
Add cookie name to the cms settings so we don't error out
...
while looking for it
2013-05-02 17:21:49 -04:00
Diana Huang
45baf013fe
Merge branch 'master' into drupal-new
2013-05-02 17:04:39 -04:00
cahrens
0a1902e7da
Merge branch 'master' into feature/christina/fields
2013-05-02 16:29:03 -04:00
e0d
9ee246e407
flexible org repos parsing tested locally
2013-05-02 15:50:33 -04:00
Brian Talbot
d7d68a1e8c
edx.org - resolved JQuery submit() method error on <iframe> register button actions
2013-05-02 15:31:17 -04:00
John Jarvis
59c56c2610
fixing old about view, iframe updates
2013-05-02 15:05:12 -04:00
e0d
22e147b2c9
Merge pull request #1931 from edx/fix/zoldak/gcli-status
...
Change org for gcli status command from mitx to edx
2013-05-02 11:48:05 -07:00
cahrens
e0ebe6dacb
Remove TODO.
2013-05-02 13:53:17 -04:00
cahrens
c01410626f
Jasmine test for changedMetadata method.
2013-05-02 13:39:20 -04:00
jarv
161c8cb12e
Merge pull request #1929 from edx/jtauber/fix-forks
...
fix requirements to use moved forks
2013-05-02 10:16:46 -07:00
James Tauber
f566b4f003
fix requirements to use moved forks
2013-05-02 13:05:20 -04:00
Jay Zoldak
fc1a22de55
Merge pull request #1921 from edx/fix/zoldak/cms-jasmine-tests
...
Remove localization middleware from jasmine test execution
2013-05-02 09:45:58 -07:00
Jay Zoldak
0b452f6195
Change org for gcli status command from mitx to edx
2013-05-02 12:41:59 -04:00
cahrens
c7713b6211
Merge branch 'master' into feature/christina/fields
2013-05-02 12:32:56 -04:00
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
