Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,956 Commits 1 Branch 0 Tags
cfaf1275a7a7a960d61404fdc92129a9c19e6987
Commit Graph

18956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Usman Khalid
cfaf1275a7 leanModel is setup on jQuery.ready() 2013-10-23 14:52:13 +05:00
polesye
6c08708131 Merge pull request #1111 from edx/anton/video_subtitles 
Add Timed Transcripts Editor.
 2013-10-23 02:38:39 -07:00
polesye
ee7c71817a Add special cases to doc. 2013-10-23 12:37:11 +03:00
Valera Rozuvan
ba5f337fdb Fix bug. Add validation to HTML5 sources field. 2013-10-23 11:52:22 +03:00
Jason Bau
6e1b8749b2 Merge pull request #1440 from edx/jbau/COE-sanitize-with-bleach 
Jbau/coe sanitize with bleach
 2013-10-22 14:01:59 -07:00
Christina Roberts
9936fc0a15 Merge pull request #1448 from edx/christina/checklists 
Change checklist URL.
 2013-10-22 12:49:54 -07:00
brianhw
2d1928753f Merge pull request #1438 from edx/brian/lock-email-task 
Add cache-based locking to subtasks to ensure that the same task is not ...
 2013-10-22 12:27:40 -07:00
cahrens
2c07bf7124 checklist_index is an integer. 2013-10-22 15:26:19 -04:00
Jason Bau
651ef209ac add autolinking 2013-10-22 12:04:37 -07:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
Brian Wilson
ecb58e863f Add cache-based locking to subtasks to ensure that the same task is not running in two workers at the same time. 2013-10-22 14:32:52 -04:00
Adam
1f7bb112bf Merge pull request #1401 from edx/adam/a11y-modal-management 
optimize keyboard focus management on dashboard's modals
 2013-10-22 11:17:10 -07:00
Brian Talbot
bd0522d5a4 Merge pull request #1450 from edx/talbs/lms-fix-passwordreset 
LMS: FIX - Resolves path to CSS assets on password reset views (resolves LMS-1357)
 2013-10-22 10:56:14 -07:00
Julia Hansbrough
8785889684 Merge pull request #1446 from edx/flowerhack/fix/legacyemailjs 
Fixed a bug where legacy instructor dash's email editor failed to load
 2013-10-22 10:48:07 -07:00
Julia Hansbrough
9123186050 Fixed indentation 2013-10-22 17:39:48 +00:00
Brian Talbot
c476614f21 LMS: adds correct css/style assets back to password reset and confirm views 2013-10-22 13:29:20 -04:00
Adam Palay
83b11a881c optimize keyboard focus management on dashboard's modals 
add license to a11y_tools.js

add tests, some reorganization of js tests

skip "toBeFocused" tests for now
 2013-10-22 13:26:18 -04:00
John Jarvis
c1c298618b Merge pull request #1449 from edx/jarv/gunicorn-version 
adding gunicorn to base requirements
 2013-10-22 09:52:26 -07:00
John Jarvis
c59ecc9068 Merge pull request #1433 from edx/jarv/static-root 
Jarv/static root
 2013-10-22 09:09:07 -07:00
John Jarvis
1ac732abb4 adding git.revision for cms 2013-10-22 12:08:48 -04:00
John Jarvis
4d21fa47d5 adding gunicorn to base requirements 2013-10-22 12:03:26 -04:00
cahrens
ca5d0e8973 Do need context_course variable for segment io. 2013-10-22 11:34:15 -04:00
cahrens
a6faa163f3 Convert checklists to new URL scheme. 2013-10-22 11:34:05 -04:00
Don Mitchell
9cbd231275 Merge pull request #1416 from edx/dhm/regex_courseid 
Parse locator url better
 2013-10-22 08:26:54 -07:00
Don Mitchell
8902a89fbc Have urls.py fully parse locator url 2013-10-22 10:44:03 -04:00
Julia Hansbrough
eb4081115d Fixed a bug where legacy instructor dash's email editor failed to load 2013-10-22 14:27:40 +00:00
Don Mitchell
6ba0208fee Don't mix versions in same object: 
VersionConflictError just has version as 2nd arg
Routines wanting to create an up-to-date locator shouldn't count on constructor to override version
 2013-10-22 10:25:15 -04:00
Don Mitchell
7bc697a1f9 Parse urls in one regex w/ more consistency 2013-10-22 10:25:14 -04:00
Don Mitchell
1db76191ac Merge pull request #1434 from edx/dhm/bug_has_access 
Use known translation if exists to get groupname
 2013-10-22 07:18:32 -07:00
Jason Bau
79ce043219 use bleach instead of lxml.html.clean for sanitize_html OEE 2013-10-21 21:03:30 -07:00
Jay Zoldak
33720a85bf Merge pull request #1405 from edx/zoldak/fix-acceptance-fill-check 
Add synchronization logic to fill, check, and select in acceptance tests.
 2013-10-21 14:43:11 -07:00
Don Mitchell
4f60a30afc Remove as_old_location methods 
They were incorrect if there were periods in the org or name.
 2013-10-21 17:17:20 -04:00
Jay Zoldak
ecea49ba2d Refactor wait_for methods in ui_helpers for acceptance tests. 2013-10-21 17:14:01 -04:00
Don Mitchell
7aae62230e Test that instructors can access courses 2013-10-21 17:06:00 -04:00
Jay Zoldak
a1bc5a1184 Add synchronization logic to fill, check, and select 2013-10-21 16:18:10 -04:00
David Baumgold
a16c567b61 Merge pull request #1431 from edx/db/password-reset-fix-static 
password reset pages use Django templates, not Mako
 2013-10-21 12:54:30 -07:00
Don Mitchell
1561ca917f Use known translation if exists to get groupname 2013-10-21 15:50:18 -04:00
David Baumgold
5c4c576506 Merge pull request #1432 from edx/dhm/changelist_update 
Add neglected entries
 2013-10-21 12:03:52 -07:00
Don Mitchell
0ea8a8f950 Add neglected entries 2013-10-21 14:59:54 -04:00
David Baumgold
3688f221e3 password reset pages use Django templates, not Mako 2013-10-21 14:52:41 -04:00
John Jarvis
8ca156bd00 adding STATIC_ROOT to cms 2013-10-21 14:41:00 -04:00
John Jarvis
42e1991953 adding STATIC_ROOT 2013-10-21 14:39:34 -04:00
David Baumgold
f7c979c219 Merge pull request #1428 from edx/db/release-email-no-pager 
Release email script: use --no-pager
 2013-10-21 11:13:37 -07:00
David Baumgold
ac47b18996 Release email script: use --no-pager 2013-10-21 13:45:31 -04:00
polesye
ffc613dc5d Merge pull request #1291 from edx/anton/fix-lti-custom-parameters 
LTI: Fix bugs related to custom parameters.
 2013-10-21 10:22:36 -07:00
Don Mitchell
379af19efa Merge pull request #1427 from edx/dhm/bug_contentstore 
Ignore collection config arg which other mongo connectors use.
 2013-10-21 09:19:17 -07:00
Don Mitchell
8dc9fa8861 Test providing a collection in doc_store_config to contentstore. 2013-10-21 12:15:51 -04:00
Don Mitchell
4b9a1431dd Ignore collection config arg which other mongo connectors use. 2013-10-21 12:11:35 -04:00
David Baumgold
6f42581457 Merge pull request #1392 from edx/db/attach-image_input_click-to-window 
Attach image_input_click function to window object
 2013-10-21 08:43:42 -07:00
Carlos Andrés Rocha
0be9daf9d5 Merge pull request #1419 from rocha/fix-config-root-env 
Fix error when reading tokens on aws configuration
 2013-10-21 08:24:15 -07:00