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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frances Botsford
db57118f7d i18n and updated secondary action buttons on the photo page 2013-09-04 14:35:48 -04:00
Jason Bau
ec989e4999 Address review comments for lms_link_to_cms 
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
 2013-09-04 11:29:22 -07:00
Frances Botsford
b2ddea7a80 updated copy for vcert flow 2013-09-04 13:46:38 -04:00
Ned Batchelder
ac2b7a3ac1 Merge pull request #863 from edx/ned/fix-simple-things-because,-damn 
fix simple things because, damn
 2013-09-04 09:12:43 -07:00
Chris Dodge
0847bc5e2b pep8/pylint violations fixes 2013-09-04 11:34:35 -04:00
Sarina Canelake
577aeed35a Don't fetch the editor for XML courses 2013-09-04 11:31:52 -04:00
Diana Huang
2e3a918da2 Clean up and fix some bugs on the 'already verified' page. 2013-09-04 11:31:03 -04:00
Diana Huang
18a497e150 Fix merge conflict in sass 2013-09-04 11:22:52 -04:00
Diana Huang
03a4af7add Fix failing tests. 2013-09-04 11:21:31 -04:00
Ned Batchelder
3a5f718a32 fix simple things because, damn 2013-09-04 11:10:05 -04:00
David Ormsbee
e7c07d4e43 Merge remote-tracking branch 'origin/ormsbee/verifyuser3' into ormsbee/verifyuser3 2013-09-04 10:59:18 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
 2013-09-04 10:58:30 -04:00
ichuang
00710f75d2 add CAS authentication via django_cas and mods to external_auth 2013-09-04 10:56:45 -04:00
Adam Palay
fb84541bbe add nltk to sandbox reqs 2013-09-04 10:15:39 -04:00
Adam
0916957812 Merge pull request #861 from edx/fix/adam/add-edge-reqs 
add requests and nltk to sandbox reqs
 2013-09-04 07:14:59 -07:00
Adam Palay
6078f4c67e add nltk to sandbox reqs 2013-09-04 10:12:44 -04:00
Jay Zoldak
41e3ffc216 Enable developer local overrides to acceptance settings 2013-09-04 09:36:54 -04:00
Diana Huang
f4c1a8f27b Update the carousel with which step the user is on 2013-09-04 09:21:07 -04:00
Will Daly
b2b23fa9c5 Pass in harvest args to fasttest_acceptance, not the args array 2013-09-04 08:34:52 -04:00
Will Daly
75b588e018 Merge pull request #858 from edx/will/harvest-args-fix 
Pass in harvest args to fasttest_acceptance, not the args array
 2013-09-04 05:29:46 -07:00
Will Daly
9b1a5b49a7 Pass in harvest args to fasttest_acceptance, not the args array 2013-09-03 21:17:15 -04:00
Diana Huang
35a7b75eb2 Fix up some links to point to the right place. 2013-09-03 18:03:02 -04:00
Sarina Canelake
51fcb5247d Merge pull request #855 from edx/sarina/bulkemail-violations 
Cleanup bulk email app
 2013-09-03 14:25:36 -07:00
Adam
ef042c39aa Merge pull request #853 from edx/fix/adam/pylint-pep8 
fix pep8 and pylint errors
 2013-09-03 14:22:11 -07:00
Adam
3cc793b01b Merge pull request #856 from edx/adam/merge-conflicts 
Adam/merge conflicts
 2013-09-03 14:20:15 -07:00
Brian Talbot
b75398b0df Verification: moves common page elements/copy into central templates w/ supportive styling 2013-09-03 17:17:13 -04:00
Jay Zoldak
a432cffc2c Mark tests for unimplemented features as skip so that the acceptance tests will all pass when we merge into master. 2013-09-03 16:42:03 -04:00
Brian Talbot
70ba52b4fa Verification: syncing all submit button-type styling (including newly used element on verified view) 2013-09-03 16:37:34 -04:00
Brian Talbot
dc850370b2 Verification: resolves layout issue with progress nav in diff screen widths 2013-09-03 16:33:25 -04:00
Brian Talbot
4b3918c7e5 Verification: adds styling for already verified view and refactors html/styling for shared elements 2013-09-03 16:30:42 -04:00
Sarina Canelake
bfebe684b3 Cleanup bulk email app 2013-09-03 16:11:34 -04:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Adam
6787fbbf04 Merge pull request #851 from edx/hotfix/release-multiple-video-bug 
Hotfix/release multiple video bug
 2013-09-03 12:23:00 -07:00
Will Daly
e284ac682a Merge pull request #837 from edx/will/faster-acceptance-test-startup 
Skip migrations if running acceptance in fasttest mode
 2013-09-03 11:58:43 -07:00
Adam Palay
300f7f13a6 fix pep8 and pylint errors 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	lms/envs/common.py
 2013-09-03 14:55:11 -04:00
Diana Huang
0c3af96792 Add the javascript to control payment button back in. 2013-09-03 14:35:38 -04:00
Jay Zoldak
6c36e9caad Merge branch 'zoldak/certificates-acceptance-tests' into ormsbee/verifyuser3 2013-09-03 13:53:35 -04:00
Jay Zoldak
e0110bf108 Change css for payment page for better synchronization. 2013-09-03 13:51:47 -04:00
Brian Talbot
47a9f8fc5f Verification: added in supporting disabled/not ready styling for wizard nav + expandable height fix 2013-09-03 12:55:17 -04:00
Diana Huang
d1ec21ed1c Fix Javascript bugs that arose during refactoring. 2013-09-03 12:53:34 -04:00
Adam
c7a537e412 Merge pull request #848 from edx/fix/adam/add-edge-reqs 
Fix/adam/add edge reqs
 2013-09-03 09:53:21 -07:00
Will Daly
a081746661 Merge pull request #849 from edx/will/acceptance-test-static-files 
Fix for acceptance test static file issue
 2013-09-03 09:50:59 -07:00
Anton Stupak
a09e610403 Fix multiple video bug 2013-09-03 18:49:46 +03:00
Will Daly
e94515df80 Fix for acceptance test static file issue 2013-09-03 11:36:23 -04:00
Diana Huang
98f80c36c1 Fix Javascript bugs that arose during refactoring. 2013-09-03 10:57:49 -04:00
Adam Palay
a7159d8afd add pyparsing to edx requirements 2013-09-03 10:49:04 -04:00
Jay Zoldak
b9ccc37c57 Automate more scenarios 2013-09-03 10:46:33 -04:00
Jay Zoldak
7bc997d0fb Change CSS after rebase. 2013-09-03 10:46:33 -04:00
Will Daly
e0372b00ef Implemented fake payment page. 2013-09-03 10:46:33 -04:00
Will Daly
a52ca3639b Initial BDD spec for certificates workflow 2013-09-03 10:46:32 -04:00