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

2960 Commits

Author SHA1 Message Date
Matt Drayer
a2fa59cd4b Merge pull request #10308 from edx/ziafazal/SOL-1332 
SOL-1332: use a generic function to check if entrance_exam feature is enabled or not
 2015-10-26 09:46:22 -04:00
Ben Patterson
1032d37271 Revert "Public Course Import/Export API (continued)" 2015-10-23 20:02:34 -04:00
Peter Pinch
e7708e5a04 Merge pull request #8942 from mitocw/bdero/import-export-reprise 
Public Course Import/Export API (continued)
 2015-10-23 15:03:38 -04:00
Andy Armstrong
054aa95b26 Allow non-public XBlock assets in debug mode 2015-10-22 11:09:02 -04:00
Zia Fazal
9bb6f6e88d use a generic function check if entrance_exam is enabled or not 2015-10-22 16:45:19 +05:00
Matt Drayer
5ed97e90f3 Merge pull request #10248 from edx/ziafazal/SOL-1319 
SOL-1319: removed  entrance exam dependency on ENABLE_MKTG_SITE
 2015-10-21 10:16:56 -04:00
Zia Fazal
80abf159ee removed entrance exam dependency on ENABLE_MKTG_SITE 
changes after feedback from Matt D

set default value of entrance_exams feature flags to false
 2015-10-21 15:21:26 +05:00
Adam
ab78069a33 Merge pull request #10246 from edx/merge-release-into-master 
Merge release into master
 2015-10-19 11:13:49 -05:00
Matt Drayer
1eab25f292 mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations 
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
 2015-10-19 10:11:59 -04:00
Adam Palay
9b3841f62c Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html
 2015-10-19 08:35:33 -05:00
Zia Fazal
0f637fdc95 check MILESTONES_APP when checking prerequisite courses enabled 2015-10-16 12:53:55 +05:00
Awais Jibran
2813b1269e Published orphans in split breaks preview button in Studio 2015-10-12 15:00:49 +05:00
mushtaqali
296f75a07c Add template escaping in forums, progress page and course container TNL-2395, TNL-2394, TNL-2393 2015-10-07 11:20:51 -04:00
Diana Huang
0248f8af6d Add new clickjacking decorator that whitelists LTI consumers. 2015-10-07 11:20:51 -04:00
Calen Pennington
8267a762c0 Move *ModuleStoreBuilders into xmodule.modulestore.tests.utils 2015-10-01 16:52:39 -04:00
Mushtaq Ali
11741f118f 'force_publish' command for publishing a course forcefully by making the published branch point to the same structure as the draft branch. add force_publish functionality to split courses. 2015-10-01 15:46:37 +05:00
Matt Drayer
65831c887d Merge pull request #9806 from edx/ziafazal/SOL-1185 
ziafazal/SOL-1185: move SOCIAL_SHARING_SETTINGS out of FEATURES
 2015-09-30 14:12:33 -04:00
Brandon DeRosier
c608c6bdd3 Fix library error dialog link in Import/Export API 2015-09-24 09:01:55 -04:00
Brandon DeRosier
edf7d9965e Revert "Revert "edX Course/Library Import/Export API"" 
This reverts commit 2bfbda3c1e.
 2015-09-24 09:01:00 -04:00
Matt Drayer
ffb7f9b9a0 Merge pull request #9804 from edx/asadiqbal08/SOL-1224 
SOL-1224 Verified Preview not showing
 2015-09-20 22:50:00 -04:00
Bill DeRusha
271bc54071 Merge pull request #9765 from edx/bderusha/readonly-enrollment 
Readonly for enrollment end date/time on edX (for non-global-staff)
 2015-09-18 10:14:15 -04:00
Bill DeRusha
c6b54aa61f Readonly for enrollment end date/time on edX (for non-global-staff) 
TNL-2694

Add accessibility aria-readonly attributes
 2015-09-18 09:39:18 -04:00
asadiqbal
287cc843df SOL-1224 2015-09-18 11:19:12 +05:00
Peter Fogg
0a2cfbe31c Merge pull request #9738 from edx/peter-fogg/change-studio-help-links 
Remove Tender and change Studio help links.
 2015-09-17 22:42:57 -04:00
Kevin Falcone
81abdbe81b Merge pull request #9819 from edx/release 
Release
 2015-09-17 21:30:48 -04:00
Peter Fogg
fec5129a49 Remove Tender and change Studio help links. 
TNL-2695
 2015-09-17 16:30:40 -04:00
Adam Palay
8aa23de55a add ability to delete published orphans from courses (PLAT-832) 
fix quality violations

create child parent mapping to avoid potential performance hit when deleting items
 2015-09-17 11:52:19 -04:00
Adam Palay
8834bbad90 delete_item should not delete any child that has a parent we do not intend to delete 2015-09-17 11:52:18 -04:00
Zia Fazal
14c14b07db moved SOCIAL_SHARING_SETTINGS out of FEATURES 
fixed object has no attribute 'get'

fixed 'LazySettings' object has no attribute

add social settings to cms/env/aws
 2015-09-17 19:24:09 +05:00
John Eskew
684f901760 Fix quality issue. 2015-09-16 16:04:51 -04:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Adam Palay
8dd95a8825 add test for fix_not_found 
(PLAT-835)
(TNL-844)
 2015-09-15 18:03:53 -04:00
John Eskew
6454ffc3b1 Merge pull request #9734 from edx/jeskew/replace_remove_persistent_factory 
Refactor the test_crud file.
 2015-09-15 09:05:43 -04:00
John Eskew
78af86bc5b Refactor the test_crud file. 
Move Split-specific tests to test_split_modulestore.py.
Derive remaining tests from ModuleStoreTestCase.
Remove unused persistent_factory.py.
 2015-09-14 07:51:00 -04:00
Zia Fazal
dd48bb0f4a missing is_active attribute fix 2015-09-11 11:46:32 -04:00
Marko Jevtic
080a44b663 (SOL-1105) Requirement for enabling search in devstack 2015-09-04 10:50:40 +00:00
Christine Lytwynec
e807cbd589 Merge pull request #9402 from edx/clytwynec/TNL-2153 
Change component types and template links to buttons
 2015-09-01 12:48:46 -04:00
Christine Lytwynec
3470e180fc Change component types and template links to buttons 2015-09-01 10:31:35 -04:00
Kevin Falcone
e3c66f55e0 Optimize memory and CPU usage. 
The print_out_all_courses() routine consumes a ton of memory (2G and
causes noticable mongo usage spikes).  This actually causes other
processes on production boxes to be memory starved and killed
(such as worker children on edge when this was run recently).

The behavior of this script on production is
* Print several hundred courses
* Ask if you want to delete the one you specified
* print several hundred courses minus one
On a sandbox with 5 courses, you could tell by eye that 1 is gone, but
not in production (or even in stage).

The original PLAT-619 ticket for this suggested printing a course
listing on error, but instead it always printed the course listing.
Even in the error case, hundreds of course ids is confusing and obscures
the error message saying that your course_id is invalid.

You should be getting the course id from the UI or from ./manage.py lms
dump_course_ids, not by searching a list.

Adjusted the test accordingly

Remove get_courses_keys
 2015-08-31 11:28:26 -04:00
Ned Batchelder
741f06864a Merge pull request #9502 from edx/ned/import-path-differently 
Change imports from path to use the stablest name.
 2015-08-28 11:12:10 -04:00
Matt Drayer
5140be7d5d Merge pull request #9479 from edx/asadiqbal08/SOL-1152 
asadiqbal08/SOL-1152- Getting error on editing the certificate in deactivated mode.
 2015-08-27 16:40:16 -04:00
Peter Fogg
5d26938158 Merge pull request #9366 from edx/peter-fogg/team-signals 
Add signals for user's discussion activity.
 2015-08-27 14:07:29 -04:00
Ned Batchelder
2a0259095d Change imports from path to use the stablest name. 
The old line:

    from path import path

produced pylint errors because of the baroque way that path.py defined
"path".  We tried to get them to change how they defined it, but they
deleted the name instead: https://github.com/jaraco/path.py/issues/102

(Jason then changed his mind, but this is a better way to use path.py,
it avoids the pylint error at least.)
 2015-08-27 12:59:25 -04:00
asadiqbal
9f34720d56 SOL-1152 2015-08-27 11:27:43 +05:00
Peter Fogg
38fb6eaede Add signals for user's discussion activity. 
These signals are caught by the Teams app and used to update
`last_activity_at` on both teams and individual users.

TNL-2497
 2015-08-26 12:07:54 -04:00
muhammad-ammar
6134e8b5ed Move studio dialog code into common 2015-08-26 20:26:27 +05:00
Bill DeRusha
973314de7b Add basic elasticsearch search for teams 
TNL-3014

Add tests for search

Add text_search to TeamsListView

Add reindex command line tool for course teams

Add Search Pagination and update comments

Move paginate_search_results to common library
 2015-08-24 09:22:06 -04:00
zubair-arbi
ec28a75f14 In-course reverification access control 
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
 2015-08-20 08:43:55 -07:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release 
Release
 2015-08-17 13:17:55 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00