John Jarvis
ff8c14e88d
Only display active users for the certificate report
...
Also removes the unnecessary pre-fetch.
For certificate generations we will continue to generate certs for
both active and inactive users.
For the report we only display active users since it was confusing
due to the instructor dashboard only displaying active users.
2014-04-08 13:30:53 -04:00
David Baumgold
b18a06751c
Merge pull request #3238 from marcore/master
...
The link to TECH_SUPPORT_EMAIL should have a mailto: protocol !
2014-04-08 13:05:29 -04:00
Anton Stupak
ac49101eb3
Merge pull request #3252 from edx/anton/disable-flaky-acceptance-tests
...
Video: Disable flaky acceptance tests.
2014-04-08 18:21:41 +03:00
Valera Rozuvan
acff3cbe73
Update testing.md file.
...
Added information on output folder for auto screenshots.
2014-04-08 17:46:04 +03:00
Valera Rozuvan
e7a2349cdc
Update testing.md file.
...
How to better debug acceptance tests in local Vagrant dev.
2014-04-08 17:32:04 +03:00
polesye
6c72cce59e
Disable flaky acceptance tests.
2014-04-08 17:23:35 +03:00
Stephen Sanchez
7e8d92069f
Merge pull request #3248 from edx/sanchez/ora2-2014-04-08
...
Updating ORA2 requirements for patch fix
2014-04-08 10:10:41 -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
Stephen Sanchez
3f184082f5
Updating ORA2 requirements for patch fix
2014-04-08 09:29:09 -04:00
Anton Stupak
f2dd6eac24
Merge pull request #3247 from edx/anton/disable-flaky-video-test
...
Disable flaky acceptance test.
2014-04-08 16:20:25 +03:00
Oleg Marshev
cd83906344
Merge pull request #3245 from edx/oleg/fix-doublequoting
...
Fix doublequoting. BLD-812.
2014-04-08 15:57:51 +03:00
polesye
a9b26afd7b
Disable flaky test.
2014-04-08 15:40:32 +03:00
Oleg Marshev
015bd57d02
Remove double quoting.
2014-04-08 15:21:31 +03:00
Oleg Marshev
d66e6cbcb7
Merge pull request #3052 from edx/oleg/add-context-id
...
LTI context_id. BLD-584.
2014-04-08 14:59:19 +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
Alexander Kryklia
be4e9cb576
Merge pull request #3040 from edx/oleg/fix-resource-link-id
...
LTI resource_link_id. BLD-768.
2014-04-08 13:54:45 +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
marcore
cc7b13a811
Add my name!
2014-04-08 10:21:35 +02:00
Valera Rozuvan
28f366a94e
Merge pull request #3173 from edx/valera/emerald_bay
...
Adding ability to capture auto screenshots on demand
2014-04-08 10:46:12 +03:00
Valera Rozuvan
668c476acb
Add auto screenshot functionality.
2014-04-08 10:41:39 +03:00
Alison Hodges
05d02e5a55
Merge pull request #3188 from edx/ahodges/documentation/UTF8
...
Ahodges/documentation/utf8
2014-04-07 16:09:43 -04:00
Alison Hodges
92de6dddae
DOC-117, Jennifer Akana's review comments
2014-04-07 16:09:04 -04: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
Sarina Canelake
c51d418163
Merge pull request #3235 from edx/sarina/040714-language-update
...
Sarina/040714 language update
2014-04-07 14:44:41 -04:00
Dave St.Germain
25f722d35d
Merge pull request #3212 from edx/dcs/log-codejail
...
This should enable logging of codejail on prod
2014-04-07 14:14:02 -04:00
Stephen Sanchez
64dd8d8005
Merge pull request #3236 from edx/sanchez/ora2-2014-04-07
...
Updating the release with a tagged hash
2014-04-07 13:43:48 -04:00
Sarina Canelake
42728d6826
Update translations (autogenerated message)
2014-04-07 13:19:25 -04:00
Sarina Canelake
d7f499f276
Don't pull unreviewed languages from Transifex
2014-04-07 13:19:25 -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
marcore
8c2f3fd744
The link to TECH_SUPPORT_EMAIL should have a mailto: protocol !
2014-04-07 18:26:09 +02: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
Stephen Sanchez
af17ae9f6a
Updating the release with a tagged hash
2014-04-07 11:38:21 -04:00
Stephen Sanchez
862828dbbe
Merge pull request #3233 from edx/sanchez/update-ora2
...
Updating the ORA2 hash for release week 2014-04-07
2014-04-07 11:20:21 -04:00
Anton Stupak
1b28b6a7a7
Merge pull request #3215 from edx/anton/fix-test-video-position
...
Video: Fix flaky test.
2014-04-07 18:02:52 +03: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
polesye
6a207714a3
BLD-970: Fix flaky test.
2014-04-07 17:03:40 +03:00
Stephen Sanchez
6c43f279d4
Updating the ORA2 hash for release week 2014-04-07
2014-04-07 09:57:55 -04:00
Waheed Ahmed
059c5ce840
Merge pull request #3065 from edx/waheed/lms2442-fix-is_authenticated-in-roles
...
Change user.is_authenticated to user.is_authenticated() in roles.py.
2014-04-07 13:05:31 +05: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
Christina Roberts
c73ac2af62
Merge pull request #3208 from edx/christina/container-reorder
...
Move overview drag and drop code to a utility class.
2014-04-06 13:41:14 -04:00
Jay Zoldak
d45cd90df1
Merge pull request #3218 from edx/zoldak/bok-choy-contentstore
...
Fix the pointer to the contentstore in the bok-choy settings
2014-04-05 20:21:58 -04:00
cahrens
aade444f00
Move overview drag and drop code to a utility class.
2014-04-05 17:03:18 -04:00
srpearce
2f16bbe184
Merge pull request #3226 from edx/sylvia/documentation/DOC-269
...
Updates to ORA2 documentation
2014-04-04 17:04:35 -04:00
Alison Hodges
f75561ab00
Merge pull request #3221 from edx/ahodges/documentation/excel
...
AN-836: draft info about spreadsheets and UTF8, illustrations
2014-04-04 16:53:03 -04:00
Alison Hodges
1580ee6e8b
AN-836: draft info about spreadsheets and UTF8, illustrations
2014-04-04 16:52:11 -04:00
Sylvia Pearce
b02d609eeb
Updates to ORA2 documentation
2014-04-04 16:49:18 -04:00
Alison Hodges
e1887d81ce
Merge pull request #3223 from edx/ahodges/documentation/spacing
...
Stray space made html file formatting incorrect
2014-04-04 16:18:52 -04: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