Sarina Canelake
|
e7cbcfff20
|
Merge pull request #8618 from edx/sarina/revert-8402
Revert "Merge pull request #8402 from edx/sarina/annotate-middleware"
|
2015-06-22 16:05:49 -04:00 |
|
Matt Drayer
|
39d2be7244
|
Merge pull request #8619 from edx/mattdrayer/ECOM-1773
mattdrayer/ECOM-1773: Fixed invalid URL reversal
|
2015-06-22 15:35:13 -04:00 |
|
Matt Drayer
|
f0f3766443
|
mattdrayer/ECOM-1773: Fixed invalid URL reversal
|
2015-06-22 14:04:43 -04:00 |
|
Sarina Canelake
|
1e21945e22
|
Revert "Merge pull request #8402 from edx/sarina/annotate-middleware"
This reverts commit 09425c3d8f, reversing
changes made to 410b9282af.
|
2015-06-22 13:55:53 -04:00 |
|
Nimisha Asthagiri
|
d9cdb5d691
|
Merge pull request #8615 from edx/nimisha/fix-unit-test
ECOM-1772 Due date issue test case fixed.
|
2015-06-22 13:50:55 -04:00 |
|
Andy Armstrong
|
9175a0c465
|
Merge pull request #8614 from edx/andya/fix-content-libraries
Use RequireJS Optimizer for content libraries
|
2015-06-22 13:47:05 -04:00 |
|
Sarina Canelake
|
19fdaeced3
|
Merge pull request #8612 from edx/sarina/remove_hinting_templates
Remove hinting templates as 'tab:' definition fails on Split
|
2015-06-22 13:37:43 -04:00 |
|
chrisndodge
|
0f3f98f35d
|
Merge pull request #8586 from edx/cdodge/fix-multi-seat_spinner
fix problems with multi-seat purchases when accessibility review was …
|
2015-06-22 13:16:34 -04:00 |
|
Awais
|
1b0246e2af
|
ECOM-1772 Due date issue test case fixed.
|
2015-06-22 13:04:21 -04:00 |
|
Sarina Canelake
|
c036aaf4d2
|
Remove Hints tab from Studio
|
2015-06-22 11:31:17 -04:00 |
|
Andy Armstrong
|
4c79a59b63
|
Use RequireJS Optimizer for content libraries
|
2015-06-22 11:30:36 -04:00 |
|
Sarina Canelake
|
548d0b662a
|
Remove hinting templates as 'tab:' definition fails on Split
|
2015-06-22 11:20:08 -04:00 |
|
Chris Dodge
|
42af5b8e35
|
fix problems with multi-seat purchases when accessibility review was completed
|
2015-06-22 10:43:54 -04:00 |
|
chrisndodge
|
80e30a411a
|
Merge pull request #8598 from edx/cdodge/fix-formatting-error
I18N needs to not include the string substitution
|
2015-06-19 19:32:01 -04:00 |
|
Chris Dodge
|
4eb3c4b18e
|
I18N needs to not include the string substitution
|
2015-06-19 17:04:30 -04:00 |
|
Nimisha Asthagiri
|
e72eaf81ac
|
Merge pull request #8582 from edx/cdodge/fix-none-totals
fix price per seat
|
2015-06-19 13:57:15 -04:00 |
|
Greg Price
|
a77923dc12
|
Merge pull request #8564 from edx/gprice/discussion-api-whitespace-content
Handle whitespace-only content in discussion API
|
2015-06-19 13:04:47 -04:00 |
|
Greg Price
|
6cd8889f9f
|
Merge pull request #8562 from edx/gprice/discussion-api-editable-fields
Add editable_fields to discussion API responses
|
2015-06-19 12:57:31 -04:00 |
|
Greg Price
|
6a9b435955
|
Merge pull request #8563 from edx/gprice/discussion-api-missing-pinned
Fix discussion_api to handle old threads
|
2015-06-19 12:03:07 -04:00 |
|
Greg Price
|
16d7a81b96
|
Add editable_fields to discussion API responses
This will allow clients to determine what actions (e.g. following,
endorsing, and editing content) a user can take on a piece of content.
|
2015-06-19 12:02:21 -04:00 |
|
Greg Price
|
174b4d943a
|
Handle whitespace-only content in discussion API
The comments service rejects whitespace-only content for certain
strings, so the discussion API should also reject such content.
|
2015-06-19 12:01:34 -04:00 |
|
Nimisha Asthagiri
|
84753740e3
|
Merge pull request #8570 from edx/mobile/video-upload-MA-844
MA-844 Video Upload: remove dependency on AssetMetaDataStore.
|
2015-06-19 11:21:50 -04:00 |
|
Sarina Canelake
|
8a1128689d
|
Merge pull request #8581 from edx/sarina/20150619-update-translations
Update translations (autogenerated message)
|
2015-06-19 10:57:33 -04:00 |
|
Chris Dodge
|
61aa3505a3
|
fix price per seat
|
2015-06-19 10:27:53 -04:00 |
|
Sarina Canelake
|
b88b8206f6
|
Update translations (autogenerated message)
|
2015-06-19 09:50:24 -04:00 |
|
AlasdairSwan
|
36c8c36987
|
Merge pull request #8567 from edx/alasdair/ECOM-1673-dashboard-challenge-expanded
ECOM-1673 removed class and icon to always show full upsell content.
|
2015-06-19 09:31:22 -04:00 |
|
Renzo Lucioni
|
e960adc0ff
|
Merge pull request #8262 from open-craft/tpa-pipeline-consolidation
Cleanup of third-party login and auto-enrollment
|
2015-06-19 09:12:11 -04:00 |
|
AlasdairSwan
|
b30839fe88
|
ECOM-1673 removed class and icon to always show full upsell content.
removed JavaScript function specific to the upsell toggle
removed bok choy test
Removed all referenced to toggleExpandMessage()
|
2015-06-19 08:29:51 -04:00 |
|
chrisndodge
|
9797951346
|
Merge pull request #8572 from edx/cdodge/fix-none-totals
Treat aggregate sums of None as 0
|
2015-06-19 07:24:21 -04:00 |
|
Braden MacDonald
|
345fcabd05
|
Fix CRI-9 so third_party_auth pipeline always completes, and consolidate auto-enrollment code
|
2015-06-18 20:57:19 -07:00 |
|
Braden MacDonald
|
350f98ebde
|
Changes for compatibility with latest python-social-auth (0.2.7)
|
2015-06-18 19:31:47 -07:00 |
|
Sarina Canelake
|
6d121dc5ad
|
Merge pull request #6786 from Stanford-Online/nick/extended-hint
Extended hint features
|
2015-06-18 18:34:24 -04:00 |
|
Christine Lytwynec
|
e48c9d9341
|
Merge pull request #8569 from edx/clytwynec/axs_tests
Make a11y test inherit from a base class
|
2015-06-18 18:32:40 -04:00 |
|
Nimisha Asthagiri
|
26d4a15d63
|
MA-844 Video Upload: remove dependency on AssetMetaDataStore.
|
2015-06-18 18:28:48 -04:00 |
|
Jesse Zoldak
|
4eee094ea5
|
Merge pull request #8559 from edx/zoldak/bok-choy-migrations
Update bok-choy cached db with the latest migrations
|
2015-06-18 16:42:08 -04:00 |
|
Chris Dodge
|
0613c2dde2
|
Treat aggregate sums of None as 0
|
2015-06-18 15:15:21 -04:00 |
|
Christine Lytwynec
|
d32355fbbd
|
Make a11y test inherit from a base class
|
2015-06-18 14:35:11 -04:00 |
|
Matt Drayer
|
2b63ddb5b9
|
Merge pull request #8565 from edx/asadiqbal08/SOL-939
SOL-939 Jasmine Tests
|
2015-06-18 13:33:09 -04:00 |
|
Matt Drayer
|
5b7ce018fc
|
Merge pull request #8555 from edx/mattdrayer/SOL-639
mattdrayer/SOL-639: Update edx-milestones Github reference
|
2015-06-18 11:54:23 -04:00 |
|
Will Daly
|
7cb41c7783
|
Merge pull request #8553 from edx/will/ecom-467
Add professional enrollments to the instructor dashboard.
|
2015-06-18 11:27:26 -04:00 |
|
Greg Price
|
6505713302
|
Fix discussion_api to handle old threads
Some old threads do not have the pinned field set, which the thread
serializer should handle.
|
2015-06-18 11:25:22 -04:00 |
|
Matt Drayer
|
e710ba7ebe
|
Update edx-milestones Github reference
|
2015-06-18 11:01:24 -04:00 |
|
chrisndodge
|
57c8072752
|
Merge pull request #8539 from edx/cdodge/update-edx-search-hash
update edx-search hash to include faceted search
|
2015-06-18 10:23:34 -04:00 |
|
Ben Patterson
|
e9c84503f6
|
Merge pull request #8561 from Stanford-Online/kluo/improve-cohort-test
Improve cohort test
|
2015-06-18 10:13:57 -04:00 |
|
Ben McMorran
|
d544db6525
|
Merge pull request #8513 from edx/benmcmorran/topic-card
TNL-1893 Add teams topic card
|
2015-06-18 10:03:37 -04:00 |
|
Ben McMorran
|
390e2c1865
|
Merge pull request #8528 from edx/benmcmorran/discussion-caching
TNL-2291 Discussion forums permission caching
|
2015-06-18 09:22:09 -04:00 |
|
Ben McMorran
|
c02d09a185
|
TNL-1893 Teams Topic Card
|
2015-06-18 13:16:28 +00:00 |
|
asadiqbal
|
58129031a5
|
SOL-939 Jasmine Tests
|
2015-06-18 14:26:47 +05:00 |
|
dino-cikatic
|
89f13e15bb
|
Merge pull request #8548 from edx/dcikatic/SOL-994
SOL-994 fix js loading if search features disabled
|
2015-06-18 09:22:13 +02:00 |
|
Greg Price
|
7c53400134
|
Merge pull request #8541 from edx/gprice/discussion-api-rendered-body
Add rendered_body to discussion API endpoints
|
2015-06-17 22:51:38 -04:00 |
|