Waheed Ahmed
d9ccaa650a
Check REQUEST_CONTEXT.context exists before accessing it.
...
LMS-11226
2014-08-14 12:21:54 -04:00
Christina Roberts
ad37d93d24
Merge pull request #4775 from edx/alex/fix-reenable-user-partitions
...
Reenable user partition in Advanced Settings.
2014-08-11 10:39:06 -04:00
Alexander Kryklia
9643120390
Reenable user partition in Advanced Settings.
2014-08-11 16:41:29 +03:00
Christina Roberts
d6522e52e7
Merge pull request #4762 from edx/annotations-js-fix
...
Annotator Tools: Fix major logic bug in code (RC)
2014-08-08 16:37:54 -04:00
Renzo Lucioni
37598e605e
Merge pull request #4763 from edx/lms/add-optimizely
...
Lms/add optimizely
2014-08-08 16:28:55 -04:00
Diana Huang
83f7acffca
Merge pull request #4764 from edx/diana/show-cert-without-end-date
...
Show Certificates Before End
2014-08-08 15:36:39 -04:00
Christina Roberts
562ec03696
Merge pull request #4760 from edx/oleg/turn-off-cdn-rc
...
Allow turning off Video CDN in Studio.
2014-08-08 15:12:54 -04:00
Renzo Lucioni
2380235fd7
Add Optimizely widget
2014-08-08 14:58:18 -04:00
lduarte1991
71e9f4488b
Annotator Tools: Fix major logic bug in code
2014-08-08 14:56:21 -04:00
Oleg Marshev
0577b9d8b9
Allow turning off Video CDN in Studio.
...
BLD-1207
2014-08-08 14:39:19 -04:00
Diana Huang
7865e2fb3c
Move certificates_show_before_end into a new variable
...
Mark it as deprecated, but maintain backwards compatibility.
ECOM-11
2014-08-08 14:29:57 -04:00
Adam
26b08a0205
Merge pull request #4736 from edx/usman/lms11205-embargomiddleware-invalidkeyerror
...
Catch InvalidKeyError in course_id_from_url().
2014-08-08 13:27:25 -04:00
Usman Khalid
f9ee21f434
Incomplete course ids should return a 404.
2014-08-08 20:34:44 +05:00
Julia Hansbrough
1d64b50df2
Merge pull request #4743 from edx/flowerhack/fix-upgrade-message
...
Basic fix for upgrade text bug
2014-08-08 11:24:43 -04:00
Anton Stupak
5bf38806f8
Merge pull request #4716 from edx/anton/studio-tooltip-manager
...
Studio: Add tooltips.
2014-08-08 18:04:49 +03:00
Julia Hansbrough
3de1ab83de
Basic fix for upgrade text bug
2014-08-08 14:31:49 +00:00
Will Daly
6d263fe445
Merge pull request #4752 from edx/will/ora2-release-2014-08-08T13.47
...
ORA2 release-2014-08-08T13.47
2014-08-08 10:23:11 -04:00
clytwynec
8c8d388d1a
Merge pull request #4744 from edx/clytwynec/remove_flaky_decorator_from_tests
...
removing "flaky" plugin, since it is not reporting failures properly
2014-08-08 10:15:03 -04:00
Will Daly
949c965648
ORA2 release-2014-08-08T13.47
2014-08-08 09:48:26 -04:00
polesye
37c3a50ffa
Add tooltip manager in Studio.
2014-08-08 16:31:14 +03:00
Carlos Andrés Rocha
80ee7e9990
Merge pull request #4747 from rocha/update-authors
...
Update AUTHORS file
2014-08-08 09:24:07 -04:00
Usman Khalid
131c8cbf10
Catch InvalidKeyError in course_id_from_url().
...
LMS-9663
2014-08-08 18:21:48 +05:00
Will Daly
dcee518dc8
Merge pull request #4742 from edx/will/ora2-release-2014-08-07T20.03
...
ORA2 release-2014-08-07T20.03
2014-08-08 05:31:20 -04:00
Carlos Andrés Rocha
8fce758bd9
Update AUTHORS file
2014-08-07 22:17:15 -04:00
Will Daly
228aa77150
ORA2 release-2014-08-07T20.03
2014-08-07 19:56:57 -04:00
Christine Lytwynec
0243d0afa1
removing "flaky" plugin, since it is not reporting failures properly
2014-08-07 16:48:31 -04:00
jsa
d96de4249d
Merge branch 'release'
2014-08-07 16:22:39 -04:00
Alison Hodges
ec5a2a1d7c
Merge pull request #4741 from edx/ahodges/changelog
...
Fixed table and spelling error
2014-08-07 16:01:23 -04:00
Alison Hodges
6c59c2d470
Fixed table and spelling error
2014-08-07 16:00:51 -04:00
Diana Huang
0d62895be4
Modify certificates_show_before_end_date behavior
...
Hide the certificate notification box when there's
no certificate information, even when the flag
certificates_show_before_end_date is turned on.
ECOM-11
2014-08-07 14:58:04 -04:00
Christina Roberts
99bcf107f9
Merge pull request #4296 from edx/bulk-publishing
...
Studio Publishing redesign
2014-08-07 14:04:10 -04:00
Alison Hodges
947abe5a63
Merge pull request #4721 from edx/ahodges/documentation/relnotes_08_05
...
Release notes for August 6 release
2014-08-07 14:02:03 -04:00
Alison Hodges
2c4dbedadb
Release notes for August 6 release
2014-08-07 14:01:28 -04:00
Alison Hodges
82b01fe5b8
Merge pull request #4724 from edx/ahodges/documentation/DOC790
...
List of all email messages and options to view and copy them
2014-08-07 13:48:57 -04:00
Alison Hodges
641591ce5a
List of all email messages and options to view and copy them
2014-08-07 13:48:26 -04:00
Alison Hodges
c96f1e7ffd
Merge pull request #4704 from edx/ahodges/documenation/DOC813
...
Added enrollment breakdown by certificate track
2014-08-07 13:20:15 -04:00
Ben McMorran
f3070e6796
Reduce mongo calls on course outline and container pages
2014-08-07 12:27:38 -04:00
Daniel Friedman
4b6035bafb
Automatically collect HAR data for performance testing
2014-08-07 12:27:38 -04:00
cahrens
fffabeba4c
Change wording of "remove staff lock" message.
2014-08-07 12:27:37 -04:00
cahrens
8079731d96
Assign Studio tests to shards.
2014-08-07 12:27:37 -04:00
cahrens
638d7a4578
Update CHANGELOG for Studio publishing changes.
2014-08-07 12:27:37 -04:00
cahrens
59d44c54b1
Updates after rebase.
2014-08-07 12:27:37 -04:00
Brian Talbot
90fe25b4ff
Studio: revising size and field layout of outline settings modal
2014-08-07 12:27:36 -04:00
Brian Talbot
8c72351936
Studio: revising clear icon used within outline settings modal
2014-08-07 12:27:36 -04:00
cahrens
932a130b16
pep8/pylint
2014-08-07 12:27:36 -04:00
Brian Talbot
ec89d3da1a
Studio: revising unscheduled icon in outline UI
...
STUD-2061
2014-08-07 12:27:36 -04:00
Ben McMorran
0b06712645
Remove specific wording for live content warning
2014-08-07 12:27:35 -04:00
Ben McMorran
e4635aaa69
Don't release date if it hasn't been changed.
...
STUD-2056
2014-08-07 12:27:35 -04:00
Ben McMorran
391ab8469e
Open "View Live Version" and "Preview Changes" in a new window
...
STUD-2058
2014-08-07 12:27:35 -04:00
Ben McMorran
9b6c9fead9
Remove staff lock field when removing staff lock
2014-08-07 12:27:35 -04:00
