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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
50e05eb6a0 Merge pull request #3785 from mlkwaqas/waqas/lms2646-revert 
Revert "Handle the indexerror exception on create_order"
 2014-05-20 09:39:48 -04:00
Waqas Khalid
95636a9556 Revert "Handle the indexerror exception on create_order" 
It was merged by mistake during the code freeze.
 2014-05-20 18:33:54 +05:00
Waqas Khalid
d87fa2ce97 Merge pull request #3641 from mlkwaqas/waqas/lms2646-list-index-error 
Handle the indexerror exception on create_order
 2014-05-20 17:29:12 +05:00
polesye
67a20d6536 Fix message. 2014-05-20 14:15:01 +03:00
Waqas Khalid
33871e4515 Handle the indexerror exception on create_order 
LMS-2646
 2014-05-20 16:04:58 +05:00
zubair-arbi
807f8e9a9a fix cms subsection tests 
STUD-1624
 2014-05-20 13:42:51 +05:00
louyihua
f3371643ee i18n: Make translation works for video editor tabs 
Now the display_name & help strings in video editor tabs can be extracted and translated.
 2014-05-20 11:20:22 +08:00
Greg Price
299046a86f Add logging of search quality information 
For now, this only includes course id, search terms, and result count.
Information is logged both to the standard logger for near-term analysis
and the event tracker for the longer term. Result count logging requires
commit 02466b1 of cs_comments_service (otherwise it will be null).
 2014-05-19 17:37:26 -04:00
Jason Bau
411dc09af7 Autoactivate inactive users on external_auth login 
Conditional on existing flag BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH
 2014-05-19 13:35:35 -07:00
David Baumgold
61b28f560b remove broken docs link 2014-05-19 16:35:30 -04:00
Sarina Canelake
189f53bc71 Fix grades management commands 2014-05-19 16:11:45 -04:00
Alan Boudreault
db161543d8 Modified EMBARGO_SITE to SITE_EMBARGOED, improved logs 2014-05-19 15:53:45 -04:00
Calen Pennington
bd609be043 Add autodocs of modulestores 2014-05-19 15:48:52 -04:00
Calen Pennington
9ca09db469 Fix missing semicolon in annotation html 2014-05-19 15:34:29 -04:00
Alan Boudreault
25948e3694 Fix minor typo in a test 2014-05-19 15:12:02 -04:00
Alan Boudreault
ba6e61b907 Extended Embargo feature to support site access restriction and ip network 2014-05-19 15:12:02 -04:00
Mark Hoeber
a7139a84b6 Add stevedore requirements for RTD builds 2014-05-19 14:58:54 -04:00
Mark Hoeber
1e27f177da Adding opaque keys module to system path in doc configuration 
To make RTD work.
 2014-05-19 13:46:07 -04:00
Don Mitchell
5a62c83d05 Handle some records not having lower_id 2014-05-19 13:31:03 -04:00
Calen Pennington
30f2c9331d Merge pull request #3763 from cpennington/opaque-keys-merge-master 
Merge latest master into opaque-keys
 2014-05-19 13:10:55 -04:00
Christine Lytwynec
36f4e55e2b added check for modal to disappear in _change_lang_promise 2014-05-19 12:45:45 -04:00
Calen Pennington
a3b6ef8bae Rename variables to make type clearer 2014-05-19 10:58:38 -04:00
Han Su Kim
263cf647ad Added totals for different student tracks 
sorted the output, easier to read

Add is_active filter to only generate for students enrolled

Adding back total_enrollment

Removing active filter

Certs will generate for all users in the course, not just those "active"

Typo

Renaming headings to make more sense

Renaming variables to match headings
 2014-05-19 10:10:27 -04:00
Calen Pennington
4df122a92e Update annotations modules to use the course_id from the runtime, rather than extracting it from the page 2014-05-19 09:37:53 -04:00
Calen Pennington
2ce6719153 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master 2014-05-19 09:29:34 -04:00
Calen Pennington
8f72394e81 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/templates/widgets/header.html
 2014-05-19 09:20:08 -04:00
Will Daly
6c7ca7ae89 Merge pull request #3768 from edx/will/ora2-release-2014-05-19 
ORA2 release 2014-05-19
 2014-05-19 08:44:02 -04:00
Sarina Canelake
03496b5da1 Merge pull request #3771 from edx/sarina/051914-language-update 
Sarina/051914 language update
 2014-05-19 08:43:37 -04:00
Sarina Canelake
593f591847 Update translations (autogenerated message) 2014-05-19 08:35:08 -04:00
Sarina Canelake
5fd2eef58d Add Croatian language 2014-05-19 08:13:18 -04:00
Will Daly
8b3992bf4b ORA2 release 2014-05-19 2014-05-19 08:05:13 -04:00
Anton Stupak
b3fb545b10 Merge pull request #3716 from edx/anton/i18n-symbolic-response 
SymbolicResponse fix error message.
 2014-05-19 11:23:07 +03:00
polesye
934b8dbcf9 Add translators. 2014-05-19 09:00:54 +03:00
polesye
aedde3397e SymbolicResponse fix error message. 2014-05-19 09:00:09 +03:00
polesye
237fca067f CustomResponse: fix log message. 2014-05-19 08:58:31 +03:00
Nimisha Asthagiri
b3233f2932 Merge pull request #3619 from edx/markhoeber/documentatoin/online-help-system 
Online help system
 2014-05-16 22:02:23 -04:00
Nimisha Asthagiri
73275eeb82 Updated tests for online help 2014-05-16 21:27:57 -04:00
Mark Hoeber
27ff0db57b Added new context sensitive link and updated text 
Sock template changes
 2014-05-16 20:38:09 -04:00
Nimisha Asthagiri
84d8fcf1b5 Acceptance tests for online help. 2014-05-16 20:38:09 -04:00
Mark Hoeber
8fcbdaed03 Update of all templates 
Changed help button to link and removed drop-down items
 2014-05-16 20:38:09 -04:00
Nimisha Asthagiri
b7440a51e8 Dev support for context-sensitive help. 2014-05-16 20:37:32 -04:00
Carson Gee
3b25801881 Merge pull request #3615 from jazkarta/devstack-local-filestorage 
Use local storage instead of S3 for uploads in devstack.
 2014-05-16 17:10:05 -04:00
Don Mitchell
1c6a0f0a6c Merge pull request #3761 from edx/dhm/opaque-export 
Dhm/opaque export
 2014-05-16 16:40:06 -04:00
Chris Rossi
db8b33d04d Use path already created by ansible. 2014-05-16 16:37:39 -04:00
Chris Rossi
42e8e3068e Use local storage instead of S3 for uploads in devstack. 2014-05-16 16:37:39 -04:00
Sarina Canelake
4a842131d6 Merge pull request #3760 from edx/sarina/fix-split-test-child-id 
Sarina/fix split test child
 2014-05-16 16:12:53 -04:00
Sarina Canelake
afac5145e3 Merge pull request #3757 from edx/sarina/fix-git_import 
Sarina/fix git import
 2014-05-16 16:12:33 -04:00
Calen Pennington
ba7abf4291 Fix test_import_export.py 2014-05-16 15:41:14 -04:00
Calen Pennington
dd6609fa2c Fix dashboard data tests 2014-05-16 15:38:59 -04:00
Don Mitchell
d636c56af2 xml export of drafts was exporting everything 
now only exports the drafts into the draft subdir
STUD-1627
 2014-05-16 15:29:25 -04:00