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

18943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03: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
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
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
Will Daly
bd812a62b7 Merge pull request #1422 from edx/will/fix-nav-tests 
Fixed navigation acceptance test
 2013-10-21 08:21:06 -07:00
David Baumgold
c7dcb0bb57 Attach image_input_click function to window object 
So other parts of the page can access it
 2013-10-21 11:03:44 -04:00
Calen Pennington
405d42cde3 Merge pull request #1423 from cpennington/fix-lms-cms-dev 
Fix `rake lms[cms.dev]`
 2013-10-21 07:58:09 -07:00
e0d
a5715bf243 Merge pull request #1425 from edx/e0d/remove-default 
The default value was removed from common.
 2013-10-21 07:57:38 -07:00
David Baumgold
d654d92ab4 Merge pull request #1424 from edx/christina/changelog 
Christina/changelog
 2013-10-21 07:53:20 -07:00
polesye
fa23543682 Merge pull request #1418 from edx/anton/restore-cc-button-mouseover 
Added back on hover CC button functionality.
 2013-10-21 07:47:55 -07:00
e0d
e6955c641f The default value was removed from common. 2013-10-21 10:45:05 -04:00
cahrens
0536108187 Update for Studio bug fix, missing text in Course Updates. 
STUD-590
 2013-10-21 10:36:46 -04:00
David Baumgold
68f6aa8c98 Merge pull request #1404 from edx/db/requirejs-configure-mathjax 
Configure MathJax using require.js
 2013-10-21 07:33:08 -07:00
Will Daly
854a564a73 Fixed navigation acceptance test 
Disable jquery animations to fix LMS navigation acceptance test.
 2013-10-21 10:31:27 -04:00
e0d
fb62f0c52a Merge pull request #1417 from edx/e0d/config-fix 
E0d/config fix
 2013-10-21 07:29:52 -07:00
David Baumgold
613f2d8907 Merge pull request #1415 from edx/db/gemfile-lock 
Commiting Gemfile.lock to the repository
 2013-10-21 07:24:55 -07:00
e0d
5adf524ad6 removing redundant default. 2013-10-21 09:55:27 -04:00