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

11491 Commits

Author SHA1 Message Date
tlindaliu
0c837adfce Refactor auth.has_access to auth.user_has_role 
Change name of method to clear up confusion with the access.has_access method.
 2015-07-19 20:42:29 -04:00
tlindaliu
e0840d2d43 MA-849: Change has_access return type 
New classes for the return type, and changes to the has_access function and tests to make them compatible.
 2015-07-19 20:42:29 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
srpearce
b12d3f6303 Merge pull request #8773 from edx/sylvia/docs/DOC-2102 
Sylvia/docs/doc 2102
 2015-07-17 15:42:59 -04:00
Sylvia Pearce
eea3b31105 Delete white spaces that are causing test failures 2015-07-17 16:12:53 +00:00
Jesse Zoldak
41350002ba Merge pull request #8940 from edx/zoldak/SOL-1053-skip 
Mark too-flaky test for skipping
 2015-07-17 12:12:34 -04:00
Jesse Zoldak
ec6258a7ec Mark too-flaky test for skipping 2015-07-17 11:01:45 -04:00
Awais Jibran
2d19eafa7c Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required 
Decorated instructor dashboard with sudo_required.
 2015-07-16 21:12:43 +05:00
Tasawer
1ded8b546c Update code of get_eligibility api. 
ECOM-1858
 2015-07-16 12:52:16 +05:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Sylvia Pearce
c2420b0940 Final tweaks to API documentation updates 2015-07-15 21:46:11 +00:00
Sylvia Pearce
d2b6ac84d3 Reorganize and update API documentation 2015-07-15 14:31:02 -04:00
Matt Drayer
3f432d49a8 Merge pull request #8912 from edx/asadiqbal08/SOL-1046 
SOL-1046 converted anchor to button for linkedIn
 2015-07-15 12:07:57 -04:00
David Baumgold
8c4bb8bf3c Merge pull request #8933 from edx/revert-setuptools 
Revert setuptools
 2015-07-15 11:13:56 -04:00
asadiqbal
56015fecf3 asadiqbal08/SOL-1046: Convert LinkedIn anchor tag to button 
* remove the onclick event
* add mako check to Javascript handler
 2015-07-15 10:30:35 -04:00
Matt Drayer
66e1b11a58 Merge pull request #8931 from edx/ziafazal/fix-SOL-1008 
SOL-1008: only edx PM can activate/deactivate or delete certificate configuration
 2015-07-15 10:03:17 -04:00
David Baumgold
1a3f0958b9 Revert setuptools upgrade 2015-07-15 09:36:56 -04:00
Vedran Karačić
4eb4a82ea5 Merge pull request #8851 from edx/vkaracic/PLAT-619-2 
PLAT-619: Custom error messages for delete course command
 2015-07-15 14:59:25 +02:00
Zia Fazal
0793cc8b5c only ddx PM can activate/deactivate or delete certificate configuration 
fix for flaky test

fix for broken test

fixed quality violation
 2015-07-15 17:09:01 +05:00
Jesse Zoldak
98a8f0e282 Merge pull request #8917 from edx/zoldak/SOL-1053 
Mark delete certificates test as flaky SOL-1053
 2015-07-14 11:47:30 -04:00
vkaracic
ff6afaf483 Custom error messages for delete course command 
This is a fix for
https://openedx.atlassian.net/browse/PLAT-619
added custom CommandError messages for invalid syntax and
invalid course keys.
 2015-07-14 15:28:01 +00:00
Feanil Patel
ea5b41cd84 Merge pull request #8898 from edx/feanil/fix_student_migrations 
Update migration dependency.
 2015-07-14 10:27:56 -04:00
frances botsford
2e7da1985a Merge pull request #8321 from edx/frances/lms/user-menu-cleanup 
LMS User menu cleanup
 2015-07-14 09:23:36 -04:00
Jesse Zoldak
96b2baba63 Mark delete certificates test as flaky SOL-1053 2015-07-14 09:10:34 -04:00
Marco Morales
493200734e Merge pull request #8296 from edx/marco/find-courses-page/styling-changes 
Styling improvements to openedX search through Find Courses page
 2015-07-14 08:14:35 -04:00
Matt Drayer
d57fd0e47c Merge pull request #8847 from edx/ziafazal/SOL-1021 
ziafazal/SOL-1021: Create Analytics events for certificate actions
 2015-07-14 07:58:55 -04:00
Zia Fazal
57f1dc92b3 ziafazal/SOL-1021: Capture additional certificate configuration events 
* Changed certificate_id to configuration_id
* Fix for acceptance test faiiure
* Add waits to bok choy tests

fix for flaky test
 2015-07-14 11:12:09 +05:00
Sven Marnach
3d7246ecc8 Allow masquerading as a specific user different from the logged in user. 2015-07-13 18:55:45 -07:00
Andy Armstrong
b604d647f8 Fix indentation 2015-07-13 17:58:16 -04:00
Sarina Canelake
49f78b4742 Remove logging-not-lazy Pylint violations 2015-07-13 17:34:54 -04:00
Sarina Canelake
8283c07e32 Remove superfluous-parens pylint violations 
Skipped 'print' statement violations, as print() is Py3k syntax.
 2015-07-13 17:33:28 -04:00
Sarina Canelake
47b99720fa Clean up old style class definitions 2015-07-13 17:33:27 -04:00
Sarina Canelake
22bbdacee9 Convert Meta classes to new-style classes 2015-07-13 17:33:26 -04:00
Sarina Canelake
b41e70f541 Remove Pylint violations deprecated-pragma, bad-option-value 2015-07-13 17:33:26 -04:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04:00
Feanil Patel
4ae4e25f5c Update student migration 0035 to add a dependency. 
This migration instantiates the modulestore which is now dependent
the xblock_django database config settings.  So the initial migration
for that has to run before this migration.
 2015-07-13 16:53:33 -04:00
Matt Drayer
37a0c19ada Merge pull request #8777 from edx/asadiqbal08/SOL-767_twitter_sharing 
asadiqbal08/SOL-767: Students can share their certificate view on Twitter
 2015-07-13 10:10:13 -04:00
Jim Abramson
eed3ecad7f Merge pull request #8861 from edx/jsa/stop-warning-noise 
reduce log severity when building marketing links
 2015-07-13 08:56:28 -04:00
asadiqbal
19d6012033 bokchoy update 2015-07-13 15:57:50 +05:00
muhammad-ammar
5a8b158900 Visual change to new Hints and Feedback problem types 
TNL-2619
 2015-07-13 12:18:25 +05:00
jsa
41b0b793de reduce log severity when building marketing links 2015-07-10 16:21:12 -04:00
Frances Botsford
c35ebb7658 pr feedback 2015-07-10 14:13:45 -04:00
Frances Botsford
32df8db753 user menu cleanup 2015-07-10 14:13:45 -04:00
Christine Lytwynec
bc78baa091 Merge pull request #8841 from edx/clytwynec/TE-745 
Fix for TE-745
 2015-07-10 09:08:52 -04:00
Jesse Zoldak
2b51029db3 Merge pull request #8834 from edx/zoldak/SOL-449 
Mark a too-flaky Milestones acceptance test for skipping
 2015-07-09 15:12:32 -04:00
Christine Lytwynec
14fdc836c5 Fix for TE-745 2015-07-09 15:09:16 -04:00
Jesse Zoldak
de97e31a25 Merge pull request #8858 from edx/zoldak/TNL-2704 
Mark test as flaky TNL-2704
 2015-07-09 15:09:07 -04:00
David Baumgold
705fa6999a Use a forked version of NLTK 
So that we can use setuptools instead of distribute
 2015-07-09 13:04:33 -04:00
Régis Behmo
95ebf7f675 Upgrade distribute to the latest stable version of setuptools 
'distribute' is the ancestor of 'setuptools', and many packages require
setuptools to be installed.

Upgrade of MySQL-python from 1.2.4 to 1.2.5 is required because of an
incompatibility with setuptools>0.7.
 2015-07-09 13:04:33 -04:00
David Ormsbee
472de1a5de Merge pull request #7288 from edx/ormsbee/grade_query_caching 
Grading Performance Work
 2015-07-09 12:07:52 -04:00