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

24565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Usman Khalid
c770f6e753 Merge pull request #4556 from edx/usman/lms11146-download-csv-of-responses 
In legacy dashboard changed make_usage_key() to make_usage_key_from_deprecated_string()
 2014-07-28 21:46:35 +05:00
Renzo Lucioni
252038c376 Merge pull request #4545 from edx/renzo/bi-analytics-overhaul 
Overhaul Segment.io integration
 2014-07-28 11:59:58 -04:00
Renzo Lucioni
8bd84b5f3a Overhaul Segment.io integration 2014-07-28 11:08:02 -04:00
Ned Batchelder
7caf8c53b1 Merge pull request #4080 from Course-Master/redirect 
decode uri component before redirect for safe redirect
 2014-07-28 10:14:45 -04:00
Don Mitchell
ff696a2f2a Merge pull request #4440 from edx/bug/import 
Bug/import
 2014-07-28 09:44:15 -04:00
Ben Patterson
1bd6c71112 Merge pull request #4571 from edx/benp/acc-env-settings 
Simplify acceptance test env pipeline handler settings.
 2014-07-28 09:31:20 -04:00
Ben Patterson
4f34029b43 Simplify acceptance test env settings for pipeline handlers. 
It will now inherit from common settings.
 2014-07-28 07:53:49 -04:00
Usman Khalid
e0d6ee705b In legacy dashboard changed make_usage_key() to make_usage_key_from_deprecated_string(). 
LMS-11146
 2014-07-28 16:26:26 +05:00
Ben McMorran
bf8183f61e Merge pull request #4544 from edx/benmcmorran/fixes-from-bulk-publishing 
Return edit info from update_item and refactor item.py to use usage_key_with_run
 2014-07-26 17:02:31 -04:00
jmclaus
8a5bb72984 Merge pull request #4563 from Stanford-Online/stv/jsinput/cdata 
Wrap JSInput Python code in CDATA section
 2014-07-25 23:56:52 +02:00
Ben McMorran
66301fcfe2 Refactor to use usage_key_with_run in item.py 2014-07-25 15:24:11 -04:00
cahrens
9143861364 Add edit info to instantiated xblock in update_item 2014-07-25 15:24:00 -04:00
Calen Pennington
48645020d1 Merge pull request #4392 from louyihua/lms-window-origin 
Add defininition of window.location.origin in both studio and LMS
 2014-07-25 14:27:27 -04:00
stv
0aba4f7ec6 Wrap JSInput Python code in CDATA section 
Python code can commonly contain characters that are invalid XML, such
as '<' and '>'. This has proven to be a pain point for instructors
implementing custom Python grading functions for their JSInput problems
(see sample code below).

This change creates a more robust template from which to make
modifications.

```python
    # This is an XML syntax error, when not inside a CDATA section.
    if i < 0:
        print('negative')
```
 2014-07-25 12:11:33 -04:00
Jay Zoldak
fced72e4fc Merge pull request #4557 from edx/zoldak/remove-action-chains 
Use clear and send_keys instead of action chains in page object methods
 2014-07-25 11:44:27 -04:00
Ben McMorran
79945533e9 Merge pull request #4548 from edx/benmcmorran/refactor-studio-tests 
Refactor studio tests to use StudioCourseTest
 2014-07-25 11:15:38 -04:00
John Jarvis
9016aa9854 Merge pull request #4558 from edx/jarv/remove-syslog-addr 
removing syslog_addr
 2014-07-25 11:00:59 -04:00
John Jarvis
5b686f9bdf removing syslog_addr 
This is not currently being used in production and will not
be used moving forward since logs are remoted using splunk
 2014-07-25 10:43:58 -04:00
Jay Zoldak
f166ddb4bc Merge pull request #4552 from edx/zoldak/studio-container-page 
Improve is_browser_on_page method for Studio Container page
 2014-07-25 10:34:45 -04:00
Jay Zoldak
cac47598fb Use clear and send_keys instead of action chains in page object methods 2014-07-25 09:37:14 -04:00
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
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