Adam
c04ef4b733
Merge pull request #7630 from edx/hotfix/2015-04-08
...
Hotfix/2015 04 08
2015-04-08 14:38:19 -04:00
Adam Palay
33ddecbc97
update nltk in other parts of the platform
2015-04-08 11:28:49 -04:00
David Baumgold
aac8bf2ebd
Update NLTK to 2.0.5
...
For setuptools compatibility
2015-04-08 11:26:55 -04:00
Waheed Ahmed
c20c99badd
Added ora release tag.
2015-04-08 11:26:36 -04:00
Syed Hassan Raza
23e08b2744
Split courses drafts import issue
2015-04-08 11:22:27 -04:00
Adam Palay
d9a21bdf4d
use email context for keyword substitution, cutting down on db queries (TNL-1591)
2015-04-08 11:22:26 -04:00
Syed Hassan Raza
825aaed67f
Split course's assests can access through '/' in asset url
2015-04-08 11:22:25 -04:00
Will Daly
08cb8dd541
Merge pull request #7583 from edx/hotfix/2015-04-03
...
Hotfix: Add proxy to allow IE9 to make xdomain requests
2015-04-03 14:43:29 -04:00
Will Daly
645f9c2c7a
Add proxy to allow IE9 to make xdomain requests
...
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library. This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
2015-04-03 11:41:31 -04:00
Adam
61f7373a26
Merge pull request #7552 from edx/hotfix/2015-04-01
...
Fixed static pages removed on import for split course.
2015-04-02 16:08:50 -04:00
Will Daly
464bcf336e
Show certificates for all verified modes
2015-04-02 11:21:54 -04:00
Waheed Ahmed
62a515f038
Fixed static pages removed on import for split course.
...
PLAT-484
2015-04-02 20:14:46 +05:00
Christine Lytwynec
41d7d52bc6
Merge pull request #7515 from edx/clytwynec/lms-onload-beacon
...
Fix code comment showing in rendered page
2015-03-30 10:03:22 -04:00
Sarina Canelake
f0fa88bea0
Merge pull request #7514 from edx/sarina/20150330-update-translations
...
Update translations (autogenerated message)
2015-03-30 09:10:10 -04:00
Sarina Canelake
5a04a38106
Update translations (autogenerated message)
2015-03-30 09:09:31 -04:00
Christine Lytwynec
b33edbc060
Fix code comment showing in rendered page
2015-03-30 09:05:28 -04:00
Waqas Khalid
01bdfb125e
Merge pull request #7403 from edx/waqas/tnl1717-discussion-404
...
View discussion of user profile return 404
2015-03-30 14:36:25 +05:00
Adam
dad4b673e2
Merge pull request #7505 from edx/release
...
Release
2015-03-27 16:46:33 -04:00
chrisndodge
f441671ca0
Merge pull request #7428 from stvstnfrd/env/course/display
...
Override COURSE_*_VISIBILITY_PERMISSION from ENV_TOKENS
2015-03-27 16:41:42 -04:00
Christine Lytwynec
4d6c47c456
Merge pull request #7503 from edx/clytwynec/lms-onload-beacon
...
onload performance beacon for LMS pages
2015-03-27 16:28:30 -04:00
Martyn James
70819203f8
Merge pull request #7443 from edx/mjevtic/SOL-336
...
Fixed flaky test(s) - SOL-336 - merging updates
2015-03-27 14:58:25 -04:00
Sarina Canelake
68ba17867f
Merge pull request #7496 from open-craft/studio-display-name-consistency
...
Consistently use display_name_with_default in Studio
2015-03-27 14:57:22 -04:00
Adam
0c31da2a15
Merge pull request #7501 from edx/hotfix/2015-03-27
...
update ORA2 to fix TNL-1758
2015-03-27 14:33:35 -04:00
Ned Batchelder
33361a05e4
Merge pull request #7490 from edx/ned/dont-put-test-data-in-working-tree
...
Don't use the working tree as storage for test-created files.
2015-03-27 11:30:04 -04:00
Christine Lytwynec
06b3110ea0
onload performance beacon for LMS pages
2015-03-27 11:08:25 -04:00
Clinton Blackburn
9a8ecc65a7
Removed invalid kwarg
2015-03-27 10:37:04 -04:00
Adam Palay
cb9c89e168
update ORA2 to fix TNL-1758
2015-03-27 10:35:46 -04:00
marjev
29bceffcea
Fixed flaky test(s) - (SOL-336)
2015-03-27 14:48:36 +01:00
John Eskew
c5e198f754
Merge pull request #7469 from edx/jeskew/datadog_events_vs_compat
...
Squashed and tests passed - merging.
2015-03-26 17:19:00 -04:00
Braden MacDonald
19bd7005e6
Consistently use display_name_with_default in Studio
2015-03-26 13:24:11 -07:00
John Eskew
34adb256a6
Add datadog counters everywhere a "VS[compat]" comment exists.
...
Conflicts:
common/lib/xmodule/xmodule/xml_module.py
2015-03-26 16:18:15 -04:00
Ben Patterson
5615f0bfed
Merge pull request #7494 from edx/benp/flag-cohort-test-flaky
...
Fix empty promise. It was always evaluating to true.
2015-03-26 13:55:04 -04:00
Christopher Lee
4423510807
Merge pull request #7480 from edx/clee/MA-169_MA-77
...
Clee/ma 169 ma 77
2015-03-26 13:31:49 -04:00
Adam
c2dcbd70d1
Merge pull request #7492 from edx/release
...
Release
2015-03-26 12:56:41 -04:00
christopher lee
e8dfac091b
MA-77 Auto VAL clone course
...
MA-77 Automatically adds the course id to the videos in VAL
when a course is rerun.
2015-03-26 12:36:43 -04:00
Ben Patterson
93068e0a36
Merge pull request #7439 from edx/benp/add-markdown-tests
...
Benp/add markdown tests
2015-03-26 12:28:47 -04:00
Ben Patterson
dae5cdfceb
Fix empty promise. It was always evaluating to true.
...
This addresses TNL-1808 (and likely other flaky tests
in this area).
2015-03-26 12:27:30 -04:00
David Baumgold
c856b6dc64
Merge pull request #7457 from edx/db/openedx-logo-on-edx.org
...
"Powered by Open edX" logo on edx.org footer
2015-03-26 11:44:01 -04:00
Adam
a374419079
Merge pull request #7489 from edx/hotfix/2015-03-26
...
default discussion modules' discussion_id field to xblock's UNIQUE_FIELD...
2015-03-26 11:38:46 -04:00
Ben Patterson
b03c4eca63
Opening wiki editor should be extracted into a method.
2015-03-26 11:05:55 -04:00
Ben Patterson
6e2e40cc14
Add course wiki acceptance tests.
2015-03-26 11:05:55 -04:00
Sarina Canelake
d66bb883ac
Fix footer stylings for RTL
2015-03-26 10:15:51 -04:00
Brian Talbot
67168869f5
Adjust styling for Open edX footer details
2015-03-26 10:15:51 -04:00
David Baumgold
8abfe4a850
Put Open edX logo in CMS footer
2015-03-26 10:14:37 -04:00
David Baumgold
89252ec12d
Put Open edX logo in LMS edx.org footer
2015-03-26 10:14:37 -04:00
Ned Batchelder
84f6e11830
Don't use the working tree as storage for test-created files.
2015-03-26 09:38:09 -04:00
Christine Lytwynec
9edda95096
Merge pull request #7481 from edx/clytwynec/flaky-mathjax
...
update bokchoy with fix for TNL-1770
2015-03-26 08:57:11 -04:00
Adam Palay
43abe399f1
default discussion modules' discussion_id field to xblock's UNIQUE_FIELD (TNL-1771)
2015-03-26 08:49:21 -04:00
Christine Lytwynec
3a8716a36f
update bokchoy with fix for TNL-1770
2015-03-25 17:02:10 -04:00
David Baumgold
609b114443
Merge pull request #7475 from edx/adjust-indentation
...
Fix whitespace
2015-03-25 15:58:01 -04:00
