Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

17975 Commits

Author SHA1 Message Date
Calen Pennington
ba59e3b8a5 fixup! Serial number commands deserialize course keys 2014-05-22 09:06:13 -04:00
Nimisha Asthagiri
0631c6358c Merge pull request #3821 from edx/ok-permissions-asserts 
Added asserts to ensure course_ids are course key objects.
 2014-05-22 08:47:01 -04:00
Waheed Ahmed
b6a90e0bfa Fixed register button on edge homepage. 
LMS-2719
 2014-05-22 12:09:23 +05:00
Calen Pennington
4b69cf5472 Merge pull request #3810 from cpennington/ok-management-commands 
Fix management commands
 2014-05-21 21:53:43 -04:00
Calen Pennington
942c2eab30 Merge pull request #3815 from cpennington/ok-certificaties 
Fix certificate requests
 2014-05-21 21:52:54 -04:00
Sarina Canelake
4723467345 Validate forms to allow old and new style course key serialization syntax 2014-05-21 17:44:50 -04:00
Nimisha Asthagiri
d43386a0c6 Added asserts to ensure course_ids are course key objects. 2014-05-21 17:20:56 -04:00
Don Mitchell
30184dbd68 Serial number commands deserialize course keys 2014-05-21 16:58:04 -04:00
Calen Pennington
1f9c7b2ed4 Merge pull request #3809 from cpennington/ok-dead-code 
Remove dead code
 2014-05-21 16:21:17 -04:00
Calen Pennington
4c3c8a9a2e Fix certificate requests 2014-05-21 16:10:16 -04:00
Calen Pennington
150b5cd298 Merge pull request #3816 from cpennington/ok-psychometrics 
Fix PsychometricData query
 2014-05-21 16:09:46 -04:00
Andy Armstrong
541d20ef83 Allow creation of components on container page 
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.

Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
 2014-05-21 15:40:31 -04:00
Julia Hansbrough
5752312bbb Merge pull request #2776 from aboudreault/embargo-restrict-additions 
Extended Embargo feature to support site access restriction and ip network
 2014-05-21 15:24:07 -04:00
Calen Pennington
d52c58c77b Fix PsychometricData query 2014-05-21 14:48:25 -04:00
Calen Pennington
1f849e441d Fix management commands 2014-05-21 14:36:41 -04:00
Calen Pennington
4af2249a9d Remove dead code 2014-05-21 14:28:04 -04:00
Han Su Kim
c8ce4a54d6 Merge pull request #3621 from edx/han/cert-report 
Added totals for different student tracks
 2014-05-21 12:08:00 -04:00
Calen Pennington
4df73548bf Merge pull request #3788 from cpennington/allow-cross-course-references 
Allow cross course references in the LMS
 2014-05-21 11:06:01 -04:00
Don Mitchell
c085578383 Fix student progress @sarina bug 2014-05-20 18:08:33 -04:00
David Baumgold
6e0e13003f Merge pull request #3744 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool [Fix]
 2014-05-20 15:34:34 -04:00
lduarte1991
0d8a4797f1 extend changes of url/raw issue to video annotions 2014-05-20 14:40:40 -04:00
David Baumgold
75ff35e208 proxy raw further along 2014-05-20 14:01:55 -04:00
Don Mitchell
3ab925a178 Merge pull request #3787 from edx/dhm/bug_mktg_url 
marketing url too many slashes
 2014-05-20 13:56:16 -04:00
Don Mitchell
115f5b2cd1 Merge pull request #3791 from edx/dhm/bug_open_ended_notifications 
Dhm/bug open ended notifications
 2014-05-20 13:39:27 -04:00
David Baumgold
8080261aa7 generate raw URLs that are not rewritten by static_replace 2014-05-20 13:27:47 -04:00
jmclaus
678a92b4b2 Added new error message that displays when HTML5 video is not supported altogether. Make sure spinner gets hidden when error message is shown. [BLD-638] 2014-05-20 19:17:57 +02:00
Greg Price
ae50c9c808 Merge pull request #3728 from edx/gprice/forum-search-logging 
Add logging of search quality information
 2014-05-20 12:44:05 -04:00
Don Mitchell
08aaa97bfb Serialize course_key at last possible code junction 2014-05-20 11:58:03 -04:00
Calen Pennington
76235c1027 Allow cross course references in the LMS 2014-05-20 11:44:09 -04:00
Sarina Canelake
9dc48c00b4 Merge pull request #3779 from edx/sarina/fix-grades-management-commands 
Sarina/fix grades management commands
 2014-05-20 11:35:54 -04:00
Don Mitchell
80552674b3 Merge pull request #3786 from edx/dhm/bug_cohort_args 
Dhm/bug cohort args
 2014-05-20 11:23:22 -04:00
Don Mitchell
591fc2b547 Fixes Carlos's bug 2014-05-20 11:15:10 -04:00
Don Mitchell
e2332d1922 Fix old dashboard list cohorts 2014-05-20 10:37:03 -04:00
Alan Boudreault
877ec3f963 some minor improvements to embargo 2014-05-20 10:03:06 -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
33871e4515 Handle the indexerror exception on create_order 
LMS-2646
 2014-05-20 16:04:58 +05: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
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
9ca09db469 Fix missing semicolon in annotation html 2014-05-19 15:34:29 -04:00
Alan Boudreault
ba6e61b907 Extended Embargo feature to support site access restriction and ip network 2014-05-19 15:12:02 -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
Sarina Canelake
5fd2eef58d Add Croatian language 2014-05-19 08:13:18 -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
afac5145e3 Merge pull request #3757 from edx/sarina/fix-git_import 
Sarina/fix git import
 2014-05-16 16:12:33 -04:00