lduarte1991
cf95dc0b75
[TNL-293] Annotation Tool: Fixed TinMCE issue when changing units
...
- fixed tinymce editors condition to check only positive numbers
2014-09-12 13:12:56 -04:00
Ben Patterson
e05f7770e3
Merge pull request #5161 from edx/benp/solano2-lms-failures
...
Acceptance tests (lettuce): hardcode sleeps to fix flakiness
2014-09-10 15:32:59 -04:00
Clinton Blackburn
9f8e2cf5aa
Merge pull request #5132 from edx/insights-message-update
...
Updated Analytics Dashboard Message
2014-09-10 15:11:59 -04:00
Diana Huang
484f13c3cf
Merge pull request #5154 from edx/diana/pass-along-course-id
...
Pass along course id to CyberSource
2014-09-10 14:58:26 -04:00
Sarina Canelake
4596e8c212
Merge pull request #5151 from open-craft/mentoring-enforce
...
mentoring: Allow partial answers when dependency isn't enforced
2014-09-10 14:22:11 -04:00
Ben Patterson
dc75f6870a
Acceptance tests (lettuce): hardcode sleeps to fix flakiness
...
This is a quick fix (because the long fix was taking far too long
due to animation). The truer fix is to port these tests to bok-choy.
2014-09-10 13:44:49 -04:00
Sarina Canelake
ed97d98be7
Merge pull request #5158 from edx/sarina/update-transifex-langs
...
Transifex config: add Swedish and Swahili language codes
2014-09-10 13:11:02 -04:00
Tim Babych
c34fb143ba
Merge pull request #5093 from edx/tim/update-django-1.4.14
...
Update Django version to release 1.4.14
2014-09-10 20:09:28 +03:00
Mark Hoeber
adeafaad8b
Merge pull request #5134 from edx/markhoeber-doc904
...
9/9/14 Release Notes
2014-09-10 12:53:44 -04:00
Mark Hoeber
e95e6584d7
9-10-14 release notes
2014-09-10 12:52:45 -04:00
Don Mitchell
534d1b52f2
Merge branch 'release'
2014-09-10 12:40:43 -04:00
Sarina Canelake
f0c8139ad8
Transifex config: add Swedish and Swahili language codes
2014-09-10 11:48:45 -04:00
Will Daly
a9389747df
Merge pull request #5155 from edx/will/fix-cybersource-unicode-error
...
Fix a unicode error in CyberSource2
2014-09-10 11:17:53 -04:00
Don Mitchell
0dbd3cd26d
Merge pull request #5157 from edx/will/fix-cc-unicode-error-rc
...
Fix a unicode error in CyberSource2
2014-09-10 11:13:06 -04:00
Will Daly
5759a3fd29
Fix a unicode error in CyberSource2
2014-09-10 11:07:01 -04:00
Will Daly
b6474304db
Merge pull request #5122 from edx/will/ecom-218
...
Change shopping cart status once sent to Cybersource (ECOM-218)
2014-09-10 11:03:28 -04:00
Will Daly
2388e7b8cb
Fix a unicode error in CyberSource2
2014-09-10 10:47:38 -04:00
Will Daly
c47673bb8b
Add a test for the course ID merchant defined field data
2014-09-10 10:08:07 -04:00
Will Daly
541419e362
Merge pull request #5141 from edx/will/fix-embargo-tests
...
Fix embargo middleware with tests
2014-09-10 07:58:23 -04:00
Xavier Antoviaque
15319925ed
mentoring: Allow partial answers when dependency isn't enforced
2014-09-10 11:11:21 +02:00
Ben Patterson
d21384fe12
Merge pull request #5143 from edx/benp/solano2-bokchoy-course-outline
...
bok-choy: Fix flakiness in date-picker steps under studio tests
2014-09-09 14:51:11 -04:00
Brian Talbot
7312f9fd8a
Merge pull request #5145 from edx/talbs/fix-lms-button-focus
...
LMS: resolves focus background-color issue of 3rd party login buttons
2014-09-09 13:38:32 -04:00
Adam
a346fcca2c
Merge pull request #5144 from edx/adam/fix-copy
...
fixes help copy for annotation settings
2014-09-09 13:34:07 -04:00
Brian Talbot
f77466d0b3
LMS: resolves focus background-color issue of 3rd party login buttons
2014-09-09 12:49:28 -04:00
Adam Palay
12b49ef2d4
fixes help copy for annotation settings
2014-09-09 11:43:32 -04:00
Ben Patterson
a8843aa7c7
TE-468 - bok-choy: Fix flakiness in date-picker steps under studio
...
These were failing on Solano builds because the save button was clicked
before the datepicker was done its work. (The EmptyPromise was still satisfied
because the input field value had been updated, but the datepicker widget
caused issues about 3/4 of the time.)
2014-09-09 10:17:02 -04:00
Gabe Mulley
c606c295e1
Merge pull request #5002 from mulby/gabe/add-segmentio-hook
...
Add event tracking endpoint to be called by segment.io
2014-09-09 09:17:07 -04:00
Sarina Canelake
b58b6882a6
Merge pull request #5115 from mitocw/cg/bugfix/add_git_clean
...
Fixes git export to support repositories with dots in their name and cleans export repo
2014-09-09 09:15:33 -04:00
Sarina Canelake
45b3cf2da4
Merge pull request #5136 from mitocw/cg/bugfix/namerror_legacy
...
Corrected NameError for invalid variable
2014-09-09 09:11:25 -04:00
Sarina Canelake
3a73fccc8e
Merge pull request #5101 from mitocw/cg/bugfix/remove_translated_log_messages
...
Remove some uneeded translation strings in git_export
2014-09-09 09:06:45 -04:00
Will Daly
512db7be99
Fix embargo middleware with tests
2014-09-09 08:50:10 -04:00
Don Mitchell
ee71eba15b
Merge pull request #5109 from edx/split/inherited_settings
...
Cache inherited settings outside of structure
2014-09-09 08:48:45 -04:00
Piotr Mitros
6d914e2b0a
AWS settings for XBlocks to have filesystem-like storage
...
Upgrades to latest pyfs to support auth not through environment variables
2014-09-09 08:43:18 -04:00
Usman Khalid
92a745b638
CodeMirror should use monospace fonts.
...
TNL-197
2014-09-09 08:41:59 -04:00
Gabe Mulley
7900e8d346
Add event tracking endpoint to be called by segment.io
2014-09-09 07:25:54 -04:00
Carson Gee
6b95ec8de2
Corrected NameError for invalid variable
2014-09-08 21:45:14 -04:00
Renzo Lucioni
7c89b93149
Merge pull request #5135 from edx/renzo/fix-embargo-middleware-redux
...
Do not call upper on a profile country code of None
2014-09-08 17:49:30 -04:00
Greg Price
e26457748e
Merge pull request #5127 from aboudreault/discussion-request-abort-issue
...
Fix discussion error popup on http request abort
2014-09-08 17:46:16 -04:00
Renzo Lucioni
12d5c9b281
Do not call upper on a profile country code of None
2014-09-08 17:33:02 -04:00
Don Mitchell
0f8355fd47
Test inheritance to new xblocks in same request
2014-09-08 16:13:30 -04:00
Don Mitchell
74c44c5e2b
Cache inherited settings outside of structure
...
LMS-11363
2014-09-08 15:55:45 -04:00
Diana Huang
4f67f0dad9
Add course_id as merchant defined data
2014-09-08 15:43:44 -04:00
Alan Boudreault
78fd5cc12a
Fix discussion error popup on http request abort
2014-09-08 15:43:37 -04:00
Usman Khalid
d5973a0e44
Merge pull request #5124 from edx/usman/tnl197-codemirror-font
...
CodeMirror should use monospace fonts.
2014-09-09 00:38:49 +05:00
Clinton Blackburn
ee036ecaa6
Updated Analytics Dashboard Message
...
Message to dashboard now includes the name of the application.
2014-09-08 15:37:34 -04:00
Renzo Lucioni
ba7ff67a55
Merge pull request #5113 from edx/renzo/remove-unused-js
...
Remove unused analytics JS left over by 3rd party auth changes
2014-09-08 15:36:05 -04:00
Renzo Lucioni
80a0744e95
Merge pull request #5130 from edx/renzo/autoreg-no-audit-mode
...
Skip audit enrollment if user is in the experimental branch
2014-09-08 15:31:08 -04:00
Renzo Lucioni
0b2840ee6f
Skip audit enrollment if user is in the experimental branch
2014-09-08 14:17:04 -04:00
Sarina Canelake
b0c2b73d80
Merge pull request #5112 from edx/sarina/quality-clean
...
Quality cleanup
2014-09-08 13:48:57 -04:00
Sarina Canelake
467f2988e1
Quality cleanup
2014-09-08 12:02:31 -04:00
