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

5340 Commits

Author SHA1 Message Date
Chris Dodge
db7434fa18 add comment as to why we are turning off this feature flag 2013-07-12 20:02:23 -04:00
Chris Dodge
1060cf5cec Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRATION feature flag. So when running as mongo-backed, set that to False 2013-07-12 11:51:57 -04:00
mikigoyal
4eb82224f0 Merge pull request #382 from edx/bug/lms-600 
Fix alt text for the login page: LMS-600
 2013-07-12 07:45:50 -07:00
Miki Goyal
5fd84465e2 Fix alt text for the login page: LMS-600 2013-07-12 10:05:13 -04:00
JonahStanley
c37a9e3e23 Refactored problem_setup to use retry_on_exception 2013-07-12 09:28:51 -04:00
JonahStanley
b4036c66cf Refactored the ui tests to use retry_on_exception 2013-07-12 09:28:50 -04:00
JonahStanley
ebc9fa9e2a Made a retry_on_exception world function that will retry the given function 2013-07-12 09:28:50 -04:00
JonahStanley
f1dd81a67a Refactored LMS so all potential stale element exceptions are avoided 2013-07-12 09:28:49 -04:00
Jonah Stanley
50ea165a8e Merge pull request #297 from edx/jonahstanley/refactor-unittest-courses 
Jonahstanley/refactor unittest courses
 2013-07-11 12:44:05 -07:00
John Jarvis
67f8d48840 Merge pull request #367 from edx/jarv/gce-email-backend 
adding option for file based backend
 2013-07-11 08:02:47 -07:00
JonahStanley
676da2d592 Removed set trace 2013-07-11 10:12:10 -04:00
JonahStanley
7fb5f505d6 Refactored out full from the lms tests 2013-07-11 10:12:06 -04:00
Jason Bau
4b59a85dae Merge pull request #336 from edx/fix/jbau/parameterize-s3-upload-bucket-name 
Parameterize aws s3 bucket name for forum uploads
 2013-07-10 14:51:08 -07:00
Jonah Stanley
786f422ffa Merge pull request #298 from edx/jonahstanley/acceptance-tests-unique-database 
Jonahstanley/acceptance tests unique database
 2013-07-10 14:09:28 -07:00
John Jarvis
5b16fbe369 adding option for file based backend 2013-07-10 16:05:37 -04:00
JonahStanley
4685cacc7b Databases are now cleaned properly 
Acceptance_static is used to prevent collect static from using a seed
test.py had its seed removed due to redundancy
 2013-07-10 15:28:23 -04:00
David Baumgold
cb62797306 Merge pull request #347 from edx/update-sass 
Update SASS and Bourbon, add Neat
 2013-07-10 11:09:11 -07:00
David Ormsbee
7993d5c1fc Merge pull request #348 from edx/bugfix/ichuang/idasbhoard-track-json 
tracking in idashboard should only log json-serializable objects
 2013-07-10 10:17:30 -07:00
Adam
2af1132894 Merge pull request #350 from edx/fix/adam/less-noise 
move setting changes in tests to override_settings
 2013-07-10 09:48:55 -07:00
dcadams
a5f8607c7e Merge pull request #357 from edx/bugfix/dcadams/enroll_emails 
Fix course url link in enrollment emails.
 2013-07-10 09:47:53 -07:00
ihoover
bec731207a Merge pull request #362 from edx/ihoover/login_enrollment_refactor 
refactor login and enrollment test cases to use the mongo modulestore
 2013-07-10 08:06:32 -07:00
ihoover
5a03d93000 refactor login and enrollment test cases to use the mongo modulestore 
added namee to authors file
 2013-07-10 10:34:14 -04:00
Adam Palay
d056c8a8f2 replace test setting changes with test-specific mock.patch.dicts 2013-07-10 10:18:58 -04:00
Frances Botsford
a0962cc3b9 updated sass transitions to use newer bourbon syntax 2013-07-10 09:18:00 -04:00
Frances Botsford
3748cae7b8 updated broken transition sass rule 2013-07-10 09:18:00 -04:00
Frances Botsford
4187090dac removed non-existent sass extends from LMS: .table-wrapper, .dullify, .trans, .problem-set 2013-07-10 09:17:59 -04:00
David Baumgold
27796219c7 Changed @include background-size() to background-size 
Bourbon's background-size mixin has been deprecated, and they recommend to use the
official spec.
 2013-07-10 09:17:58 -04:00
David Baumgold
5bd79a8669 Changed @include box-shadow() to box-shadow 
Bourbon's box-shadow mixin has been deprecated, and they recommend to use the
official spec.
 2013-07-10 09:17:58 -04:00
David Baumgold
41374838cb Changed @include border-radius() to border-radius 
The official border-radius mixins were deprecated and removed in Bourbon 3.0.
https://github.com/thoughtbot/bourbon/pull/95
 2013-07-10 09:17:58 -04:00
dcadams
e1a0499678 Added test for email body containing course url and some pep8 fixes. 2013-07-09 14:25:06 -07:00
Adam Palay
e123a5f8ad fix to problems with uploading files 2013-07-09 15:00:53 -04:00
ichuang
a2b552d05f use unicode instead of str for casting track.views args in idashboard 2013-07-09 14:24:23 -04:00
Ned Batchelder
1dbbbb104f Merge pull request #351 from edx/ned/make-tests-quieter 
Provide a null log function for OpenID to keep it from spewing during tests
 2013-07-09 11:17:44 -07:00
dcadams
738ba15322 Fix course url link in enrollment emails. 2013-07-09 11:01:52 -07:00
David Baumgold
7db77dc525 Remove static_template_view tests 2013-07-09 12:54:50 -04:00
JonahStanley
0bd1e78e03 Acceptance tests use random ports 2013-07-09 12:18:30 -04:00
David Baumgold
caa2cf0d76 Removed all press releases from repo 
They are on the Drupal site now
 2013-07-09 11:38:15 -04:00
ichuang
6333a9ab29 Merge pull request #344 from edx/ichuang/fix-idashboard-extra-bracket 
remove extra bracket which had crept into instructor dashboard
 2013-07-09 07:52:13 -07:00
JonahStanley
a21303ba96 Found some other places where the name should be unique 2013-07-09 10:49:19 -04:00
JonahStanley
a2020aad03 Changed the lms database name to be different for the acceptance tests 2013-07-09 09:31:37 -04:00
JonahStanley
1eaa0317c4 Using parent process id for random number 
This is to allow acceptance tests to properly link and know the names of its other parts
 2013-07-09 08:57:05 -04:00
JonahStanley
789b711023 Acceptance tests now pull from their own unique database 
These databases/collections are cleared after harvest
 2013-07-09 08:54:19 -04:00
ichuang
f136edb469 tracking in idashboard should only log json-serializable objects 2013-07-08 11:52:39 -04:00
Carlos Andrés Rocha
1fbab8e9fa Merge pull request #295 from edx/rocha/celery-virtual-host 
Add setting to set the virtual host of a Celery broker
 2013-07-08 06:58:31 -07:00
ichuang
ec20f568ea remove extra bracket which had crept into instructor dashboard 2013-07-08 08:17:38 -04:00
Carlos Andrés Rocha
06529054de Merge hotfix 2013-07093 into master 
Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
	common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
	common/static/coffee/src/logger.coffee
	common/templates/hinter_display.html
	lms/envs/test.py
	lms/urls.py
 2013-07-03 18:55:21 -04:00
Jason Bau
7bc52394ad Parameterize aws s3 bucket name for forum uploads 
especially since s3 namespace is _global_
 2013-07-03 15:26:32 -07:00
Ned Batchelder
759b486586 Provide a null log function for OpenID to keep it from spewing during tests. 2013-07-03 17:58:42 -04:00
Ned Batchelder
31a72093e0 Fix broken tests by simplifying the CourseFactory 
The data argument was being treated specially, but that was just
because we didn't have **kwargs support.  Now we do.  There are
two uses of data=, one we convert to kwargs, the other was actually
unused, so remove it completely.
 2013-07-03 17:04:18 -04:00
Ned Batchelder
a453de2fca Merge pull request #323 from edx/ned/fix-lms-530 
Fix LMS-530: Reflected XSS in chapter and page numbers
 2013-07-03 12:28:19 -07:00