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

28200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nimisha Asthagiri
c930e17fe1 Merge pull request #4534 from edx/nimisha/import-perf-unit-test-STUD-1994 
Unit test for import performance STUD-1994
 2014-07-25 09:37:06 -04:00
Don Mitchell
e897b46151 On import, don't move the course into the course_dir but just 
do the import from wherever it unpacked.
Avoids an exception where the top-level dir had a subdir of same name
as one being moved, but also just makes it faster.
 2014-07-25 09:35:47 -04:00
Jay Zoldak
d0aaa37a70 Fix is_browser_on_page method for Studio Container page 2014-07-25 08:57:50 -04:00
Ben McMorran
b30222c00f Refactor studio tests to use StudioCourseTest 2014-07-25 08:40:40 -04:00
Anurag Ramdasan
01cf702a61 Merge pull request #1 from edx/ned/add-test-to-4080 
Ned/add test to 4080
 2014-07-24 16:14:15 -07:00
Ned Batchelder
fec283366f Fix the decoding of ?next= 2014-07-24 16:11:43 -07:00
Ned Batchelder
dea5c7d3db Add a test of login with params on the next URL 2014-07-24 16:11:33 -07:00
Ned Batchelder
533e072677 A debug view for seeing the URL params 2014-07-24 16:11:20 -07:00
Ned Batchelder
412e6d3499 Add a more informative assert to a lettuce helper 2014-07-24 16:11:11 -07:00
Ned Batchelder
d9bb2868e8 Add a view that can show us what URL params we got 2014-07-24 16:10:56 -07:00
Anurag Ramdasan
f77c06ff1f check if next is not defined 2014-07-24 16:10:44 -07:00
Anurag Ramdasan
c4fa475c7a add var declaration for next 2014-07-24 16:10:36 -07:00
Anurag Ramdasan
4df0efa250 decode uri component before redirect for safe redirect 2014-07-24 16:10:01 -07:00
Nimisha Asthagiri
cd33165a52 Unit test for import performance STUD-1994 2014-07-24 16:34:26 -04:00
Calen Pennington
f6b278e7f8 Merge pull request #4537 from cpennington/new-locator-key-prefixes 
Use a version of opaque keys that identifies version numbers in the key prefixes
 2014-07-24 15:55:33 -04:00
Tim Babych
b2139ece80 Merge pull request #4543 from edx/tim/test_export_all_courses-was-flaky 
Make test_export_all_courses not flaky
 2014-07-24 22:14:30 +03:00
Christina Roberts
fa1f4f2be7 Merge pull request #4474 from Stanford-Online/sjang92/null_tabname_bugfix 
Bugfix: New Tab name being initialized as null
 2014-07-24 14:50:00 -04:00
Jay Zoldak
c015e7d4b6 Merge pull request #4546 from edx/zoldak/disable-test 
Disable failing test STUD-2003
 2014-07-24 14:13:31 -04:00
Jay Zoldak
a536c344f2 Disable failing test STUD-2003 2014-07-24 13:58:05 -04:00
Tim Babych
51a8dc2326 Make test_export_all_courses do not rely on the order in which files are returned by os.walk(). 2014-07-24 19:22:26 +03:00
Jay Zoldak
bff7c58930 Merge pull request #4465 from edx/zoldak/fix-studio-clicks 
Improve clicking and synchronization in Studio bok-choy tests
 2014-07-24 10:04:07 -04:00
Calen Pennington
3f47fe4a61 Use a version of opaque keys that identifies version numbers in the key prefixes 2014-07-24 09:32:06 -04:00
Sarina Canelake
0d33203526 Merge pull request #4533 from Stanford-Online/kluo/i18n-support-theme 
Add support for theme translations and LANGUAGE_DICT override
 2014-07-24 08:59:26 -04:00
Sarina Canelake
8b3d9da40d Merge pull request #4209 from msegado/showanswer-correct-or-past-due 
Add "Correct or Past Due" option for showanswer
 2014-07-24 08:57:54 -04:00
Jay Zoldak
c21dbe4cd2 Improvements to clicking and synchronization in Studio bok-choy tests. 2014-07-24 08:55:34 -04:00
Kevin Luo
9b3b2e72a2 Add support for theme translations and LANGUAGE_DICT override 2014-07-24 04:39:38 -07:00
Oleg Marshev
84be560ceb Log CDN request timeout with level INFO. 2014-07-24 11:02:46 +03:00
Anton Stupak
4bd3093ea7 Merge pull request #4480 from edx/anton/create-edit-delete-groups 
Group Configuration: create, edit, delete groups
 2014-07-24 10:37:24 +03:00
Martin Segado
42ae57208b Add Martin Segado to authors file 2014-07-24 02:44:03 -04:00
Martin Segado
bbeb79cbe7 Add correct_or_past_due option for showanswer and update relevant documentation 2014-07-24 02:44:03 -04:00
polesye
fda3f5ac04 BLD-1110: Create, edit, delete groups. 2014-07-24 08:30:21 +03:00
Nimisha Asthagiri
602be5e97f Merge pull request #4532 from edx/split/branch-settings 
Split/branch settings LMS-11056
 2014-07-23 23:18:57 -04:00
Diana Huang
167e2b675b Split branch settings code review fixes LMS-11056 2014-07-23 21:59:33 -04:00
Se Won Jang
2c3aebf91f Bugfix: Initialize new tabname to "Empty" 
In Studio, when the course administrator creates a new tab, its name was being
initialized as null in the mongo database. This caused students in LMS to get a
server error when trying to access the course page, since LMS was trying to
process the null tabname for translation, etc. Now tabname is initialized as
'Empty', which is how it was being done in the frontend.

STUD-2000
 2014-07-23 18:32:59 -07:00
Nimisha Asthagiri
1dc6ea39f3 Split branch settings LMS-11056 2014-07-23 20:36:15 -04:00
Nimisha Asthagiri
2c01984b05 Merge pull request #4494 from edx/nimisha/request-cache-for-branch-settings 
Make overriding branch settings thread-safe LMS-11125
 2014-07-23 20:05:46 -04:00
Nimisha Asthagiri
3eecc9639a Make overriding branch settings thread-safe LMS-11125 2014-07-23 17:41:08 -04:00
srpearce
9b8c47ab4e Merge pull request #4531 from edx/sylvia/docs/relnotes_7_23 
Release notes for 7-23-2014
 2014-07-23 14:46:29 -04:00
Sylvia Pearce
79fb5c61f7 Release notes for 7-23-2014 2014-07-23 12:56:55 -04:00
Christina Roberts
aab561b269 Merge pull request #4491 from edx/christina/export-split 
Getting draft split_test_module instances to import/export.
 2014-07-23 12:20:57 -04:00
Mark Hoeber
e6f3ba6b9b Merge pull request #4529 from edx/markhoeber-documentation-doc420 
Added text about grade ranges and certificates
 2014-07-23 11:40:43 -04:00
Mark Hoeber
cecbbff64d Added text about grade ranges and certificates 2014-07-23 11:40:11 -04:00
cahrens
77702fae09 Getting draft split_test_module instances to import/export. 
STUD-327
 2014-07-23 11:27:23 -04:00
Chris Terman
d3149f66aa add initial_state attribute to jsinput tag 2014-07-23 09:21:42 -04:00
doctoryes
8f4ce392f3 Merge pull request #4521 from edx/jeskew/update_authors 
Jeskew/update authors
 2014-07-22 15:43:21 -04:00
doctoryes
1b77459aa3 Add myself to AUTHORS. 2014-07-22 15:39:08 -04:00
Alison Hodges
44eb9bb447 Merge pull request #4400 from edx/ahodges/documentation/DOC591 
Adds sample student communications (email msgs)
 2014-07-22 12:39:59 -04:00
Alison Hodges
7a02f16fe1 Adds sample student communications (email msgs) 2014-07-22 12:38:38 -04:00
Sarina Canelake
644e18e200 Merge pull request #4511 from edx/sarina/fix-i18n 
Fix small i18n typos
 2014-07-22 09:40:36 -04:00
Sarina Canelake
91196573e6 Fix small i18n typos 2014-07-22 09:38:32 -04:00