Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alison Hodges
e469e7f079 Text changes for Email Sent by addition 2014-08-20 11:49:01 -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
Bertrand Marron
70f698267a Update password reset views style 
Reuse the style from login and register views.
Remove all the specific style.
 2014-08-20 14:17:55 +02:00
Bertrand Marron
879232af46 Make use of django_main for password_reset templates 
Remove duplicated code and make sure those views use the same visual
identity.
 2014-08-20 14:17:55 +02: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
Braden MacDonald
f4e021093a Fix: 500 response if indiv. due date deleted after normal due date was deleted 2014-08-19 23:23:07 -07:00
Braden MacDonald
3ab8779190 Fix: API allowed an individual due date extension on units with no due date 2014-08-19 23:23:06 -07:00
Braden MacDonald
a08ab9ff11 Fix: an individual extended due date must not precede the normal due date LMS-6563 2014-08-19 23:23:06 -07:00
Braden MacDonald
42eaa4b005 Unit tests for bugs in IDDE API, including LMS-6563 2014-08-19 23:23:06 -07:00
Braden MacDonald
dbbbe8f2cb Fix: inadvertent scroll when loading the instructor's extensions tab 
(The div with id "view-extensions" conflicts with the tab JS which sets location.hash to "view-x" in order to track the current tab)
 2014-08-19 23:18:31 -07:00
Brian Talbot
4056e6aab5 Studio: revising alignment of in-context edit buttons in outline view 2014-08-19 16:53:18 -04:00
jhelbert
92fa79dbd0 Merge pull request #4871 from edx/jhelbert/api-upgrade-check 
This confirms the data api upgrade
 2014-08-19 16:36:29 -04:00
Mark Hoeber
94a03fad3c Added shared browser topic 
To include in all guides
 2014-08-19 16:05:32 -04:00
swdanielli
9d55cf3637 code clean 2014-08-19 15:29:34 -04:00
Justin Helbert
dd7f09d36a This confirms the data api upgrade 2014-08-19 19:03:58 +00:00
Will Daly
43368b29b0 Merge pull request #4886 from edx/will/ecom-122 
Fix messaging for professional ed under auto-registration
 2014-08-19 14:58:18 -04:00
Alison Hodges
eeaeaf6c22 Merge pull request #4897 from edx/ahodges/doc/twitter 
Keeps in sync with edx-analytics-dashboard
 2014-08-19 14:53:34 -04:00
Alison Hodges
12d8ef5405 Keeps in sync with edx-analytics-dashboard 2014-08-19 14:52:53 -04:00
Don Mitchell
ceae081cc7 Refactored expected indices after email w/ mongo 
Key order has no bearing on key order in queries other than for
Key order should be by greatest to least cardinality
Added sparse and unique declarations.
 2014-08-19 14:49:24 -04:00
David Baumgold
b4d14a566e Merge pull request #4892 from edx/db/marcnu-quality 
Cleaning up a few quality violations
 2014-08-19 14:42:40 -04:00