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

Commit Graph

  • b05ff885fa Replace /faq route in LMS urls Nate Hardison 2013-06-06 14:18:08 -07:00
  • 83a490c79d fixing bug noticed in production e0d 2013-06-06 16:04:42 -04:00
  • a3a7d1d548 Merge pull request #77 from edx/jonahstanley/fix-alert-tests Jonah Stanley 2013-06-06 12:59:07 -07:00
  • 1fefec2176 Fixed the need of a global variable JonahStanley 2013-06-06 15:28:45 -04:00
  • 477f29d5ee Added docstring specifying when this method must be called JonahStanley 2013-06-06 14:52:35 -04:00
  • 228b501410 Merge pull request #91 from edx/fix/btalbot/edx.org-bannertext Brian Talbot 2013-06-06 11:48:59 -07:00
  • d6c772c5aa adds missed } Alexander Kryklia 2013-06-06 18:41:06 +03:00
  • d3965cb3ee removes redundant h2 heading and syncs up h1 value (with broken mak/template syntax) for register view Brian Talbot 2013-06-06 11:27:09 -04:00
  • 8d15b74a97 Fixed errors in spacing and refactoring out of scenario JonahStanley 2013-06-06 14:38:59 -04:00
  • cab49716b5 Whitelisted courses now run Python code outside the sandbox. Ned Batchelder 2013-06-06 14:14:30 -04:00
  • 9a631fe476 All uses of safe_exec need to get the correct random seed. Ned Batchelder 2013-05-29 17:36:40 -04:00
  • 92aba63375 Merge pull request #65 from edx/victor/segment-io Victor Shnayder 2013-06-06 11:11:00 -07:00
  • 665bc6e3db analytics server setup simplified Juho Kim 2013-06-06 13:48:20 -04:00
  • 7d961bae54 undid last commit where some coffee files were inadvertantly added. dcadams 2013-06-06 10:26:30 -07:00
  • 5489a3b645 Merge pull request #44 from edx/feature/cale/run-all-tests Calen Pennington 2013-06-06 09:52:27 -07:00
  • d92134e60c Merge pull request #45 from edx/feature/cale/release-email-list Calen Pennington 2013-06-06 09:51:55 -07:00
  • e5efdde76a Strip off https:// cahrens 2013-06-06 10:55:41 -04:00
  • 9220a4f459 Bullet-proofing for MKTG_URLS. cahrens 2013-06-06 10:29:10 -04:00
  • de1c68796b Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement dcadams 2013-06-06 08:48:10 -07:00
  • 86a7a255c3 resolves background color syncing for particular page/container wrappers Brian Talbot 2013-06-06 10:35:44 -04:00
  • 6526146b95 updated misused sass body-bg to container-bg variableon account and course views Frances Botsford 2013-06-05 15:08:38 -04:00
  • 4ffe3c51b5 Adds segment-io integration into the LMS Victor Shnayder 2013-05-28 08:29:02 -04:00
  • 743384502e Merge pull request #89 from edx/bug/christina/mktg-urls Christina Roberts 2013-06-06 08:26:23 -07:00
  • d2de8e516c Merge pull request #90 from edx/fix/frances/theming-background-color Brian Talbot 2013-06-06 08:03:05 -07:00
  • 3775ac61a6 resolves background color syncing for particular page/container wrappers Brian Talbot 2013-06-06 10:35:44 -04:00
  • 6a2eedbf99 updated misused sass body-bg to container-bg variableon account and course views Frances Botsford 2013-06-05 15:08:38 -04:00
  • c715edf57a Strip off https:// cahrens 2013-06-06 10:55:41 -04:00
  • 4415fb4c42 Started removing XML from video editor. Peter Fogg 2013-06-06 10:29:24 -04:00
  • 39397c5c2f Bullet-proofing for MKTG_URLS. cahrens 2013-06-06 10:29:10 -04:00
  • f00b42c950 Merge pull request #88 from edx/zoldak/revert-search-push Jay Zoldak 2013-06-06 07:26:49 -07:00
  • b5ba7b8269 Merge pull request #7 from edx/anton/video_tests_fix Vasyl Nakvasiuk 2013-06-06 07:15:25 -07:00
  • e2ee5145da updating mktg defaults in common.py John Jarvis 2013-06-06 10:05:44 -04:00
  • a65a0f6294 Merge pull request #87 from edx/jarv/read-mktg-settings John Jarvis 2013-06-06 07:08:03 -07:00
  • 51b70e42a4 Revert "Merge branch 'master' of https://github.com/edx/edx-platform into slater/search" Jay Zoldak 2013-06-06 10:06:37 -04:00
  • 1ef8682ae3 updating mktg defaults in common.py John Jarvis 2013-06-06 10:05:44 -04:00
  • 79edee2d9a read MKTG_URLS from env.json John Jarvis 2013-06-06 09:50:43 -04:00
  • b4bbec59d9 Merge pull request #86 from edx/jarv/read-mktg-settings John Jarvis 2013-06-06 06:54:51 -07:00
  • 713d78002d read MKTG_URLS from env.json John Jarvis 2013-06-06 09:50:43 -04:00
  • d0e3f99e77 BaseTestXmodule: create module on the fly Vasyl Nakvasiuk 2013-06-03 14:31:26 +03:00
  • 45e32107e7 video module: remove old methods Vasyl Nakvasiuk 2013-06-03 11:11:08 +03:00
  • 68716f99cc video module: _get_timeframe -> get_timeframe Vasyl Nakvasiuk 2013-05-31 10:41:34 +03:00
  • b25710346f add python video tests Vasyl Nakvasiuk 2013-05-30 11:22:20 +03:00
  • 8b06916eb6 Fix tests for firefox Anto Stupak 2013-05-29 15:53:00 +03:00
  • 7eb18fe019 adds test files for video Anton Stupak 2013-05-27 11:37:01 +03:00
  • e9c5d765ec Merge branch 'master' of https://github.com/edx/edx-platform into slater/search Slater-Victoroff 2013-06-06 08:56:37 -04:00
  • 3b165da170 Replaced troublesome pyes integration with direct calls made to elasticsearch rest api Slater-Victoroff 2013-06-06 08:56:16 -04:00
  • 5ff9f3be88 Merge pull request #81 from edx/zoldak/skip-mktg-url-link-test brianhw 2013-06-05 23:01:36 -07:00
  • 1f284c56c1 Skip a test that is causing intermittent failures due to the way it is overriding urls Jay Zoldak 2013-06-05 18:15:16 -04:00
  • bc5d792338 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement dcadams 2013-06-05 15:14:48 -07:00
  • 582b35a90e Merge pull request #80 from edx/will/fix-rake-test Will Daly 2013-06-05 14:33:30 -07:00
  • 359e61d0f2 Fixed issue with xargs on Mac OS X. Will Daly 2013-06-05 16:25:34 -04:00
  • af2416756e Moved from djanalytics to edinsights Piotr Mitros 2013-06-05 17:06:36 -04:00
  • 56385cdf32 Merge pull request #79 from edx/ned/private-settings Ned Batchelder 2013-06-05 13:17:26 -07:00
  • 7e8c06caf3 Developer-private settings files Ned Batchelder 2013-06-05 16:07:17 -04:00
  • 97c788a33a Merge pull request #78 from edx/victor/fix-help-button Victor Shnayder 2013-06-05 13:04:55 -07:00
  • 1b81d06337 Re-insert "if in course" check for displaying paragraph about forums. Victor Shnayder 2013-06-05 15:47:36 -04:00
  • d226a21eb0 Changed wording to I will JonahStanley 2013-06-05 16:01:45 -04:00
  • f652a5d8c4 Small wording fix JonahStanley 2013-06-05 15:57:42 -04:00
  • 260659cfc6 Fixed wording in the step JonahStanley 2013-06-05 15:56:45 -04:00
  • d147103be0 Fixed tab issue (tabs are now correctly spaces) JonahStanley 2013-06-05 15:55:12 -04:00
  • 83f1f9c2fc Set numpy so it does not print out warnings on student input Peter Baratta 2013-06-05 15:50:35 -04:00
  • a85a7f71df Rename variables; get rid of OPS Peter Baratta 2013-05-29 13:34:58 -04:00
  • 0548b119a9 Fixed other scenarios that were skipped JonahStanley 2013-06-05 15:21:23 -04:00
  • 786d8a9d7c cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning marco 2013-06-05 15:17:19 -04:00
  • acc743eea8 Added functionality to bypass alerts JonahStanley 2013-06-05 15:08:58 -04:00
  • 3c498f66b3 Add script to generate lists of changes made by all users in a release Calen Pennington 2013-05-23 16:06:08 -04:00
  • ee0115971b Merge pull request #68 from edx/will/diff-cover-integration Will Daly 2013-06-05 12:00:16 -07:00
  • 5d3f6dc477 Merge pull request #74 from edx/fix/cdodge/about-elements-not-exporting chrisndodge 2013-06-05 11:53:24 -07:00
  • 7fc994831f Merge pull request #75 from edx/feature/cdodge/allow-setting-of-session-cookie-name chrisndodge 2013-06-05 11:35:26 -07:00
  • ffdeac3dcd seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be an explicit str() Chris Dodge 2013-06-05 14:31:32 -04:00
  • 442532d024 Merge pull request #57 from edx/nate/theming Nate Hardison 2013-06-05 11:20:27 -07:00
  • 0b62ec7d8d theming - revised variables and link/button styling to account for edX's registration and login constrast/styling changes Brian Talbot 2013-06-05 12:27:39 -04:00
  • e9d4749877 theming - resolves some variable defintions to help with edX theme Brian Talbot 2013-06-05 11:20:11 -04:00
  • 110899620f edx.org - revises new register/login banner image variable paths to resolve a Sass rendering issue Brian Talbot 2013-06-03 15:25:39 -04:00
  • 268524597c fix a few text weights and moved ugly mixins to mixin file and implemented in shame file Giulio Gratta 2013-06-03 11:41:06 -07:00
  • 27fce3e473 SASS diff from stanford themed branch for master Giulio Gratta 2013-05-31 16:32:51 -07:00
  • 4ea6692e11 Change if ... is not None to if ... Nate Hardison 2013-06-03 12:29:14 -07:00
  • 96c4c53505 Use default PLATFORM_NAME in AWS settings Nate Hardison 2013-06-03 11:09:46 -07:00
  • 4031c193a1 Adjust available routes based on theme presence Nate Hardison 2013-06-01 13:35:12 -07:00
  • e0590c356b Rewrite the main course.scss file as well Nate Hardison 2013-06-01 12:56:42 -07:00
  • c7f56cf456 Move theme import right after variables import Nate Hardison 2013-06-01 12:54:38 -07:00
  • 2640ab49e0 Stanfordize LMS emails Nate Hardison 2013-06-01 12:41:31 -07:00
  • adf9dd3d35 Make email change templates use main layout Nate Hardison 2013-06-01 12:21:34 -07:00
  • 2c90948623 Use settings in LMS emails, not hardcoded values Nate Hardison 2013-06-01 12:14:38 -07:00
  • 940888da37 Use bugs email from settings, not hardcoded value Nate Hardison 2013-06-01 11:45:18 -07:00
  • 2ab00eefa7 Use the contact email setting instead of if/else Nate Hardison 2013-06-01 11:41:50 -07:00
  • 07511e20be Add settings for contact and bugs emails Nate Hardison 2013-06-01 11:40:27 -07:00
  • 799d56d028 Theme static error pages Nate Hardison 2013-06-01 11:16:20 -07:00
  • 41a6a352de Add setting for technical support email config Nate Hardison 2013-06-01 11:15:16 -07:00
  • d79f064248 Fix forgot password modal for theming Nate Hardison 2013-05-31 19:21:51 -07:00
  • f25fdebe67 Theme the authenticated index view Nate Hardison 2013-05-31 19:18:27 -07:00
  • dc8bd32fb2 Theme the individual course about pages Nate Hardison 2013-05-31 19:15:09 -07:00
  • 227271fec6 Theme the courseware dashboard Nate Hardison 2013-05-31 19:12:02 -07:00
  • 34c49e73f7 Don't return any news if a theme is enabled Nate Hardison 2013-05-31 19:10:48 -07:00
  • 90ebb4c836 Theme the login page Nate Hardison 2013-05-31 19:06:06 -07:00
  • 8c19b0c98b Theme the base registration page Nate Hardison 2013-05-31 18:45:50 -07:00
  • 3934770d05 Add the PLATFORM_NAME setting for display config Nate Hardison 2013-05-31 15:46:14 -07:00
  • 3fbab4d2fa Add theming hooks to (old) landing page Nate Hardison 2013-05-31 15:42:19 -07:00
  • f055c6f989 Inject theming hooks into navigation bar Nate Hardison 2013-05-31 15:37:00 -07:00
  • a3ca0843ae Use a setting for the favicon path Nate Hardison 2013-05-31 15:24:33 -07:00