wajeeha-khalid
9fcc1c32a1
Merge pull request #10586 from edx/jia/MA-862
...
MA-862; accept application/merge-patch+json for comment/thread update
2015-11-17 11:01:37 +05:00
Adnan Ghaffar
7dac728ee9
adding fixed tests for chrome
2015-11-16 14:47:12 +05:00
Ben Patterson
f81b7cefc9
Merge pull request #10582 from edx/saleem-latif/SOL-1384
...
saleem-latif/SOL-1384: Refactor certificates bok-choy pages to use PageObject
2015-11-13 12:23:11 -05:00
Diana Huang
b3b1b7e476
Merge pull request #10610 from edx/diana/flaky-pdf-testbook-test-control
...
Start running the PDF Textbook test again.
2015-11-13 10:52:23 -05:00
Diana Huang
de47bcde7e
Start running the PDF Textbook test again.
...
Remove redundant and skipped video test.
2015-11-13 10:02:51 -05:00
Matt Drayer
b932a202d8
Merge pull request #10593 from edx/asadiqbal08/SOL-1385
...
asadiqbal/SOL-1385 Disable "Generate Certs" button until cert is activated
2015-11-13 09:15:18 -05:00
clrux
1587178525
Merge pull request #9974 from edx/clrux/ac-187
...
Video player (1 of 2): refreshing the UI
2015-11-13 08:06:43 -05:00
Saleem Latif
195178aa41
Refactor certificates bok-choy pages to use PageObject
2015-11-13 16:32:13 +05:00
asadiqbal
35d04bff89
SOL-1385
2015-11-13 15:23:02 +05:00
wajeeha-khalid
4ea70aeb19
MA-862; accept application/merge-patch+json for comment/thread update
2015-11-13 12:52:21 +05:00
Chris Rodriguez
78c6a38ca6
LMS: new UI for video player + AFontGarde iconfonts
2015-11-12 16:37:29 -05:00
Saleem Latif
c068bc95cf
Custom 500 error message should only be seen for Preview
2015-11-12 11:31:25 +05:00
Davorin Šego
a8cca47cc9
Merge pull request #10455 from edx/search/optimization
...
Search performance (SOL-1030, SOL-1031)
2015-11-11 10:41:33 +01:00
Davorin Sego
a62e403ed8
Search optimization
...
Remove filtering by partition, course and user
Rewrite the LMS result processor to use the course blocks api
2015-11-11 09:38:00 +01:00
Cliff Dyer
ce99ca63fa
Merge pull request #10561 from edx/release
...
Verify patched fix merge back into master.
2015-11-10 14:10:05 -05:00
Chris Dodge
eeb8c48922
Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts
2015-11-10 09:41:43 -05:00
Cliff Dyer
27b85fb737
Merge pull request #10554 from edx/release
...
Verifying release branch for release-2015-11-09
2015-11-09 13:26:01 -05:00
louyihua
73d8f06499
Fix gettext guidance violation
...
1. No string concatenation should be used in the gettext function.
2. Some extra parentheses should be used in coffee script, to avoid the following situation: in coffee script, the call ```gettext "text to be extracted" + "text should not be extracted"``` will be translated into ```gettext("text to be extracted" + "text should not be extracted")``` rather than ```gettext("text to be extracted") + "text should not be extracted"```.
2015-11-07 13:55:10 +08:00
Adam
e042ee2325
Merge pull request #10546 from edx/revert-disable-check-button-on-save
...
Revert disable check button on save
2015-11-06 13:22:19 -05:00
Andy Armstrong
a3ff4d50e8
Merge pull request #10534 from edx/andya/fix-studio-videos
...
Fix optimizing of draggabilly and json2
2015-11-06 12:12:44 -05:00
Adam Palay
33d9185d5d
Revert "Disable submit button on save click"
...
This reverts commit 99cca05730
2015-11-06 11:34:33 -05:00
Adam Palay
bc87ec15a9
Revert "add test for disabling check button while clicking save"
...
This reverts commit bc6caea6a6
2015-11-06 11:33:52 -05:00
Christine Lytwynec
1ca0fa2b57
Merge pull request #10328 from edx/clytwynec/custom-a11y-rules-part2
...
Clytwynec/custom a11y rules part2
2015-11-06 11:17:15 -05:00
Andy Armstrong
7a1469633f
Fix optimizing of draggabilly and json2
2015-11-06 09:40:20 -05:00
David Baumgold
8ce94d2bc0
Merge pull request #10523 from edx/db/fix-cc-flaky-tests
...
Fix flaky tests related to creative commons
2015-11-06 09:20:24 -05:00
Syed Hasan raza
ab8aedc298
Merge pull request #9924 from edx/shr/bug/TNL-3168-import_from_youtube_html5_subs
...
html5 transcript exists
2015-11-06 04:28:02 -08:00
Syed Hassan Raza
a8c80535d3
html5 transcript sync
2015-11-06 16:32:13 -08:00
Clinton Blackburn
afd682e224
Fixed admin issues
...
- Using raw ID field for user fields for enrollment and user profile admin
- Including user data in enrollment admin queryset
2015-11-06 01:49:22 -05:00
Nimisha Asthagiri
0698076440
Transformer: StudentViewTransformer
2015-11-05 23:29:12 +00:00
Nimisha Asthagiri
cbf90677b7
Merge pull request #10412 from edx/mobile/course-blocks-app
...
Course Blocks App MA-1556
2015-11-05 17:14:32 -05:00
Nimisha Asthagiri
a78b94d83a
Transformer: ContentLibraryTransformer
2015-11-05 16:22:06 -05:00
Christine Lytwynec
a40f286ecf
Updating a11y tests
2015-11-05 16:09:06 -05:00
Ben Patterson
7e8d3fdae5
Merge pull request #10519 from edx/benp/chrome-fix-certs
...
Fixes for chrome automation:
2015-11-05 15:24:38 -05:00
Christine Lytwynec
5d422b107c
remove @attr('shard_5') from mixin
2015-11-05 15:08:00 -05:00
David Baumgold
07f331bcda
Fix flaky tests related to creative commons
...
TNL-2800
2015-11-05 14:22:02 -05:00
Christine Lytwynec
468864a314
add paver test_a11y and a11y_coverage commands
2015-11-05 13:55:35 -05:00
Clinton Blackburn
b5718289dd
Merge pull request #10525 from edx/clintonb/zendesk-logging
...
Updated Zendesk error handling
2015-11-05 13:35:41 -05:00
Clinton Blackburn
bb0effb75c
Updated Zendesk error handling
...
Properly logging exceptions so we have the complete stacktrace.
ECOM-2792
2015-11-05 11:52:53 -05:00
Andy Armstrong
0785aeb959
Merge pull request #10426 from edx/andya/update-draggabilly
...
Upgrade draggabilly.js to fix Firefox iframe bug
2015-11-05 11:01:35 -05:00
Andy Armstrong
18dabc3312
Upgrade draggabilly.js to fix Firefox iframe bug
...
TNL-3627
2015-11-05 10:10:39 -05:00
Ben Patterson
947538bb1f
Merge pull request #10507 from edx/benp/mp-learner-profile-events
...
Refactor for multiprocessing.
2015-11-05 09:18:48 -05:00
Ben Patterson
ef17e0b9a1
Fixes for chrome automation:
...
* We do not need to click the upload button twice (typo?)
* Using a non-unique name for the upload image is causing GridFS indexing errors when
run too closely together (which happens with Chrome's speed)
2015-11-05 08:36:40 -05:00
Robert Raposa
b76981234d
Merge pull request #10484 from edx/robrap/TNL-2646
...
TNL-2646: Escape json in Studio
2015-11-04 14:28:25 -05:00
Peter Fogg
acf5bb57cb
Merge pull request #10509 from edx/peter-fogg/course-pacing-label-changes
...
Course pacing template changes.
2015-11-04 14:11:49 -05:00
Robert Raposa
3682fac832
Add json escaping to Studio
...
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates
TNL-2646: Escape json.dumps
2015-11-04 13:34:42 -05:00
Eric Fischer
24ee5a68f5
Merge pull request #10490 from edx/release
...
Release 4 November 2015 to master
2015-11-04 13:19:09 -05:00
Sarina Canelake
e46b43963c
Merge pull request #10416 from louyihua/underscore_ngettext
...
Fix underscore extraction error
2015-11-04 12:17:01 -05:00
Ben Patterson
8f05878e2e
Refactor for multiprocessing.
2015-11-04 10:34:36 -05:00
Peter Fogg
13f20d5649
Update cert_info docstring with correct return type.
2015-11-04 10:29:27 -05:00
Peter Fogg
5bd6e829e7
Merge pull request #10465 from edx/peter-fogg/fix-spec-helpers-closure
...
Fix `withData` and `withConfiguration` helpers.
2015-11-04 10:21:30 -05:00
