Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
24,365 Commits 1 Branch 0 Tags
2c83dc3f09b49d740407daaffe05ab8fd549ed8a
Commit Graph

8693 Commits

Author SHA1 Message Date
Greg Price
8c8367b055 Merge pull request #3183 from edx/gprice/inline-response-pagination 
Add repsonse pagination to inline discussions
 2014-04-09 17:55:15 -04:00
Greg Price
16847d85a9 Add bok-choy tests for inline response pagination 2014-04-09 16:56:20 -04:00
Carson Gee
13af6fc1ee Refactored terminology and added loop break for optimization 2014-04-09 14:10:52 -04:00
Carson Gee
4844a50405 Add test in import code to make sure two overlapping courses aren't imported 2014-04-09 12:54:12 -04:00
Anton Stupak
a84bca233f Merge pull request #3246 from edx/anton/i18n-lti 
LTI i18n
 2014-04-09 17:59:27 +03:00
Andy Armstrong
88d95d119c Rebuild the way modals are constructed to support nesting. 2014-04-09 10:32:13 -04:00
Andy Armstrong
b779b8a6fb Add unit tests for custom tabs and modal titles 2014-04-09 10:32:13 -04:00
Andy Armstrong
5ab159b079 Try to fix the failing JavaScript test 2014-04-09 10:32:12 -04:00
Frances Botsford
e18dd7f50a fixed mixin sass 2014-04-09 10:32:12 -04:00
Frances Botsford
636fa19033 small ui fixes in Studio - textbooks upload and loading font-size 2014-04-09 10:32:11 -04:00
Andy Armstrong
7770d9d427 Implement editing from the Studio container page. 
STUD-1306
 2014-04-09 10:32:11 -04:00
Valera Rozuvan
fc84fd75cf Merge pull request #3273 from edx/valera/hendrixx 
Tweaking automatic screenshots in acceptance tests.
 2014-04-09 14:34:00 +03:00
polesye
c0110c2ba6 Removed unused helpers. 2014-04-09 12:16:22 +03:00
polesye
192af7a8e0 Update docstrings. 2014-04-09 12:16:22 +03:00
polesye
f454e10e71 Add fixes. 2014-04-09 12:16:22 +03:00
polesye
f0492b3bb1 Refactor speed control. 2014-04-09 12:16:22 +03:00
polesye
31e9152936 BLD-753: Add i18n for LTI. 2014-04-09 12:12:52 +03:00
Valera Rozuvan
b2543bfa95 Tweaking automatic screenshots in acceptance tests. 2014-04-09 11:37:32 +03:00
Oleg Marshev
c515b9cb38 Remove params from list. 2014-04-09 11:35:59 +03:00
Sarina Canelake
2d08b3a394 Fix i18n'd strings to be easier for translators to understand 
Signup modal

Just translate discussion sr text

Markdown editor help

Help modal and reverify dash
 2014-04-08 13:09:07 -04:00
Chris Dodge
a904fa09bd Revert "updated pdf viewer" 
This reverts commit b0a7443570.
 2014-04-08 12:59:04 -04:00
Diana Huang
9c0ec682af Merge pull request #3256 from edx/diana/fix-grading-service-login 
Return correct response when using _try_with_login
 2014-04-08 12:02:40 -04:00
Diana Huang
ef3a2b8545 Use the correct response when using login. 2014-04-08 11:18:55 -04:00
Sarina Canelake
f617047f28 Explicitly declare tags in dog stats increment calls 2014-04-08 10:38:14 -04:00
Will Daly
ffeb2f22bc Merge pull request #3242 from edx/will/studio-import-private-fix 
Allow import of native XBlocks in draft
 2014-04-08 10:02:31 -04:00
Oleg Marshev
015bd57d02 Remove double quoting. 2014-04-08 15:21:31 +03:00
Will Daly
08413afdfd Allow import of native XBlocks in draft 
Added tests for importing a pure XBlock
 2014-04-08 07:52:11 -04:00
Oleg Marshev
8a2024241e Add context_id. 2014-04-08 14:09:52 +03:00
Oleg Marshev
882a1e0f29 Change resource_link_id on import (BLD-768). 
LTI: Update resource_link_id to change on import to another system or context (BLD-768).
 2014-04-08 13:03:22 +03:00
Valera Rozuvan
668c476acb Add auto screenshot functionality. 2014-04-08 10:41:39 +03:00
Will Daly
5b305476a3 Merge pull request #3225 from edx/will/studio-import-xblock-fixes 
Explicitly re-save XBlock fields during import
 2014-04-07 15:23:53 -04:00
Graham Lowe
5e0849d214 Temporarily disable CAPA problem "Check" button. 
- update appropriate jasmine tests so that stubbed $postWithPrefix
respects a subset of jQuery promise API.
- add customization for checking state.
- display checking state while button is disabled.
- ensure checking state lasts for at least a second.
 2014-04-07 13:17:43 -04:00
Greg Price
a77968660f Merge pull request #3228 from edx/gprice/FOR-542 
Change behavior of cohort addition interface
 2014-04-07 12:54:38 -04:00
Will Daly
38f819d181 Explicitly re-save XBlock fields during import 2014-04-07 11:49:27 -04:00
Greg Price
707ee5f2c7 Change behavior of cohort addition interface 
Instead of noting users that are already in a cohort and not changing
such users, clobber the previous cohort and display a message indicating
the previous cohort membership.

JIRA: FOR-452
 2014-04-07 11:40:51 -04:00
Dave St.Germain
ad186e236e Merge pull request #2986 from edx/dcs/a11y-pdfreader 
Accessible PDF textbook viewer
 2014-04-07 10:32:28 -04:00
Waheed Ahmed
c0b50c7f62 Change user.is_authenticated to user.is_authenticated() in roles.py. 
LMS-2442
 2014-04-07 12:20:20 +05:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements 
Add some optional policies around password resets, such as password reus...
 2014-04-04 16:14:43 -04:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
polesye
d55554705f BLD-958: Force video player in flash mode. 2014-04-04 14:53:14 +03:00
Anton Stupak
ec6388b87d Merge pull request #3153 from edx/anton/caption_refactor 
Refactor video caption module.
 2014-04-04 13:03:02 +03:00
Julia Hansbrough
dd7bae432d Merge pull request #3164 from edx/flowerhack/better-xmodule-metrics 
XModule datadog metrics
 2014-04-03 16:04:06 -04:00
Julia Hansbrough
aa41635f79 XModule datadog metrics 2014-04-03 18:31:44 +00:00
David Baumgold
63c58bb26d Merge pull request #3189 from edx/db/upgrade-pyparsing 
Upgrade pyparsing to 2.0.1
 2014-04-03 13:02:54 -04:00
Stephen Sanchez
751bd71a7b Merge remote-tracking branch 'origin/release' 2014-04-03 11:06:09 -04:00
Jay Zoldak
b0859941e6 Merge pull request #3181 from edx/zoldak/fix-acid 
Add synchronization for rendering to studio xblock tests
 2014-04-03 09:24:09 -04:00
polesye
2f572a86ea Refactor video caption module. 2014-04-03 15:40:59 +03:00
Alexander Kryklia
668134de4a Merge pull request #3169 from edx/alex/fix_more_flaky_tests 
Alex/fix more flaky tests
 2014-04-03 15:34:18 +03:00
Alexander Kryklia
41695def9e Merge pull request #3136 from edx/alex/display_native_language_2 
Alex/display native language 2
 2014-04-03 15:06:04 +03:00
Alexander Kryklia
cf3e2c860b Fix flaky video tests: speed up youtube api loading and wait for controls. 2014-04-03 14:37:17 +03:00