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

10130 Commits

Author SHA1 Message Date
Calen Pennington
dca3b0fca3 Merge pull request #6599 from edx/release 
Release
 2015-01-13 13:48:34 -05:00
Waqas Khalid
70b38fc3a3 Merge pull request #6034 from mlkwaqas/waqas/tnl776-multiple-inline-discussion-problem 
In inline discussion two discussion module override actions
 2015-01-13 19:59:23 +05:00
John Eskew
6873c04599 First iteration of code which tests performance of asset metadata 
during course import/export. Uses external code_block_timer module.
   Also, add script which validates XML file against an XSD file.
   Uses the unittest framework - but is currently skipped.
 2015-01-13 08:47:24 -05:00
Shrhawk
c3f789021a Merge pull request #6285 from Shrhawk/shr/bug/TNL-904-tolerance-is-broken 
Fix tolerance broken
 2015-01-13 17:08:52 +05:00
Syed Hassan Raza
66b949b745 Fix tolerance broken 2015-01-13 16:01:46 +05:00
Waqas Khalid
fd0d475b0f Merge pull request #6361 from mlkwaqas/waqas/tnl720-unable-to-report-mark-answer 
Unable to report/vote/endorse after editing response
 2015-01-13 15:45:44 +05:00
Waqas Khalid
2a67632b7b Unable to report/vote/endorse after editing response 
When user update the response after editing he would
be unablt to report/vote/endorse the response. This
problem was caused due to double binding of event in
backbone view.

TNL-720
 2015-01-13 13:47:02 +05:00
Waheed Ahmed
47fbda9dd9 Merge pull request #6370 from edx/waheed/tnl920-fix-code-mirror-xml-editor-height 
Fixed CodeMirror editor view height in studio.
 2015-01-13 13:31:55 +05:00
Aamir
05575ecce4 Merge pull request #6548 from edx/aamir-khan/ECOM-335-caching 
ECOM-335 Created new branch from master and put all changes from aamir-k...
 2015-01-13 12:11:37 +05:00
Waheed Ahmed
05d9d139b5 Fixed CodeMirror editor view height in studio. 
TNL-920
 2015-01-13 12:11:20 +05:00
Christopher Lee
0625b84d12 Merge pull request #6557 from edx/clee-MA-187-value-error 
Clee ma 187 value error
 2015-01-12 16:18:20 -05:00
Clinton Blackburn
64bc0649ce Merge pull request #6566 from edx/clintonb/remove-unicode-file 
Removed Unicode Test Artifact
 2015-01-12 15:42:21 -05:00
Don Mitchell
ed3f609757 Change split to handle dags and fix 
children references on copy and delete w/ more than one parent
 2015-01-12 15:11:45 -05:00
Clinton Blackburn
9e973c75d0 Removed Unicode Test Artifact 
This file should not have been committed by #6447. It is causing issues for Mac OS X users, preventing checkouts and rebases.
 2015-01-12 14:24:38 -05:00
christopher lee
3e5f7bacdd MA-187 ValueError fix 
Fix for MA-187 where a value error was thrown when
a course has a video directly under a section. This
PR handles the situations where a chapter or section
can be none, and then returns the appropriate url
if available.
 2015-01-12 14:15:18 -05:00
Adam Palay
7e45858276 resolve merge conflicts between release and master 2015-01-12 13:47:30 -05:00
Mark Hoeber
75a26a7e7d Merge pull request #6447 from edx/markhoeber-doc1437 
Enrollment API Doc
 2015-01-12 12:11:32 -05:00
Mark Hoeber
a28fd30b09 Enrollment API Doc 2015-01-12 11:15:32 -05:00
Awais
beeaec5a55 ECOM-335 Created new branch from master and put all changes from aamir-khan/ECOM-335-caching-api into this branch. 2015-01-12 20:58:48 +05:00
Jesse Zoldak
a8adce13fb Merge pull request #6530 from edx/zoldak/fix-annotation-test 
Fix flakiness on annotation selenium test
 2015-01-12 10:58:04 -05:00
Aamir
ab06f37cfb Merge pull request #6521 from edx/aamir-khan/ECOM-528-donation-verified-courses 
Aamir khan/ecom 528 donation verified courses
 2015-01-12 20:46:11 +05:00
Don Mitchell
2bf3966716 Add a fix_not_found command to get rid 
of dangling children references to blocks.
TNL-1141
 2015-01-12 10:42:52 -05:00
arbisoft
62ea486570 ECOM-528 updated the test cases 2015-01-12 15:55:06 +05:00
arbisoft
50961fe5ad ECOM-528 code refactoring 2015-01-10 05:08:24 +05:00
Renzo Lucioni
cc306843bc Merge pull request #6508 from edx/renzo/split-payment-verification-fixes 
Fix cosmetic issues with the split payment and verification flow
 2015-01-09 17:42:48 -05:00
Dennis Jen
47f3252215 Merge pull request #6529 from edx/release 
Merge release back into master
 2015-01-09 17:22:15 -05:00
Jesse Zoldak
ff4f0787ec Merge pull request #6522 from edx/zoldak/video-troubleshooting 
Add debug logging to video tests
 2015-01-09 16:21:07 -05:00
Jesse Zoldak
586d798069 Fix flakiness on annotation selenium test 2015-01-09 13:53:00 -05:00
Renzo Lucioni
10cb7f10fa Fix cosmetic issues with the split payment and verification flow 
Use honor code ribbon if verification status is not missing, submitted, or approved; title column on payment confirmation page holding dollar amounts more appropriately
 2015-01-09 13:13:00 -05:00
Brian Talbot
c93817962e Merge pull request #6515 from edx/talbs/fix-update-font-awesome 
FIX: Upgrade Font Awesome - Part III: Revenge of the Glyph
 2015-01-09 12:50:14 -05:00
David Ormsbee
5abf2e78e8 Merge pull request #6528 from edx/ormsbee/coursemodes_admin 
Add search, sort, and slug dropdown to Course Modes admin.
 2015-01-09 12:44:30 -05:00
Brian Talbot
f128629f48 fixing styling and class syntax (to new FA-based classes) for missing UI elements 2015-01-09 12:01:26 -05:00
Sarina Canelake
76660e3ace Merge pull request #6484 from edx/sarina/move-branded-lms-assets 
Remove edX branding from default Open edX LMS [OPEN-307]
 2015-01-09 11:59:39 -05:00
David Ormsbee
18495e97a0 Add search, sort, and slug dropdown to Course Modes admin. 2015-01-09 11:43:22 -05:00
Don Mitchell
a969755661 Handle children pointers to non-existent children in has_changes 
TNL-1141
 2015-01-09 11:34:46 -05:00
David Baumgold
72133b777b Merge pull request #6523 from edx/static-templates-i18n 
Improve i18n for static_templates
 2015-01-09 11:06:50 -05:00
David Baumgold
d25a28375e Remove i18n 
Since this is a test file
 2015-01-09 11:04:08 -05:00
Sarina Canelake
6f5134f711 Move edx branding into edx-theme directory 
OPEN-307
 2015-01-09 10:48:20 -05:00
arbisoft
4dfabe9eb0 ECOM-528 removed the commented code in test cases 2015-01-09 20:10:19 +05:00
Nimisha Asthagiri
fe40fa6deb Merge pull request #6495 from edx/mobile/MA-212 
MA-212 Mobile API support for backward compatibility of course updates.
 2015-01-09 10:05:59 -05:00
David Baumgold
b297b839da Improve i18n for static_templates 2015-01-09 09:42:34 -05:00
Jesse Zoldak
e77acdf401 Add debug logging to video tests 2015-01-09 09:39:02 -05:00
arbisoft
36626a2b8b ECOM-528 added test cases 2015-01-09 17:55:22 +05:00
Waqas Khalid
82eed83f64 In inline discussion two discussion module override actions 
In inline discussion if we have two discussion module the
new post button open form for both discussions as well as
cancel button of one discussion call the cancel of other.
Click and button actions are now being handled inside view
of each module so that they don't disturb eachother.

TNL-776
 2015-01-09 17:10:10 +05:00
Waheed Ahmed
18f3221dcf Enforced '000' prefix for xmodule.js and added unit test. 
TNL-1070
 2015-01-09 16:30:42 +05:00
arbisoft
fd76f3754c ECOM-528 added test cases 2015-01-09 16:29:35 +05:00
arbisoft
7eb8195c23 ECOM-528 added donation support for verified courses 2015-01-09 12:31:33 +05:00
Dennis Jen
d2660e530f Merge branch 'release' 
Conflicts:
	lms/templates/verify_student/make_payment_step.underscore
 2015-01-08 15:02:26 -05:00
arbisoft
7bdbf8f17c ECOM-528 added donation support for verified courses 2015-01-09 00:02:04 +05:00
David Baumgold
1b02ed5d95 Merge pull request #6252 from edx/studio-move-branded 
Placeholder image for Open edX Studio logo, when not running on edx.org
 2015-01-08 12:42:40 -05:00