Commit Graph

19654 Commits

Author SHA1 Message Date
stroilova
9042a0a85d Merge pull request #1474 from edx/edx/docs/cleanup-info
update personal info in example
2013-10-24 07:55:52 -07:00
Adam
4257f71453 Merge pull request #1473 from edx/adam/fix/a11y-modal-management
makes ajustments to modals on page load
2013-10-24 07:13:55 -07:00
David Ormsbee
8c51c59b55 Merge pull request #1482 from edx/hotfix/randomize_descriptor
Add get_child_descriptors to the list of module_attrs in XModuleDescriptor
2013-10-24 06:11:45 -07:00
Pavel Yushchenko
72aa5cbf57 added my name to AUTHORS 2013-10-24 17:05:25 +04:00
Pavel Yushchenko
d238e03f02 remove cast to list 2013-10-24 17:04:32 +04:00
Pavel Yushchenko
0de098468f fixes shlex unicode 2013-10-24 17:04:32 +04:00
Alexander Kryklia
ee02a2dd97 Merge pull request #1421 from edx/anton/metadata-time-field
Anton/metadata time field
2013-10-24 05:50:13 -07:00
Sarina Canelake
adb320c88a Merge pull request #1461 from edx/sarina/email-subject-ux
UX explaining inst dash email subject length (128 characters)
2013-10-24 04:23:20 -07:00
Sarina Canelake
aabe8fc6b4 UX explaining inst dash email subject length (128 characters) 2013-10-23 23:18:24 -04:00
David Ormsbee
acf22bf48c Add get_child_descriptors to the list of module_attrs in XModuleDescriptor 2013-10-23 18:19:41 -04:00
Sarina Canelake
185cf42e8f Merge pull request #1462 from edx/sarina/adjust-email-template
Change footer color in bulk email template
2013-10-23 14:59:12 -07:00
Will Daly
ebf230c15d Merge pull request #1476 from edx/will/disable-caption-js
Disable video caption test seen to fail in master.
2013-10-23 14:21:37 -07:00
Will Daly
e81d2d227b Disable video caption test seen to fail in master. 2013-10-23 17:20:00 -04:00
stroilova
47cb3e3bd0 update personal info in example 2013-10-23 17:09:20 -04:00
Don Mitchell
268dee2533 Merge pull request #1471 from edx/dhm/bug_course_case
Require course ids to be case-insensitively unique
2013-10-23 13:55:31 -07:00
Adam Palay
dec40c7d56 makes ajustments to modals on page load 2013-10-23 16:36:14 -04:00
Don Mitchell
277f327690 Require course ids to be case-insensitively unique 2013-10-23 15:47:07 -04:00
cahrens
52f4f6afbc Pull modal cover and date utils into their own files.
Move overview-specific functions into overview.js.
2013-10-23 15:44:58 -04:00
Adam
2ad088095e Merge pull request #1469 from edx/adam/fix/courses-500
set courses_are_browsable flag to False, fix unicode error
2013-10-23 12:11:31 -07:00
Adam Palay
ab5863a4db fixes unicode error in course image filenames on /courses page 2013-10-23 15:06:53 -04:00
Jay Zoldak
5e39ff65db Merge pull request #1463 from edx/zoldak/fix-tests
Improve problems acceptance tests
2013-10-23 11:44:22 -07:00
Will Daly
031f307424 Merge pull request #1464 from edx/will/wait-for-section-clickable
Wait for js/base in CMS acceptance tests to ensure click handlers are installed
2013-10-23 11:41:26 -07:00
Jay Zoldak
45f87b30c0 Improve problems acceptance tests. Disable brittle video test. 2013-10-23 13:53:11 -04:00
Will Daly
68d6d276ab Merge pull request #1466 from edx/will/disable-brittle-test
Disable test seen to fail on PRs
2013-10-23 10:26:33 -07:00
David Baumgold
aa57f925c6 Merge pull request #1465 from edx/Szczork/translation-overrides
Translation overrides
2013-10-23 10:25:03 -07:00
Will Daly
55ffacaf51 Disable test seen to fail on PRs 2013-10-23 13:24:45 -04:00
Will Daly
a8fe4151ae Wait for js/base in CMS acceptance tests to ensure click handlers are
installed.
2013-10-23 13:20:52 -04:00
Szczork
b3844af28d Translation overrides
Usefull variables for translation
2013-10-23 12:39:31 -04:00
Sarina Canelake
90baa0c9af Change footer color in bulk email template 2013-10-23 11:37:51 -04:00
John Jarvis
cda168dacf Merge pull request #1459 from edx/jarv/fix-static-root
Jarv/fix static root
2013-10-23 08:01:32 -07:00
John Jarvis
68d31b9808 adding STATIC_ROOT_BASE to lms/envs/aws.py 2013-10-23 10:30:05 -04:00
John Jarvis
25c6f9455b fixes static_root override 2013-10-23 10:28:09 -04:00
brianhw
e1b39774de Merge pull request #1458 from edx/brian/email-dupe-retry
Check for requeued subtasks when in RETRY state.
2013-10-23 07:04:37 -07:00
David Baumgold
d64723db45 import: handle case where result has not responseText 2013-10-23 09:42:16 -04:00
David Baumgold
e2cdc751ee Merge pull request #1456 from edx/db/handle-bad-import
import: handle case where result has not responseText
2013-10-23 06:41:23 -07:00
Diana Huang
813c8c4cec Merge pull request #1426 from edx/diana/django-wiki-colors
Better indication of what mode is active in the wiki.
2013-10-23 06:13:50 -07:00
Valera Rozuvan
4a921e4740 Merge pull request #1397 from edx/valera/add_visual_feedback_start_end_time_video
Add visual indicator to the interface for start/end times
2013-10-23 05:30:29 -07:00
Valera Rozuvan
1a9214b2f3 Fixing merge conflicts in tests.EOF
Fixing merge conflicts in tests.
2013-10-23 15:12:24 +03:00
Usman Khalid
0a9db94004 Merge pull request #1316 from edx/usman/lms930-unregister-button-broken
Setup leanModel handlers on jQuery.ready() so that the rest of the scripts get a chance to load before modals can be activated.
2013-10-23 04:36:49 -07:00
Alexander Kryklia
c351c3dae7 Fix typos. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
e902ff6548 Fix error printing: use repr. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
32f0f555e9 Use more clean expression. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
3c4f71bbe5 Update variable names and fix typo. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
ab5653d7c1 Fix checking exception message. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
0188207819 Fix to_json of RelativeTime to support Isotime format. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
040b4da124 Change str of RelativeTime. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
14dc814e2a Fix typo 2013-10-23 13:06:12 +03:00
Alexander Kryklia
a236632c95 Fix typo. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
04f224fc16 Fix typo. 2013-10-23 13:06:12 +03:00
Alexander Kryklia
4c2ab39826 Changed help text for start and end time. 2013-10-23 13:06:12 +03:00