lduarte1991
|
de5edcffbb
|
Diacritic Plugin for Annotator TooL: Added CSS and JS files
- UI Fixes for Diacritic Mark Plugin
|
2014-06-02 10:45:29 -04:00 |
|
Anton Stupak
|
ee368da66b
|
Merge pull request #3946 from edx/anton/i18n-code-response
CodeResponse: fix i18n.
|
2014-06-02 16:32:45 +03:00 |
|
Anton Stupak
|
1a9f98b2dd
|
Merge pull request #3895 from edx/anton/i18n-choice-text-response
BLD-724: ChoiceTextResponse i18n.
|
2014-06-02 15:11:16 +03:00 |
|
Waheed Ahmed
|
141c1cd2d6
|
Merge pull request #3755 from edx/waheed/lms2711-staff-debug-links-fixed-for-all-units
Fixed links for units loaded via ajax.
|
2014-06-02 16:04:59 +05:00 |
|
Waheed Ahmed
|
cc36162df1
|
Fixed links for units loaded via ajax.
LMS-2711
|
2014-06-02 14:19:19 +05:00 |
|
Waheed Ahmed
|
e6a9047f8a
|
Merge pull request #3852 from edx/waheed/lms2737-fix-staff-debug-info-links
Fixed staff debug info endpoints for staff member.
|
2014-06-02 14:01:33 +05:00 |
|
Waheed Ahmed
|
cb2af13418
|
Fixed staff debug info endpoints for staff member.
LMS-2737
|
2014-06-02 12:26:27 +05:00 |
|
polesye
|
73df5a9343
|
BLD-724: ChoiceTextResponse i18n.
|
2014-06-02 09:22:25 +03:00 |
|
Sarina Canelake
|
f683a4c576
|
Merge pull request #3943 from edx/flowerhack/cleanup-opaque-keys
Change Location, CourseLocator, etc to reference opaque-keys library
|
2014-05-30 17:38:27 -04:00 |
|
Julia Hansbrough
|
6ccb11f03e
|
Change Location, CourseLocator, etc to reference opaque-keys library
|
2014-05-30 20:32:38 +00:00 |
|
Ben Patterson
|
049e9f0db4
|
Merge pull request #3919 from edx/benpatterson/clean-up-rbenv
Ensure no old gems are left behind between test runs.
|
2014-05-30 14:40:24 -04:00 |
|
Adam
|
e348ab9a9b
|
Merge pull request #3937 from edx/adam/remove-qualaroo-studio
removes qualaroo from studio (STUD-1684)
|
2014-05-30 14:25:40 -04:00 |
|
Don Mitchell
|
77b8cbbaa9
|
Merge pull request #3932 from edx/dhm/bug_orphans
Delete orphans was trying to get non-existent 'draft' modulestore
|
2014-05-30 13:28:12 -04:00 |
|
Andy Armstrong
|
c389746a2a
|
Describe Python support for multi-line comments
Added more details around Python's support for multi-line translator comments.
|
2014-05-30 11:45:23 -04:00 |
|
Dave St.Germain
|
ed9ab3ad71
|
Merge pull request #3501 from edx/dcs/matlab-api-key
Allow courses to set Matlab API key globally, in advanced settings.
|
2014-05-30 11:40:32 -04:00 |
|
Mark Hoeber
|
2fd2eda6ea
|
Merge pull request #3930 from edx/markhoeber/documentation/doc-446
Studio Welcome, Sign Up, and Sign In pages Help and text fixes
|
2014-05-30 11:31:30 -04:00 |
|
Carlos Andrés Rocha
|
8d84bfab0b
|
Merge pull request #3926 from rocha/update-event-tracking-version
Updated version of event-tracking library to 0.1.0
|
2014-05-30 11:28:27 -04:00 |
|
Will Daly
|
ebbcf59f8a
|
Merge pull request #3936 from edx/will/update-ease
Update EASE in edx-platform requirements
|
2014-05-30 11:26:49 -04:00 |
|
David Baumgold
|
30dd47a62c
|
Merge pull request #3907 from lduarte1991/lduarte-harvardx-image2
Annotation Tools: Load Tinymce in student_view
|
2014-05-30 10:51:46 -04:00 |
|
Don Mitchell
|
f0063d97c6
|
Delete orphans was trying to get non-existent 'draft' modulestore
|
2014-05-30 10:28:26 -04:00 |
|
Adam Palay
|
826aa4554c
|
removes qualaroo from studio (STUD-1684)
|
2014-05-30 10:05:35 -04:00 |
|
Andy Armstrong
|
0a8b2649c7
|
Merge pull request #3933 from edx/andya/edit-container-fixes
Fix the title of edit modals from the unit page.
|
2014-05-30 09:38:36 -04:00 |
|
David Baumgold
|
0c9d682df3
|
Merge pull request #3196 from mtyaka/enrollment-emails-http
Don't hardcode https protocol in enrollment emails.
|
2014-05-30 09:30:43 -04:00 |
|
Will Daly
|
684c6fad98
|
Update EASE in edx-platform requirements
|
2014-05-30 09:26:25 -04:00 |
|
Ben Patterson
|
1b67aebbe5
|
Run bundle clean after bundle install
Running it beforehand was resulting in a corrupted state
if it was the first time bundle install was run.
|
2014-05-30 07:40:18 -04:00 |
|
Oleg Marshev
|
aeaddef301
|
Merge pull request #3917 from edx/oleg/add-span-tag-matlab
Accept span tag from xqueue. BLD-1006.
|
2014-05-30 12:02:07 +03:00 |
|
Oleg Marshev
|
daf4840cb6
|
Add span tag.
|
2014-05-30 10:30:23 +03:00 |
|
Sarina Canelake
|
0a30f24e26
|
Merge pull request #3754 from theJohnnyBrown/empty-course-error
show a friendly message for an empty course rather than an error page
|
2014-05-29 21:07:42 -04:00 |
|
Sarina Canelake
|
5c9fe4bb7a
|
Merge pull request #3929 from edx/sarina/lms-2786
Fix location.url [LMS-2786]
|
2014-05-29 21:01:46 -04:00 |
|
Sarina Canelake
|
0f2b4cd2b6
|
Merge pull request #3931 from edx/sarina/fixup-external-opaque-keys-impls
Use external OpaqueKey implementations
|
2014-05-29 18:23:08 -04:00 |
|
Sarina Canelake
|
e77dffcbcd
|
Fix location.url [LMS-2786]
|
2014-05-29 18:01:29 -04:00 |
|
Johnny Brown
|
0bd2286e5b
|
show a friendly message for an empty course rather than an error page
|
2014-05-29 16:55:40 -05:00 |
|
Andy Armstrong
|
5792e7e06a
|
Fix the title of edit modals from the unit page.
|
2014-05-29 17:10:33 -04:00 |
|
Calen Pennington
|
cfcbdc0145
|
Move to OpaqueKey implementations from the external library
[LMS-2757]
|
2014-05-29 17:03:35 -04:00 |
|
Adam
|
b15f3f1951
|
Merge pull request #3841 from edx/fix/large-email-queries-2
Fix/large email queries 2
|
2014-05-29 16:37:25 -04:00 |
|
Will Daly
|
e69749c9df
|
Merge pull request #3896 from edx/will/install-ease-and-requirements
Install EASE and requirements
|
2014-05-29 16:21:36 -04:00 |
|
Mark Hoeber
|
97bc71bd23
|
Welcome page text edits
|
2014-05-29 15:44:59 -04:00 |
|
Mark Hoeber
|
714f440353
|
Update help for welcome, register, and login pages
All now go to getting started, but have different tokens, for further
segmenting later.
|
2014-05-29 15:34:49 -04:00 |
|
Alison Hodges
|
85f1997fcb
|
Merge pull request #3927 from edx/ahodges/documentation/DOC438
corrected a typo; tried to clarify a different sentence
|
2014-05-29 15:08:08 -04:00 |
|
muhammad-ammar
|
026c6523e8
|
Merge pull request #3882 from edx/ammar/test-youtube-availibility
Check YouTube Availability for Video Tests
|
2014-05-29 23:53:58 +05:00 |
|
Alison Hodges
|
7edcc2d16b
|
corrected a typo; tried to clarify a different sentence
|
2014-05-29 14:43:10 -04:00 |
|
Carlos Andrés Rocha
|
a3360aa643
|
Updated version of event-tracking library to 0.1.0
|
2014-05-29 14:41:14 -04:00 |
|
Andy Armstrong
|
138cd45934
|
Merge pull request #3819 from edx/andya/edit-containers
Allow editing of container xblocks/xmodules
|
2014-05-29 14:33:26 -04:00 |
|
Julia Hansbrough
|
172c6d1559
|
Merge pull request #3905 from edx/flowerhack/change-hardcoded-defaults
Moved hardcoded defaults into settings
|
2014-05-29 14:23:06 -04:00 |
|
Andy Armstrong
|
6b3e100cc1
|
Allow editing of container xblocks/xmodules
STUD-1312
|
2014-05-29 14:02:45 -04:00 |
|
Carson Gee
|
7cb241b8cc
|
Merge pull request #3717 from mitocw/cg/studio_addl_apps
Add ADDL_INSTALLED_APPS to studio for parity with lms
|
2014-05-29 13:22:36 -04:00 |
|
David Adams
|
1f0c104786
|
Merge pull request #3871 from edx/dcadams/fix_metrics_tab_after_opaque_keys
Fixes some stuff for metrics tab
|
2014-05-29 09:43:46 -07:00 |
|
lduarte1991
|
a4c912a05b
|
Annotation Tools: Fixing tests for student_view
Fixed typo from autocomplete
Fixed dict for tests
|
2014-05-29 11:34:40 -04:00 |
|
lduarte1991
|
1d6f3c631d
|
Annotation Tools: Load Tinymce in student_view
|
2014-05-29 11:34:40 -04:00 |
|
Muhammad Ammar
|
7afcb9348c
|
Check YouTube Availabitlity for Video Tests
|
2014-05-29 15:08:47 +00:00 |
|