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

25169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renzo Lucioni
fa2154a694 Merge pull request #4893 from edx/web-analytics/pass-ga-cookie 
Re-use GA cookie when sending server-side events to Segment.io
 2014-08-21 16:28:06 -04:00
Jesse Zoldak
3efc384fa5 Merge pull request #4926 from edx/zoldak/update-bok 
Update bok-choy version
 2014-08-21 16:16:34 -04:00
Brian Talbot
b69aa64c0e Merge pull request #4904 from edx/talbs/studio-fix-font-weight 
Studio: FIX - Font Weights
 2014-08-21 13:53:24 -04:00
Jesse Zoldak
337a75598f Update bok-choy version 2014-08-21 12:16:42 -04:00
Tim Babych
a986b46cb1 Merge pull request #4750 from edx/anton/publish-unit-from-course-outline 
Publish sections/subsections/units from course outline.
 2014-08-21 18:19:14 +03:00
Renzo Lucioni
79461722de Re-use GA cookie when sending server-side events to Segment.io 2014-08-21 10:47:35 -04:00
polesye
732bcbdeb6 STUD-1911, STUD-1932: Publish sections, subsections and units from course outline. 2014-08-21 17:34:06 +03:00
Brian Talbot
66abd71fbe Studio: correcting font weight/display issues 
* reducing font-weight on component adding menu
* adding in and applying demi-strong font-weight
* adding in $color-copy-emphasized variable
* correcting stateful xblock settings styling nesting
* syncing video player xblock-based controls font-weight

STUD-2109
 2014-08-21 09:48:45 -04:00
Christina Roberts
420ae2da1e Merge pull request #4857 from edx/christina/stud-2093 
Add bok choy tests for bad HTML module content.
 2014-08-21 09:48:24 -04:00
muhammad-ammar
06842be865 Merge pull request #4859 from edx/ammar/bok-choy-video-transcript-tests 
Bok-Choy Video Transcript Tests Batch1
 2014-08-21 12:01:04 +05:00
Brian Talbot
10a0d740cf Merge pull request #4916 from edx/talbs/studio-fix-unitsidebar 
Studio: FIX - Unit/Container Sidebar Content Wrapping
 2014-08-20 23:28:28 -04:00
Sarina Canelake
5215e87906 Merge pull request #4906 from bradenmacdonald/fix-idde-invalid-student 
Friendly error if invalid student is entered for due date extension
 2014-08-20 22:12:51 -04:00
Braden MacDonald
c3abf326ff Friendly error if invalid student identifier is entered for due date extension 2014-08-20 17:09:57 -07:00
Minh-Tue Vo
5b1befa92b Merge pull request #4902 from edx/mvo/adding_tests_for_country_list 
adding tests for country list in different languages
 2014-08-20 16:28:50 -04:00
Sarina Canelake
874355652b Merge pull request #4911 from edx/sarina/a11y-extensions 
Add placeholders for text input on Extensions dash feature
 2014-08-20 16:00:40 -04:00
cahrens
49f4d1ee9f Disable JS error test until Andy's PR. 2014-08-20 15:54:48 -04:00
cahrens
7ce547f0a5 Fix for "ui-sortable" existing in HTML within HTML module. 2014-08-20 15:54:43 -04:00
Minh Tue Vo
4e1c4c46e6 adding tests for country list in different languages 
updating the version for django_countries
 2014-08-20 15:30:17 -04:00
Brian Talbot
f47aa04151 Studio: breaking longer user/id-based strings on unit and container views 
STUD-2113
 2014-08-20 14:53:39 -04:00
Brian Talbot
d808b742e5 Studio: revising %cont-text-sr Sass placeholder based on modern browser support 2014-08-20 14:48:37 -04:00
Adam
6a9753239d Merge pull request #4896 from Kelketek/fix_path_to_location 
path_to_location now returns 404 on orphaned items. Resolves LMS-9661.
 2014-08-20 13:23:30 -04:00
Ben Patterson
cb74f55aad Merge pull request #4828 from edx/benp/workaround-npm-error 
Paver: Check for the npm registry and set it if necessary.
 2014-08-20 13:16:21 -04:00
Sarina Canelake
06001abc60 Merge pull request #4905 from bradenmacdonald/fix-idde-ui 
Fix: inadvertent scroll when loading the instructor's extensions tab
 2014-08-20 13:15:39 -04:00
David Baumgold
b1ddfb30e6 Merge pull request #4912 from edx/db/linkify-browsers 
Linkify browser names
 2014-08-20 12:55:38 -04:00
Ben Patterson
b2482f54f7 Check for npm registry and set it if necessary. 
If paver is being run by a user that is not the same as the user
that installed npm on the guest machine, then paver install_prereqs fails
with the following error:

  ---> pavelib.prereqs.install_node_prereqs
  npm config set registry http://registry.npmjs.org/
  npm ERR! Error: EPERM, chown '/home/jenkins/.npmrc'
  npm ERR!  { [Error: EPERM, chown '/home/jenkins/.npmrc'] errno: 50, code: 'EPERM', path: '/home/jenkins/.npmrc' }
  npm ERR!
  npm ERR! Please try running this command again as root/Administrator.

  npm ERR! System Linux 3.2.0-23-generic
  npm ERR! command "/usr/bin/node" "/usr/bin/npm" "config" "set" "registry" "http://registry.npmjs.org/"
  npm ERR! cwd /home/jenkins/shallow-clone
  npm ERR! node -v v0.10.30
  npm ERR! npm -v 1.4.21
  npm ERR! path /home/jenkins/.npmrc
  npm ERR! code EPERM
  npm ERR! errno 50
  npm ERR! stack Error: EPERM, chown '/home/jenkins/.npmrc'
  npm ERR!
  npm ERR! Additional logging details can be found in:
  npm ERR!     /home/jenkins/shallow-clone/npm-debug.log
  npm ERR! not ok code 0

  Captured Task Output:
  ---------------------

  ---> pavelib.prereqs.install_prereqs
  ---> pavelib.prereqs.install_ruby_prereqs
  ---> pavelib.prereqs.install_node_prereqs
  npm config set registry http://registry.npmjs.org/

  Build failed running pavelib.prereqs.install_prereqs: Subprocess return code: 50

This change is a workaround. It will first see if the value is set. In the case
that is it not set, it will attempt to set it. (It will then fail; however,
re-running the task will subsequently be successful.)
 2014-08-20 12:39:56 -04:00
David Baumgold
f4d8dc661d Linkify browser names 2014-08-20 12:04:39 -04:00
Sarina Canelake
fadade48d4 Add placeholders for text input on Extensions dash feature 2014-08-20 12:03:08 -04:00
Sarina Canelake
665479a811 Merge pull request #4868 from bradenmacdonald/fix-idde-bugs 
Fixed: Can set earlier due date as an individual due date extension and related bugs
 2014-08-20 11:47:31 -04:00
Will Daly
be1523f280 Merge pull request #4880 from edx/will/use-new-cybersource-api 
CyberSource API Update
 2014-08-20 11:22:13 -04:00
Mark Hoeber
c2e804ec07 Merge pull request #4901 from edx/markhoeber-documentation-browser-support 
Added shared browser topic
 2014-08-20 11:13:11 -04:00
Brian Talbot
73d90798ef Merge pull request #4894 from edx/talbs/studio-outline-fixups 
Studio: FIX - Outline Edit Actions Alignment
 2014-08-20 11:04:35 -04:00
clytwynec
211a65dec8 Merge pull request #4843 from edx/clytwynec/jenkins_how_to_doc 
Clytwynec/jenkins how to doc
 2014-08-20 10:55:32 -04:00
Christine Lytwynec
a06d64da79 adding guides for jenkins tests 2014-08-20 10:54:26 -04:00
Daniel Friedman
0829acb8dd Merge pull request #4872 from edx/dan-f/course-outline-start-date 
View course start date from course outline
 2014-08-20 10:44:36 -04:00
Will Daly
1ad8d4f2d4 Add verification for CyberSource2 implementation. 
Clean up shopping cart processor API.
Fix UUID JSON serialization bug in CyberSource2 implementation.
Update test suite to use new CyberSource2 implementation.
Fix i18n messages in CyberSource2
Enable CyberSource2 implementation by default.
 2014-08-20 10:39:48 -04:00
Waheed Ahmed
3ddf8263dd Merge pull request #4792 from edx/waheed/lms11217-fix-500-error-in-views-with-incompete-course-id 
Fixed 500 error on views with incomplete course id in url.
 2014-08-20 19:18:11 +05:00
Ben Patterson
ea967148ed Merge pull request #4860 from edx/benp/lint-cleanup 
pep8 improvements on bok-choy tests.
 2014-08-20 10:08:38 -04:00
Mark Hoeber
d89cb9018b title edit 2014-08-20 09:32:04 -04:00
Waheed Ahmed
e26efea26f Fixed 500 error on views with incomplete course id in url. 
LMS-11217
 2014-08-20 18:30:58 +05:00
Mark Hoeber
3a37436266 Added browsers to data, developers, install, release notes 2014-08-20 09:23:32 -04:00
Mark Hoeber
33502f68d2 Edits - Alison 2014-08-20 09:13:07 -04:00
Jonathan Piacenti
8918217df2 path_to_location now returns 404 on orphaned items. Resolves LMS-9661. 2014-08-20 13:12:47 +00:00
Ben Patterson
4343a953a3 pep8 improvement on bok-choy page class. 2014-08-20 09:05:30 -04:00
Ben Patterson
a18660cabd pep8 improvements on bok-choy tests. 2014-08-20 09:05:30 -04:00
Muhammad Ammar
cfeb7102a6 Bok-Choy Video Transcript Tests 2014-08-20 12:11:21 +00:00
Waqas Khalid
14de1a3f9e Merge pull request #4203 from mlkwaqas/waqas/for581-truncated-markup-on-user-profile 
Truncated markup can be displayed in forums user profile view
 2014-08-20 15:45:20 +05:00
Waqas Khalid
01aa38fb82 Truncated markup can be displayed in forums user profile view 
FOR-581
 2014-08-20 14:33:23 +05:00
muhammad-ammar
ca3bd2f83f Merge pull request #4496 from edx/ammar/bok-choy-cms-video-editor-tests 
Bok-Choy CMS Video Editor Tests
 2014-08-20 13:19:10 +05:00
Braden MacDonald
b2be62cf1e Add myself to AUTHORS, update changelog 2014-08-19 23:29:36 -07:00
Braden MacDonald
9c93cd8dd6 Fix: Display error when attempting to reset nonexistent due date extension 2014-08-19 23:29:36 -07:00