Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
Will Daly
17d8bd219a Merge pull request #1319 from edx/will/enable-bulk-email-tests 
Enable and update bulk email acceptance test
 2013-10-17 05:44:48 -07:00
ichuang
757ce61d3e Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path 2013-10-16 22:00:13 -04:00
Adam Palay
1fc993ce18 add functionality to disable users 
add middleware to detect students with disabled accounts

add tests
 2013-10-16 16:57:11 -04:00
Adam Palay
421174980a add UserStanding model 
add migration
 2013-10-16 16:57:06 -04:00
ichuang
d0d18f8601 module -> block in common/djangoapps/xmodule_modifiers.py 2013-10-16 15:38:39 -04:00
ichuang
9774348633 lms namespace removed 2013-10-16 15:37:23 -04:00
Jay Zoldak
751994b9aa pep8 and pylint fixes 2013-10-16 15:03:14 -04:00
Jay Zoldak
37933cb5f9 refactor studio component creation in acceptance tests 2013-10-16 15:02:49 -04:00
Julia Hansbrough
8a30e9ba8f Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-16 13:01:57 -04:00
Julia Hansbrough
fd54b060d8 added self to authors style, changed GET to POST 2013-10-16 13:01:57 -04:00
Will Daly
3f88b87916 Added acceptance tests for bulk email (through beta dashboard) 2013-10-16 13:01:57 -04:00
Diana Huang
8ec9a16d81 Fix parentheses so that we only pull the course modes we want. 2013-10-16 10:15:34 -04:00
Will Daly
82535f3bcb Enable and update bulk email acceptance test 2013-10-15 21:30:28 -04:00
Julia Hansbrough
f397e66127 Merge pull request #1215 from edx/flowerhack/feature/bulkemailnewdash_testingcoverage 
Flowerhack/feature/bulkemailnewdash testingcoverage
 2013-10-10 11:26:21 -07:00
John Jarvis
a517dc2085 Revert "Merge pull request #1240 from edx/dhm/config_separation" 
This reverts commit ec01253e30, reversing
changes made to ae8c9710e5.
 2013-10-10 13:14:08 -04:00
Julia Hansbrough
fbeb2206d4 Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-10 17:06:41 +00:00
Julia Hansbrough
86321c2cc1 added self to authors style, changed GET to POST 2013-10-10 17:06:40 +00:00
Will Daly
c66b5dc3d4 Added acceptance tests for bulk email (through beta dashboard) 2013-10-10 17:06:38 +00:00
Will Daly
3376eb0f46 Make wait_for_requirejs more tolerant of errors 2013-10-10 09:59:54 -04:00
Don Mitchell
ec01253e30 Merge pull request #1240 from edx/dhm/config_separation 
Segregate the mongo db config from the modulestore config
 2013-10-09 13:24:30 -07:00
Will Daly
936b933a46 Guard against StaleElementException in css_click 2013-10-09 07:21:38 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class 
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
 2013-10-08 15:29:17 -04:00
Don Mitchell
44d0494d33 Segregate the mongo db config from the modulestore config 
as a first step to separating db connection from modeling
and to support location mapper and contentstore using same db config as modulestore
 2013-10-08 15:01:48 -04:00
Carlos Andrés Rocha
e0fb94cc55 Cleanup mongodb authentication 
Authenticate to the database before getting a reference to the
collection.
 2013-10-08 11:26:29 -04:00
ichuang
62e113e9fc Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path 
Conflicts:
	common/djangoapps/xmodule_modifiers.py
 2013-10-07 21:23:05 -04:00
Ned Batchelder
9103fa393c Use assertIsInstance. 2013-10-07 18:17:40 -04:00
Will Daly
b749300d43 Use css_has_value() to fix failure in course-overview.feature 2013-10-07 16:08:39 -04:00
Will Daly
3257a7baf2 Refactored navigation feature 
Fixed grading tests
 2013-10-07 09:41:18 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Diana Huang
3ec8df9f5e Merge pull request #1216 from edx/diana/dashboard-cleanup 
Some dasbhoard template cleanup
 2013-10-04 06:17:06 -07:00
Diana Huang
ed5168ec61 Move more dashboard logic into the views 2013-10-03 16:22:00 -04:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Diana Huang
7ba38c0ff3 Refactor out logic for individual course listings. 2013-10-03 14:08:38 -04:00
Diana Huang
bc9f86fd16 Merge pull request #1205 from edx/diana/fix-course-mode-expiration 
Fix parentheses so that we only pull the course modes we want.
 2013-10-03 05:33:43 -07:00
Diana Huang
52c4395a03 Fix parentheses so that we only pull the course modes we want. 2013-10-02 16:14:26 -04:00
Will Daly
05669fadde Catch WebDriver exceptions when creating selenium browser 2013-10-02 12:18:13 -04:00
Jay Zoldak
6e3ece92e3 Refactor upload acceptance tests and add locked asset tests for registered user 2013-10-02 08:12:58 -04:00
Brian Wilson
07f94d46a6 Move Pearson courseware imports to function level. 2013-09-27 12:43:27 -04:00
Jason Bau
c1d555beef Merge pull request #1118 from edx/jbau/shoppingcart-stanford 
Stanford paid course registration
 2013-09-27 07:31:17 -07:00
Jason Bau
667a1eadb5 Stanford paid course registration 
With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
 2013-09-26 18:25:00 -07:00
Jay Zoldak
8e6c0ea937 Wrap logic for selecting options in acceptance tests 2013-09-26 16:07:20 -04:00
Diana Huang
78829a37b5 Merge pull request #1127 from edx/diana/modes-expiration-dates 
Add the ability to set expiration dates on course modes.
 2013-09-25 14:22:22 -07:00
Diana Huang
37d906e4db Add the ability to set expiration dates on course modes. 2013-09-25 16:15:42 -04:00
Will Daly
2b54922285 Fix intermittent failure in OpenID test 2013-09-25 13:05:56 -04:00
Diana Huang
19ee540a33 Merge pull request #1115 from edx/diana/verify-pep8-pylint 
Clean up some old pep8/pylint violations
 2013-09-25 06:23:47 -07:00
Diana Huang
4ee9ef61cf Clean up some old pep8/pylint violations 
Also, deletes some unused code.
 2013-09-24 17:12:31 -04:00
jkarni
ad939b1e7c Merge pull request #1090 from edx/jkarni/feature/middleware-locked-assets 
Jkarni/feature/middleware locked assets
 2013-09-24 12:25:05 -07:00
Julian Arni
1a0b752a81 Review fixes 2013-09-24 14:59:07 -04:00
Jay Zoldak
002f3ef9e2 Speed up waiting for elements not present on remote webdriver sessions. 2013-09-24 11:27:42 -04:00
Julian Arni
e5c90d33fc Fix middleware order in CMS. 
And include Don's fix for partial course_id lookup.
 2013-09-23 15:11:06 -04:00