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

24590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alison Hodges
5afd2eff55 Merge pull request #4578 from edx/ahodges/documentation/DOC754 
Careful identification of "dashboards"
 2014-07-29 15:46:19 -04:00
David Baumgold
919e530321 Merge pull request #4293 from juananpe/getinputfocusonlogin 
set keyboard input focus to the e-mail field on the login screen
 2014-07-29 14:55:59 -04:00
jmclaus
6fd085e31b Merge pull request #4528 from edx/jmclaus/edit-group-configurations-usage 
BLD-1104: List units that use group configuration.
 2014-07-29 17:41:29 +02:00
jmclaus
69ee9d92d6 BLD-1104: List units that use group configuration. 2014-07-29 16:16:31 +02:00
Mark Hoeber
df71afd4c0 Merge pull request #4507 from dmin7b5/patch-1 
Update install_prodstack.rst
 2014-07-29 09:52:20 -04:00
Anton Stupak
54d60fc1b1 Merge pull request #4555 from edx/anton/remove-experiments-from-advanced-settings 
Remove user_partitions from advanced settings
 2014-07-29 09:03:45 +03:00
juananpe
21c0bf2550 Update AUTHORS 2014-07-29 00:32:22 +02:00
Juanan Pereira
cb2aaf8d8c set keyboard input focus to the e-mail field on the login screen 2014-07-29 00:31:26 +02:00
Mathew Peterson
df14d8e49d Merge pull request #4513 from edx/split/auto_publish 
Split/auto publish
 2014-07-28 17:31:49 -04:00
Sarina Canelake
fa50aa2e70 Merge pull request #4588 from edx/sarina/fix-legacy-cohorts 
Fix call to cohorts
 2014-07-28 17:28:31 -04:00
dmin7b5
26a766245b Update install_prodstack.rst 
After installing Fullstack via Vagrant, the user needs to know the credentials to login to edX
 2014-07-28 16:08:32 -05:00
Mathew Peterson
9a039e93ec Adding auto_publishing to split_draft 
Added update_item, create_item, create_child to split_draft.py

Cleaned up TODOs in test_mixed_modulestore.py

Unit test for auto-publish

LMS-11017

Added tests to test_mixed_modulestore.py for has_changes and added black_list to _auto_publish

Moved DIRECT_ONLY_CATEGORIES to draft_and_publish.py

Deleted test_split_draft_modulestore.py

Added _auto_publish to create course

Publish cleanups for update_version, source_version

Changed has_changes to use source_version

Removing mixed test that no longer makes sense in auto_publish world

Addressed TODOs in test_branch_setting
 2014-07-28 20:49:30 +00:00
Renzo Lucioni
b22a824948 Merge pull request #4584 from edx/renzo/edit-authors 
Update email address
 2014-07-28 16:42:29 -04:00
Sarina Canelake
eafa6b2227 Fix call to cohorts 2014-07-28 16:19:57 -04:00
Ned Batchelder
7f9839b990 Merge pull request #4492 from edx/ned/poweredby-logos-on-cdn 
Use the CDN-friendly URLs for the Powered-By logos
 2014-07-28 15:33:41 -04:00
polesye
c5c3913783 BLD-1091: Hide user_partitions from Advanced settings. 2014-07-28 22:07:57 +03:00
Renzo Lucioni
9de2f3819d Update email address 2014-07-28 15:04:03 -04:00
Julia Hansbrough
4353e1e48f Merge pull request #4577 from edx/sarina/072814-language-update 
Update translations (autogenerated message)
 2014-07-28 13:13:25 -04:00
Will Daly
144b2578ab Merge pull request #4579 from edx/will/ora2-release-2014-07-28T12.09 
ORA2 release-2014-07-28T12.09
 2014-07-28 13:03:43 -04:00
Usman Khalid
b594bd480a Merge pull request #4427 from edx/usman/lms6507-mako-dir 
Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates.
 2014-07-28 21:52:20 +05:00
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
Will Daly
5dc884bdb9 ORA2 release-2014-07-28T12.09 2014-07-28 11:56:35 -04:00
Alison Hodges
e79b8bb2a3 Careful identification of "dashboards" 2014-07-28 11:17:31 -04:00
Renzo Lucioni
8bd84b5f3a Overhaul Segment.io integration 2014-07-28 11:08:02 -04:00
Sarina Canelake
79d3f798f3 Update translations (autogenerated message) 2014-07-28 10:29:32 -04:00
Ned Batchelder
41ed2db720 Use the CDN-friendly URLs for the Powered-By logos 2014-07-28 10:20:22 -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