Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,857 Commits 1 Branch 0 Tags
a8ea201b6a2857cec8fdfd42098acf2f222f0168
Commit Graph

12857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
a8ea201b6a Move the link map to the settings. 2013-05-06 12:55:42 -04:00
Diana Huang
5b3f5a47de Add marketing_link to the Template context dictionary. 
Pep8 fixes
 2013-05-06 10:03:00 -04:00
Diana Huang
c9a6fe18f0 Create new marketing_link function to abstract link generation 
and use it for the new marketing site links.
 2013-05-03 15:06:24 -04:00
Diana Huang
e4e6c0dd7b Add new URLS to MKTG_URLS. 2013-05-03 15:05:03 -04:00
Diana Huang
3e217c8f85 Use new login page for marketing site when student is trying to 
access login_required page.
 2013-05-03 15:04:41 -04:00
Diana Huang
d35283cf65 Reduce the amount of repeated HTML and add checks for the correct settings. 2013-05-03 10:17:40 -04:00
Diana Huang
1d42df8cb1 Add MKTG_URLS to settings for new footer and header links. 2013-05-03 09:31:47 -04:00
Diana Huang
e0ac6834da Fix links between marketing site and courseware. 
Update links in footer to point to the right pages.
Update link on dashboard without any classes.
Update links in header.
Update links on sign in and register pages.
 2013-05-03 09:31:47 -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
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
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
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
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
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
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
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
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
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
Diana Huang
32b30cef92 Merge pull request #1909 from MITx/diana/accessibility-update 
Add accessibility text to the Contact page.
 2013-04-29 13:58:43 -07:00
Diana Huang
85ebdff7c2 Merge pull request #1905 from MITx/fix/sarina/new_formularesponse_defaults 
Fix/sarina/new formularesponse defaults
 2013-04-29 13:56:43 -07:00
Diana Huang
befe7beccb Add accessibility text to the Contact page. 2013-04-29 16:55:29 -04:00
Chris Dodge
33aada6d22 fix broken test. Since we're pre-populating the course overview when creating a course, the clone_course fails because it asserts that the destination course that it clones into is empty. Need to check that the course is basically empty (e.g. a course module and a overview module) 2013-04-29 16:43:32 -04:00
Don Mitchell
cbf9acfefb Merge pull request #1896 from MITx/feature/straz/i18n 
Feature/straz/i18n - rake tasks to generate strings
 2013-04-29 13:32:44 -07:00
Brian Talbot
a861c8b310 revised placeholder course and faculty images - more opacity to reinforce placeholderness 2013-04-29 16:03:00 -04:00
Chris Dodge
680e932b8b use default staff images that is in /common/static/... 2013-04-29 15:42:58 -04:00