Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • bf5ac6c263 Merge pull request #1950 from edx/jarv/drupal-new/iframe jarv 2013-05-06 07:46:28 -07:00
  • 38abc0167d label on top of input field move marco 2013-05-06 07:37:14 -07:00
  • 234ca0e076 Responding to @jzoldak's comments David Baumgold 2013-05-03 14:51:56 -04:00
  • ee6d68e2e0 grammar David Baumgold 2013-05-03 14:41:58 -04:00
  • 2a09f6bac1 Clarified based on @shnayder's comment David Baumgold 2013-05-03 11:28:05 -04:00
  • fa87cccb9b Document old-style rake lms command David Baumgold 2013-05-03 11:16:05 -04:00
  • 98243b2b53 Document django-admin[update_templates] step David Baumgold 2013-05-03 10:55:28 -04:00
  • 03470fc48e Add a mention of create-dev-env.sh Ned Batchelder 2013-05-02 09:43:18 -04:00
  • 06ade12f6a Also need to install Mongo David Baumgold 2013-05-02 16:42:51 -04:00
  • fccee7a1e3 Node does virtual environments using npm David Baumgold 2013-05-02 16:29:26 -04:00
  • 1bda218e17 Clarify purpose of data dir David Baumgold 2013-05-02 16:27:19 -04:00
  • a0727ac226 Virtualenv is a tool, and should be surrounded by backticks David Baumgold 2013-05-02 13:53:42 -04:00
  • a58f39695a Remove install.txt, because all that information is in the README.md file now David Baumgold 2013-05-02 13:50:22 -04:00
  • 457b678af7 Wrote a proper README file David Baumgold 2013-05-02 13:32:25 -04:00
  • 8ef88fa5b0 Fix tests that randomly fail when run in concurrent jobs on jenkins. Jay Zoldak 2013-05-06 10:24:38 -04:00
  • 5e288b60ca Merge pull request #1943 from edx/cleanup David Baumgold 2013-05-06 07:15:21 -07:00
  • 5b3f5a47de Add marketing_link to the Template context dictionary. Diana Huang 2013-05-06 09:59:43 -04:00
  • 6b4ab20d02 styled modes header, added inactive and active mode visibility as well as is-set mode styling. no js behavior in yet. adds overscoll fix for webkit marco 2013-05-05 14:09:59 -07:00
  • ad0909dfbd style input boxes marco 2013-05-04 23:19:49 -07:00
  • d1595892fd starting settings marco 2013-05-04 12:23:40 -07:00
  • e44c6b6bf8 Don't reach in to default value. cahrens 2013-05-03 17:05:02 -04:00
  • 32d67be5f5 Get rid of _computed_default. cahrens 2013-05-03 16:42:41 -04:00
  • 03b9a9e22a tweak file reference Steve Strassmann 2013-05-03 15:42:39 -04:00
  • 72584b5937 Merge pull request #1914 from edx/fix/sarina/new_formularesponse_defaults Sarina 2013-05-03 12:32:10 -07:00
  • 5c3719b915 Get HTML LaTeX "working" again. cahrens 2013-05-03 15:31:18 -04:00
  • 138e0569dd pull master Steve Strassmann 2013-05-03 15:18:45 -04:00
  • e6334584d6 rakefile cleanup Steve Strassmann 2013-05-03 15:18:29 -04:00
  • 9dd074f25b Cleanup. cahrens 2013-05-03 15:09:02 -04:00
  • b344976fe7 Making linters happier David Baumgold 2013-05-03 15:08:28 -04:00
  • c9a6fe18f0 Create new marketing_link function to abstract link generation and use it for the new marketing site links. Diana Huang 2013-05-03 15:06:24 -04:00
  • e4e6c0dd7b Add new URLS to MKTG_URLS. Diana Huang 2013-05-03 15:05:03 -04:00
  • 3e217c8f85 Use new login page for marketing site when student is trying to access login_required page. Diana Huang 2013-05-03 15:04:41 -04:00
  • 37d594ce37 Get rid of non-editable scope. cahrens 2013-05-03 14:58:33 -04:00
  • 5d729c306b Merge pull request #1942 from edx/fix/jbau/email_timezone_config jarv 2013-05-03 11:54:51 -07:00
  • 7720c0fc8d Inserts overrides in env.lms.aws for email settings and timezone Jason Bau 2013-05-03 11:45:21 -07:00
  • 192e1d798d edx.org - trying a fix for IE ignoring styles within registration button iframe Brian Talbot 2013-05-03 13:33:47 -04:00
  • 258537e3d2 adding csrf middleware token to form submission John Jarvis 2013-05-03 13:05:10 -04:00
  • 58dbcf9d31 break out of iframe John Jarvis 2013-05-03 13:04:36 -04:00
  • d61945081d Fix disable/re-enable submit button Greg Price 2013-05-03 13:01:39 -04:00
  • 63e6ff16c3 merge with master Steve Strassmann 2013-05-03 12:46:29 -04:00
  • 55dd0fc8bc workaround for gettext parser bug Steve Strassmann 2013-05-03 12:45:55 -04:00
  • dea1198d75 Merge pull request #1925 from edx/bug/straz/date Steve Strassmann 2013-05-03 09:32:00 -07:00
  • 018a3d8a38 branch now runs, but none of the styles are there yet. pushing this mostly to view component.html marco 2013-05-03 09:20:43 -07:00
  • 370df65d89 Merge branch 'master' into ux/marco/studio-componentsettings marco 2013-05-03 09:04:03 -07:00
  • b9da0ffb0a reverting all variables in attempt to properly load unit pages marco 2013-05-03 09:02:32 -07:00
  • 7dd763212e edx.org - fixes to the iframe-based register button's styling Brian Talbot 2013-05-03 11:55:14 -04:00
  • 110a51b74e removing variable names to get it to run again marco 2013-05-03 08:40:35 -07:00
  • 036991dce8 moved bad variable name marco 2013-05-03 08:10:37 -07:00
  • a294e2d1ac Merge pull request #1937 from edx/victor/press brianhw 2013-05-03 07:50:26 -07:00
  • 0f7378a171 Modify UserFactory to create a profile for the user Greg Price 2013-04-25 16:58:33 -04:00
  • d35283cf65 Reduce the amount of repeated HTML and add checks for the correct settings. Diana Huang 2013-05-03 10:17:40 -04:00
  • 031a74865e Add login link to registration page if user is trying to enroll in a class Greg Price 2013-04-30 15:05:36 -04:00
  • e5846e64bd Modify course registration flow for new login and registration pages Greg Price 2013-04-29 10:40:07 -04:00
  • 1d42df8cb1 Add MKTG_URLS to settings for new footer and header links. Diana Huang 2013-05-03 09:31:25 -04:00
  • e0ac6834da Fix links between marketing site and courseware. Diana Huang 2013-05-01 13:57:24 -04:00
  • aae40b4378 Press updates Victor Shnayder 2013-05-03 08:55:40 -04:00
  • 582b23d780 Merge pull request #1933 from edx/diana/drupal/fix-cms-tests Diana Huang 2013-05-03 05:53:44 -07:00
  • c842a5fc7c plugged in more pseudo code for various css class states necessary as well as examples for dropdown case and extra logic required there marco 2013-05-03 00:33:58 -07:00
  • fbaed2e28b added shell of css and html organization marco 2013-05-03 00:00:10 -07:00
  • 60977b0e74 formularesponse requires the "samples" attribute; enforce this, instead of just failing with an obscure error ichuang 2013-05-02 18:56:15 -04:00
  • 182d69e36c Add cookie name to the cms settings so we don't error out while looking for it Diana Huang 2013-05-02 17:21:49 -04:00
  • 45baf013fe Merge branch 'master' into drupal-new Diana Huang 2013-05-02 17:04:39 -04:00
  • 0a1902e7da Merge branch 'master' into feature/christina/fields cahrens 2013-05-02 16:29:03 -04:00
  • 9ee246e407 flexible org repos parsing tested locally e0d 2013-05-02 15:50:33 -04:00
  • d7d68a1e8c edx.org - resolved JQuery submit() method error on <iframe> register button actions Brian Talbot 2013-05-02 15:31:17 -04:00
  • 59c56c2610 fixing old about view, iframe updates John Jarvis 2013-05-02 15:05:12 -04:00
  • 22e147b2c9 Merge pull request #1931 from edx/fix/zoldak/gcli-status e0d 2013-05-02 11:48:05 -07:00
  • e0ebe6dacb Remove TODO. cahrens 2013-05-02 13:53:17 -04:00
  • c01410626f Jasmine test for changedMetadata method. cahrens 2013-05-02 13:39:20 -04:00
  • 161c8cb12e Merge pull request #1929 from edx/jtauber/fix-forks jarv 2013-05-02 10:16:46 -07:00
  • f566b4f003 fix requirements to use moved forks James Tauber 2013-05-02 13:05:20 -04:00
  • fc1a22de55 Merge pull request #1921 from edx/fix/zoldak/cms-jasmine-tests Jay Zoldak 2013-05-02 09:45:58 -07:00
  • 0b452f6195 Change org for gcli status command from mitx to edx Jay Zoldak 2013-05-02 12:41:59 -04:00
  • c7713b6211 Merge branch 'master' into feature/christina/fields cahrens 2013-05-02 12:32:56 -04:00
  • 46100fd258 Cleanup. cahrens 2013-05-02 12:32:32 -04:00
  • 7705941a65 edx.org - added in isolated register button styling/states for <iframe>-based registration fix Brian Talbot 2013-05-02 11:54:16 -04:00
  • 93f10ae8a0 Only save changed metadata fields. cahrens 2013-05-02 11:41:38 -04:00
  • c9a80ded25 formatted using sublime/formatjs Steve Strassmann 2013-05-02 10:59:02 -04:00
  • 01ede40b03 Switching branches cahrens 2013-05-02 09:43:03 -04:00
  • 485d07a722 tabbing Steve Strassmann 2013-05-02 09:31:53 -04:00
  • 7c972ebf6e fix date interpolation Steve Strassmann 2013-05-02 09:29:27 -04:00
  • d55527b693 changes with aria marco 2013-05-01 17:22:09 -04:00
  • e697e495ca Merge branch 'master' into ux/marco/studio-componentsettings marco 2013-05-01 17:21:16 -04:00
  • 3650316ff5 Merge pull request #1922 from MITx/fix/cdodge/jsi18n-include brianhw 2013-05-01 13:06:38 -07:00
  • d807b955f7 add leading slash to the jsi18n include Chris Dodge 2013-05-01 15:27:36 -04:00
  • 1e21526dab Merge pull request #1853 from MITx/feature/nate/updated-dev-env-setup Nate Hardison 2013-05-01 10:24:51 -07:00
  • 2b17904c93 Replacing .rvmrc with .ruby-gemset Nate Hardison 2013-04-24 13:18:12 -07:00
  • 61ca49ac36 Adding a check for an existing virtualenv Nate Hardison 2013-04-12 10:26:33 -07:00
  • a3bb4bfb9f Updating dev environment setup Nate Hardison 2013-04-11 16:03:48 -07:00
  • bdfe1cff39 Remove localization middleware from jasmine test execution Jay Zoldak 2013-05-01 11:34:28 -04:00
  • f2fd90bc61 Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests Jay Zoldak 2013-05-01 08:23:41 -07:00
  • 7f93443dfb Make the test_root/db directory and add a .gitignore for the db files that will be created there. Jay Zoldak 2013-05-01 10:53:58 -04:00
  • 2cb3af1e35 Only throw factorial-related exception on factorial raised exception Sarina Canelake 2013-05-01 10:53:22 -04:00
  • 6ee2ab8664 Merge branch 'master' into feature/christina/fields cahrens 2013-05-01 09:34:25 -04:00
  • 13fe9c11cb Merged with master. cahrens 2013-05-01 09:33:35 -04:00
  • 1c8cef32ef Remove unused import. cahrens 2013-05-01 09:30:20 -04:00
  • 94e41319ee Unit test, remove display_name for now so there is no visible change. cahrens 2013-05-01 09:09:33 -04:00
  • a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo Christina Roberts 2013-04-30 13:34:52 -07:00
  • cc1a8a4bc7 Merge pull request #1918 from MITx/ned/personal-requirements Ned Batchelder 2013-04-30 13:13:01 -07:00
  • 5b82ffd2ad A little documentation. Ned Batchelder 2013-04-30 15:56:21 -04:00