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

6348 Commits

Author SHA1 Message Date
wajeeha-khalid
6e5e185b4e Merge pull request #10738 from edx/jia/MA-1593 
MA-1593; include post in comment count
 2015-11-26 11:18:30 +05:00
Jim Abramson
8f4c2264a1 Merge pull request #10701 from edx/renzo/studio-programs-tab 
Add Programs tab to Studio
 2015-11-25 16:37:34 -05:00
Nimisha Asthagiri
115ab3c11b Merge pull request #10720 from edx/mobile/course-about-url-MA-1712 
MA-1712: Update Mobile API to include course_about
 2015-11-25 15:38:45 -05:00
Renzo Lucioni
70d57327eb Add Programs tab to Studio 
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
 2015-11-25 14:56:50 -05:00
Nimisha Asthagiri
330120bb7a MA-1712: Update Mobile API to include course_about 2015-11-25 13:48:45 -05:00
wajeeha-khalid
6ea7c23631 MA-1593; include post in comment count 2015-11-25 17:40:06 +05:00
Saleem Latif
764ceb00c8 Cert Exceptions: View and Edit Exception list 2015-11-25 10:02:52 +05:00
Peter Fogg
5043b46525 Merge pull request #10602 from edx/peter-fogg/update-footer-config 
Update LMS footer links.
 2015-11-24 15:50:46 -05:00
Ahsan Ulhaq
347bfcbb38 Merge pull request #10688 from edx/ahsan/ECOM-2562-Refund-Policy-on-Prof-Ed-Receipts 
Refund Policy on Prof Ed Receipts
 2015-11-25 00:39:50 +05:00
Michael Frey
29b6ccf5e4 Added new Course List API. 2015-11-24 15:54:03 +00:00
Peter Pinch
1b8349994e Merge pull request #10619 from mitocw/fix/aq/dates_of_problems 
Overridden start and due dates of problems to control due date of a unit from ccx schedule
 2015-11-24 10:38:59 -05:00
chrisndodge
0ccb017408 Merge pull request #10713 from edx/cdodge/fix-zero-seat-invoices 
Cdodge/fix zero seat invoices
 2015-11-24 10:28:42 -05:00
Chris Dodge
e534e5d588 fix broken report when there is a zero seat invoice 
fix quality error
 2015-11-24 09:42:54 -05:00
Amir Qayyum Khan
a1f2f395a0 overriden start and due dates for problems to controll due date of a unit from ccx schedule 2015-11-24 18:23:09 +05:00
Ahsan Ulhaq
bc64c66835 Refund Policy on Prof Ed Receipts 
ECOM-2562
 2015-11-24 17:42:09 +05:00
chrisndodge
236d251e6e Merge pull request #10691 from edx/cdodge/add-attempt-code-to-report 
Add in the attempt_code field to the proctoring report
 2015-11-24 07:18:11 -05:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations 
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
 2015-11-23 15:32:54 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
chrisndodge
7c7c0b6809 Merge pull request #10670 from edx/cdodge/fix-unenrollment-audit-data 
Cdodge/fix unenrollment audit data
 2015-11-20 12:07:14 -05:00
Chris Dodge
21c2d3f7bd Add in the attempt_code field to the proctoring report 2015-11-20 12:05:49 -05:00
zubair-arbi
0b93054cbb Allow user to submit initial verification through reverify flow 
ECOM-2933
 2015-11-20 14:34:38 +05:00
Chris Dodge
f4c5541339 be sure to include the enrollment_id when unenrolling 2015-11-19 15:50:51 -05:00
Nimisha Asthagiri
a2675fe0b4 Merge pull request #10649 from edx/jia/MA-1190 
MA-1190; patch 'read' attribute for thread
 2015-11-19 15:27:50 -05:00
Brian Beggs
141e0a93c7 Merge branch 'master' into dj18-release-merge 2015-11-19 13:36:13 -05:00
Matt Drayer
42c2cc4dbe Merge pull request #10618 from edx/ziafazal/SOL-1386 
SOL-1386: refactored cert web view code
 2015-11-19 09:46:57 -05:00
wajeeha-khalid
e662e869d6 MA-1190; patch 'read' attribute for thread 2015-11-19 15:33:35 +05:00
Sven Marnach
3dcc3c4aae Clean up occurrences of SlashSeparatedCourseKey in the django_comment_client app. 
The preferred form is to use CourseKey.from_string() instead of
SlashSeparatedCourseKey.from_deprecated_string().
 2015-11-18 16:37:57 +01:00
Sven Marnach
ef563e4285 Add tests for the discussion forum vote events. 2015-11-18 16:22:59 +01:00
Sven Marnach
cf5d276aea Emit events when users vote on forum posts. 2015-11-18 16:21:50 +01:00
muhammad-ammar
29acc3acfc resolve merge conflicts 
test fixes
 2015-11-18 19:13:54 +05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
Nimisha Asthagiri
1870d4e55a Merge pull request #10613 from edx/mobile/unit-test-MA-1624 
MA-1624 Unit tests for User Partition Transformer
 2015-11-17 11:08:27 -05:00
Zia Fazal
c5912ea367 refactored code as described in SOL-1386 
further code refactoring and added test

fixed tests and internationalisation issues

added translators comment and pulled text to same line

changes based on feedback

updated doctoring to make it more unstandable

further optimizations
 2015-11-17 15:44:46 +05:00
wajeeha-khalid
7de5882372 MA-860; No moderator permissions on closed thread 2015-11-17 14:02:35 +05:00
wajeeha-khalid
9fcc1c32a1 Merge pull request #10586 from edx/jia/MA-862 
MA-862; accept application/merge-patch+json for comment/thread update
 2015-11-17 11:01:37 +05:00
Nimisha Asthagiri
521568937d MA-1624 Unit tests for User Partition Transformer. 2015-11-16 16:30:38 -05:00
Giovanni Di Milia
64acf4846b Enforced maximum amount of students for CCX 
CCX overrides course max_student_enrollments_allowed
and set it to 200 during CCX creation
 2015-11-16 10:10:37 -05:00
Chris Dodge
02550cb368 Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts 2015-11-13 12:57:10 -05:00
Peter Pinch
fd8b757c90 Merge pull request #10250 from mitocw/feature/aq/add_pagination_gradebook 
Added pagination on grade book.
 2015-11-13 12:37:34 -05:00
Peter Fogg
c5fac6ce68 Update LMS footer links. 
SWAT-92
 2015-11-13 10:08:10 -05:00
Matt Drayer
04c0b3aea9 Merge pull request #10595 from edx/saleem-latif/SOL-1333-feedback-changes 
saleem-latif/SOL-1333: Invalidate Generated Certificates before regeneration
 2015-11-13 09:18:54 -05:00
Matt Drayer
b932a202d8 Merge pull request #10593 from edx/asadiqbal08/SOL-1385 
asadiqbal/SOL-1385 Disable "Generate Certs" button until cert is activated
 2015-11-13 09:15:18 -05:00
asadiqbal
35d04bff89 SOL-1385 2015-11-13 15:23:02 +05:00
wajeeha-khalid
4ea70aeb19 MA-862; accept application/merge-patch+json for comment/thread update 2015-11-13 12:52:21 +05:00
Saleem Latif
15380a00f7 invalidate Generated Certificates before regeneration 2015-11-13 12:26:19 +05:00
Saleem Latif
c068bc95cf Custom 500 error message should only be seen for Preview 2015-11-12 11:31:25 +05:00
Ned Batchelder
e7fcc743c0 More-correct data migrations 
We need to be sure the migrations will work even in the presence of data
from the future.  get_or_create is a problem, because if the data
already exists, there could be more than one record, even if this
migration only creates one.
 2015-11-11 09:03:21 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Cliff Dyer
ce99ca63fa Merge pull request #10561 from edx/release 
Verify patched fix merge back into master.
 2015-11-10 14:10:05 -05:00
Matt Drayer
31c5b94548 Merge pull request #10518 from edx/saleem-latif/SOL-1333 
SOL-1333: Add Cert Regenerate UI on Instructor Dash
 2015-11-10 12:20:07 -05:00