Commit Graph

  • a9d731165c optionally using environment variable for edx-platform hash John Jarvis 2014-12-10 20:35:15 -05:00
  • c84a604949 Positive filtering which steps can be skipped. stephensanchez 2014-12-16 16:37:23 +00:00
  • 7699b5ff94 Merge pull request #6273 from edx/renzo/fix-shoppingcart-tests Renzo Lucioni 2014-12-16 13:06:50 -05:00
  • cdcd5d79fe Fix unit test failure due to stale urls.py Renzo Lucioni 2014-12-16 12:08:20 -05:00
  • b4a8302e66 Merge pull request #6268 from edx/will/simplify-template-loading Will Daly 2014-12-16 11:42:06 -05:00
  • 9faddd9b64 Merge pull request #6267 from edx/renzo/remove-webcam-approve-button Renzo Lucioni 2014-12-16 11:15:49 -05:00
  • 95025dfce9 Merge pull request #6201 from edx/renzo/postpayment-email Renzo Lucioni 2014-12-16 10:53:22 -05:00
  • dfcbcd5435 Add a verification reminder to order confirmation emails Renzo Lucioni 2014-12-09 15:41:24 -05:00
  • 94b22bcde9 Remove webcam capture approval button (checkmark) Renzo Lucioni 2014-12-15 17:14:50 -05:00
  • 5371d17312 Merge pull request #6246 from edx/zub/bugfix/plat-332-location-revison-error zubair-arbi 2014-12-16 19:39:27 +05:00
  • 6b82489728 Merge pull request #5685 from edx/uncomment-thumbnail-tests David Baumgold 2014-12-16 09:08:05 -05:00
  • 80f5d4216a Inline underscore templates; add pre render step Will Daly 2014-12-16 07:57:18 -05:00
  • cb1058ac00 Merge pull request #6142 from edx/muhhshoaib/WL-106-MIT-Course-Information-Page-side-bar chrisndodge 2014-12-15 20:46:22 -05:00
  • 70c2adb9ef Merge pull request #6264 from edx/alasdair/dashboard-prof-ed-banner AlasdairSwan 2014-12-15 16:14:09 -05:00
  • c4bbf49b1e Merge pull request #6265 from edx/sarina/2014-12-15-translations-updates Fred Smith 2014-12-15 15:54:51 -05:00
  • f70e531df9 Update translations (autogenerated message) Sarina Canelake 2014-12-15 12:40:36 -08:00
  • c46c247e46 Merge pull request #6262 from edx/cdodge/also-sort-in-courses-list chrisndodge 2014-12-15 15:34:39 -05:00
  • ee103659dc Merge pull request #6257 from edx/mobile/video-pipeline-squashed Greg Price 2014-12-15 15:18:52 -05:00
  • 9b59e387b5 ECOM-728 updated dashboard course banners so all types of course are now supported as per the new design. Included some other small tweaks to other text on the page in consultation with AndyWaldrop AlasdairSwan 2014-12-15 15:08:40 -05:00
  • 788cc350dd Merge pull request #6260 from edx/will/combine-intro-and-make-payment Will Daly 2014-12-15 14:59:26 -05:00
  • c6b1ca34a7 Merge pull request #6263 from edx/renzo/full-name-placeholder Renzo Lucioni 2014-12-15 14:34:23 -05:00
  • 9874a8d396 Use current full name as placeholder text Renzo Lucioni 2014-12-15 14:25:31 -05:00
  • 483cccb657 also apply sorting rules overrides to the /courses view Chris Dodge 2014-12-15 14:11:58 -05:00
  • a0629003ae Merge pull request #6240 from edx/benp/fix-analytics-init Ben Patterson 2014-12-15 13:44:54 -05:00
  • d3c3f73428 Combine payment and intro step Will Daly 2014-12-15 13:10:58 -05:00
  • 578c96a8c3 Studio video upload feature template and styling Chris 2014-11-12 16:59:33 -05:00
  • 18f6980922 Merge pull request #6247 from edx/will/update-verified-requirements Will Daly 2014-12-15 13:11:45 -05:00
  • 93cc03a570 Separate verification / payment flow. Will Daly 2014-12-05 13:55:46 -05:00
  • 61cb51596d Add front end for Studio video upload feature Greg Price 2014-12-01 15:57:40 -05:00
  • 0687a62a8f Add back end for Studio video upload feature Nimisha Asthagiri 2014-12-01 15:53:55 -05:00
  • 914ecac9ac added the course price in the course about page Muhammad Shoaib 2014-12-04 14:09:21 +05:00
  • 49cb0486a6 Merge pull request #6245 from edx/will/email-opt-in-updates Will Daly 2014-12-15 12:13:27 -05:00
  • 5c1834b623 fix preview link generation for course reruns (PLAT-336) Adam Palay 2014-12-12 13:59:04 -05:00
  • ce89823f1a Merge pull request #6233 from edx/adam/fix-preview-courseruns Adam 2014-12-15 10:01:26 -05:00
  • 59343ed63f fix preview link generation for course reruns (PLAT-336) Adam Palay 2014-12-12 13:59:04 -05:00
  • 99b86d7b0f fix location revision error for multi parent draft PLAT-332 zubair-arbi 2014-12-15 17:32:48 +05:00
  • 5df1ffebc1 Add header row to email opt in list; add default date Will Daly 2014-12-15 06:04:54 -05:00
  • baaf5fa8a7 Merge pull request #6210 from edx/zub/bugfix/tnl-922-key-error-getting-position zubair-arbi 2014-12-15 16:02:30 +05:00
  • 1d6d2f2a7f set position to default value if POST request don't have position argument TNL-922 zubair-arbi 2014-12-10 14:44:30 +05:00
  • 3caf14e3de variable name error wwj718 2014-12-15 10:46:03 +08:00
  • 8a685ceca0 Merge pull request #6242 from edx/cdodge/move-shoppingcart-button-detection chrisndodge 2014-12-14 13:15:03 -05:00
  • 1148366998 change the context_processor in the shopping cart to return a pointer to a function so that only the templates that actually need to know if the shopping cart button should be shown will actually make the database roundtrips Chris Dodge 2014-12-13 15:01:13 -05:00
  • e0f83ded6d Pipe analytics client output to stdout instead of devnull. Ben Patterson 2014-12-13 20:02:53 -05:00
  • 352fce6e02 Fix another analytics.init secret error message (noise). Ben Patterson 2014-12-13 19:28:15 -05:00
  • d0b3fcc09c Merge pull request #6162 from cpennington/xblock-asides Calen Pennington 2014-12-13 10:08:52 -05:00
  • 822eaa20c6 Make ErrorDescriptor more resistent to errors Calen Pennington 2014-12-08 14:14:35 -05:00
  • d919d2ae46 Teach LMS how to render XBlockAsides Calen Pennington 2014-12-05 13:39:53 -05:00
  • 7be7b50ba9 Mock out the underlying segment-io call. Ben Patterson 2014-12-12 21:45:23 -05:00
  • e20fe2b879 Add a configuration model for managing XBlockAsides Calen Pennington 2014-12-05 13:32:00 -05:00
  • 980f30c17f Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database backed configuration to it Calen Pennington 2014-12-05 13:05:46 -05:00
  • 42792e978c Extract common base functionality for storing xblock fields in the relation db Calen Pennington 2014-12-02 15:20:18 -05:00
  • ccbff2dafc Make a generic django field for storing OpaqueKey classes Calen Pennington 2014-12-02 13:54:51 -05:00
  • 0bce5569e2 Merge pull request #6238 from edx/clytwynec/fix_failing_git_export_tests Christine Lytwynec 2014-12-12 17:28:23 -05:00
  • a63013c292 Merge pull request #6239 from edx/clytwynec/fix_pep8_violation Christine Lytwynec 2014-12-12 16:25:39 -05:00
  • 197f50b980 fix pep8 violation Christine Lytwynec 2014-12-12 16:22:00 -05:00
  • 5be9488f3f Merge pull request #6235 from edx/dan-f/fix-test-typo Daniel Friedman 2014-12-12 15:42:44 -05:00
  • b24a237cee Merge pull request #6232 from edx/clytwynec/fix_failing_cohort_test Christine Lytwynec 2014-12-12 15:21:13 -05:00
  • b9668acb32 fix git_export tests Christine Lytwynec 2014-12-12 15:06:49 -05:00
  • 3bcf18dd59 Merge pull request #6153 from edx/db/update-pep8 David Baumgold 2014-12-12 15:00:13 -05:00
  • 48c349ffde Re-add and clarify comment David Baumgold 2014-12-12 14:19:49 -05:00
  • 7e2e90e409 Fix typo in cms unit test Daniel Friedman 2014-12-12 14:01:42 -05:00
  • 3c1821a7ed fixes failing unit test in course_groups Christine Lytwynec 2014-12-12 13:34:05 -05:00
  • 035a48046e Merge pull request #6230 from edx/sarina/fix-openedx-logo Sarina Canelake 2014-12-12 12:58:06 -05:00
  • 2e5b96768a Merge pull request #5449 from Stanford-Online/njdup/bulk_emails_keyword_sub Sarina Canelake 2014-12-12 12:57:21 -05:00
  • c1dd64c07a fix enrollment issue in instructor dash (ECOM-776) Adam Palay 2014-12-12 12:10:20 -05:00
  • d2b119914f Change openedx footer image to a non-broken link Sarina Canelake 2014-12-12 12:09:15 -05:00
  • 08a8afa619 For methods on PasswordHistory, only calculate if necessary David Baumgold 2014-12-12 11:52:59 -05:00
  • e53263d937 Merge pull request #6225 from edx/studio-i18n-improvements David Baumgold 2014-12-12 11:09:58 -05:00
  • e8d62ff6a8 Replace — with literal emdash David Baumgold 2014-12-12 11:09:26 -05:00
  • b999714e1d Merge pull request #6111 from edx/zoldak/modulestore-test-config Jesse Zoldak 2014-12-12 10:53:24 -05:00
  • 4fcf1f9eae Move simplefilter comments before call David Baumgold 2014-12-12 10:47:58 -05:00
  • 838ce74a3f Add comments about disabled pep8 rules David Baumgold 2014-12-12 10:21:34 -05:00
  • 1fe72d89bf Double quotes for i18n string David Baumgold 2014-12-12 09:44:21 -05:00
  • 71a74c41c7 Don't break up i18n string David Baumgold 2014-12-11 13:41:53 -05:00
  • cc377e8c38 Merge pull request #6211 from Shrhawk/shr/bug/TNL-964-navbar-display-display-issue Shrhawk 2014-12-12 11:52:55 +05:00
  • b533e337f6 Merge pull request #6198 from edx/afzaledx/WL-105 chrisndodge 2014-12-11 22:36:22 -05:00
  • 51e53587dc WL-105 Show course cards sorted by start dates, oldest first. Afzal Wali 2014-12-09 16:10:20 +05:00
  • 32bbb0e71a Implements keyword sub feature for bulk emails njdup 2014-09-29 13:52:44 -07:00
  • 5c433ec9a1 Merge pull request #5731 from Stanford-Online/ataki/upstream Sarina Canelake 2014-12-11 16:36:30 -05:00
  • b1e5002b6b Merge pull request #6224 from edx/release Clinton Blackburn 2014-12-11 13:23:37 -05:00
  • 4152f5e4e8 Address pylint issue from diff-cover David Baumgold 2014-12-11 13:09:23 -05:00
  • 530c16326d Ignore "deprecated form of raising exception" PEP8 warning David Baumgold 2014-12-11 11:35:45 -05:00
  • 36e77c7463 Fixing pep8 issues David Baumgold 2014-12-10 17:30:03 -05:00
  • d65d3094cf Update pep8 to 1.5.7 David Baumgold 2014-12-04 17:30:06 -05:00
  • 4f823396ed Merge pull request #4276 from edx/db/update-pillow David Baumgold 2014-12-11 10:34:19 -05:00
  • 5f8d6261d9 Merge pull request #6221 from edx/hotfix/MA-182 Clinton Blackburn 2014-12-11 10:29:30 -05:00
  • aa309a8caf MA-182 Fix Mobile Subtitles. Nimisha Asthagiri 2014-12-10 15:58:00 -05:00
  • fbc48d5e31 Merge pull request #6092 from edx/zub/bugfix/tnl-884-save-weight-in-gradingpolicy zubair-arbi 2014-12-11 13:14:28 +05:00
  • f62e5347e1 round-off weight, min_count and drop_count values while returing grading policy TNL-884 zubair-arbi 2014-12-01 14:53:59 +05:00
  • c252b717ce Merge pull request #6188 from edx/jarv/config-refactor-wip John Jarvis 2014-12-10 16:47:08 -05:00
  • 93f0c75fd3 Adding yaml_config, a new settings module John Jarvis 2014-12-08 15:13:04 -05:00
  • c381ccf723 Merge pull request #6215 from edx/christina/test-file-cleanup Christina Roberts 2014-12-10 16:42:10 -05:00
  • 07b036f380 Return the filename as returned from default storage's save. cahrens 2014-12-10 13:58:28 -05:00
  • e472937854 Add DEFAULT_FILE_STORAGE configuration. cahrens 2014-12-10 13:24:18 -05:00
  • 0836a89636 Merge pull request #6189 from edx/andya/fix-masquerade Andy Armstrong 2014-12-10 11:39:29 -05:00
  • 77bbd30396 Do not create a modulestore unnecessarily in tests Jesse Zoldak 2014-12-05 12:19:58 -05:00
  • 789a9dc978 Change the default dir for loading xml files. This should always be overridden by the testcases if needed. Jesse Zoldak 2014-12-01 15:24:18 -05:00
  • 5007e98034 Merge pull request #6173 from edx/clytwynec/add_find_fixme_method Christine Lytwynec 2014-12-10 11:08:25 -05:00
  • 77f5d90d6a Merge pull request #5961 from edx/dan-f/cohort-csv-upload Christina Roberts 2014-12-10 11:04:14 -05:00
  • 7cb26650e4 Updating testing.md for find_fixme Christine Lytwynec 2014-12-09 11:53:31 -05:00