Muhammad Shoaib
4d52ba3a12
fix the redemption page cross browser issue on safari
2015-01-13 16:28:09 +05:00
Nimisha Asthagiri
e57f3e3b03
Merge pull request #6572 from edx/mobile/fix-decorator-api
...
Fix Mobile API decorators
2015-01-13 06:20:10 -05:00
Jesse Zoldak
eaa4f7c05b
Merge pull request #6578 from edx/zoldak/disable-pylint-R0801
...
WIP disable R0801
2015-01-13 06:05:05 -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
Nimisha Asthagiri
9566a46a4d
Fix Mobile API decorators.
2015-01-13 02:29:53 -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
AlasdairSwan
1e051e5ef8
Merge pull request #6555 from edx/alasdair/decoupled-verification-a11y
...
Alasdair/decoupled verification a11y
2015-01-12 18:52:28 -05:00
Jesse Zoldak
fdb586786e
Disable pylint R0801 duplicate-code checker
2015-01-12 17:02:12 -05:00
Brian Talbot
10168b6908
ECOM-873 accessability updates for decoupled verification
2015-01-12 16:21:34 -05:00
Braden MacDonald
012e6e6fd3
Update font awesome icons
2015-01-12 13:21:27 -08: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
Braden MacDonald
6ea5a8a595
Fix hard-coded studio name
2015-01-12 13:08:40 -08:00
Brian Talbot
4d7c7c5f68
Merge pull request #6574 from edx/talbs/fix-shoppingcart-icons
...
FIX: Polishing Vertical Alignment on Shopping Cart Action Icons
2015-01-12 15:57:36 -05:00
Brian Talbot
471f9e179e
fix: adjusting vertical alignment on shopping cart action icons
2015-01-12 15:54:52 -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
Braden MacDonald
16dc83dfc0
Merge pull request #6492 from open-craft/content_libraries/13-analytics-enhancements
...
Content libraries analytics enhancements (SOL-121)
2015-01-12 12:10:01 -08:00
Adam
dbab66c546
Merge pull request #6564 from edx/merge-release
...
Merge release
2015-01-12 14:44:29 -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
Braden MacDonald
05fc6738f6
Add in "previous_count" and "max_count"
2015-01-12 11:14:35 -08:00
Braden MacDonald
10fe9c0180
pylint fixes
2015-01-12 11:00:51 -08:00
Adam Palay
ba102b4a66
fix quality violation
2015-01-12 13:52:15 -05:00
Adam Palay
7e45858276
resolve merge conflicts between release and master
2015-01-12 13:47:30 -05:00
Braden MacDonald
9a116529ce
Add module key and library source info to problem events
2015-01-12 10:39:13 -08:00
Braden MacDonald
3a973d4274
Unit tests for library content analytics
2015-01-12 10:39:12 -08:00
Braden MacDonald
3973317aa9
Report the original LibraryUsageLocator in LMS analytics
2015-01-12 10:39:12 -08:00
Braden MacDonald
407265bc45
Store the usage locator of library blocks in split when they are inherited into a course
2015-01-12 10:39:12 -08:00
Braden MacDonald
91cb371de0
Emit per-student library content events to the tracking log for analytics
2015-01-12 10:39:12 -08:00
Braden MacDonald
e4ea28f7f6
Minor pylint fixes
2015-01-12 10:39:12 -08:00
Adam
0435289a17
Merge pull request #6554 from edx/hotfix/2015-01-12
...
Hotfix/2015 01 12
2015-01-12 13:30:47 -05:00
E. Kolpakov
195d5b57bc
pylint fixes
2015-01-12 09:58:51 -08:00
Mark Hoeber
75a26a7e7d
Merge pull request #6447 from edx/markhoeber-doc1437
...
Enrollment API Doc
2015-01-12 12:11:32 -05:00
Sarina Canelake
484ce3ed00
Merge pull request #6553 from edx/sarina/20150112-translations-update
...
Update translations (autogenerated message)
2015-01-12 11:31:51 -05:00
Mark Hoeber
a28fd30b09
Enrollment API Doc
2015-01-12 11:15:32 -05:00
Adam
8dd7b78065
Merge pull request #6501 from edx/adam/update-copy-date
...
update copyright dates
2015-01-12 10:59:11 -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
Sarina Canelake
55d85ad643
Update translations (autogenerated message)
2015-01-12 10:48:58 -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
Sarina Canelake
cc61715888
fix es translation
2015-01-12 10:42:52 -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
Braden MacDonald
134a75b367
Minor tweaks to reduce conflicts with PR 6492
2015-01-12 13:42:56 +03:00
E. Kolpakov
6a2af3ebdc
pylint fixes
2015-01-12 13:42:55 +03:00
E. Kolpakov
1a387d8217
Test for paging in items.py
2015-01-12 13:42:55 +03:00
