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

19363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dcadams
738ba15322 Fix course url link in enrollment emails. 2013-07-09 11:01:52 -07:00
Ned Batchelder
a6a266d744 Merge pull request #356 from edx/ned/ignore-docstrings-from-nose 
Don't display docstrings when talking about tests, use real test names.
 2013-07-09 10:58:05 -07:00
Ned Batchelder
6a7e291f96 Don't display docstrings when talking about tests, use real test names. 2013-07-09 13:53:46 -04:00
David Baumgold
96d71494e8 Merge pull request #227 from edx/toddi/userdocs-baseline 
Added baseline Sphinx-generated documentation
 2013-07-09 10:41:04 -07:00
Felix Sun
596e1ead29 Merge branch 'felix/hinter2' of https://github.com/edx/edx-platform into felix/hinter2 
Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
 2013-07-09 13:28:27 -04:00
Felix Sun
3418feba52 Added error logging for unparsable answers. 2013-07-09 13:26:02 -04:00
David Baumgold
10c79f5a0e Added entry to changelog regarding press releases 2013-07-09 13:19:29 -04:00
cahrens
d7946efcaf Note about course creator table and rake command change. 2013-07-09 13:15:18 -04:00
cahrens
ee2d874fdc Remove extra blank lines. 2013-07-09 13:12:15 -04:00
David Baumgold
9c3ed54d40 Merge pull request #355 from edx/db/remove-press-releases 
Removed all press releases from repo
 2013-07-09 10:11:48 -07:00
cahrens
283e2b2e60 Don't store abbreviations for state. 2013-07-09 13:07:38 -04:00
David Baumgold
7db77dc525 Remove static_template_view tests 2013-07-09 12:54:50 -04:00
cahrens
01557b26be Move call into authz methods out of model class. 2013-07-09 12:47:54 -04:00
JonahStanley
0bd1e78e03 Acceptance tests use random ports 2013-07-09 12:18:30 -04:00
Toddi Norum
176146e0ec Updated baseline 2013-07-09 11:42:19 -04:00
Toddi Norum
c56b24cfe1 QA checkpoint 2013-07-09 11:42:19 -04:00
Toddi Norum
19c873e4a5 Working HTML docs 2013-07-09 11:42:18 -04:00
Toddi Norum
716e0e2713 Added baseline Sphinx-generated documentation 2013-07-09 11:42:18 -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
cahrens
99584aab23 pep8 cleanup 2013-07-09 11:08:27 -04:00
cahrens
6a49980582 Add tests for permissions. 2013-07-09 11:02:59 -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
cahrens
5cd90d58f5 Clarify documentation. 2013-07-09 10:33:37 -04:00
cahrens
5a3a03c0d4 Change user to foreign key (tracks deletions). 2013-07-09 10:23:38 -04:00
cahrens
0bad62942e Update migrate and syncdb commands so they run on CMS as well, delete obsolete migrate task. 2013-07-09 09:36:28 -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
28142d51f9 Added comment about how the resetting of the database works 2013-07-09 08:54:20 -04:00
JonahStanley
b0d70008e4 Changed when the databases are reset 
This might allow parallel features in the future
 2013-07-09 08:54:20 -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
David Baumgold
433e5e9087 Merge pull request #349 from hikari-boulders/patch-1 
update create-dev-env.sh, change one small character
 2013-07-08 14:14:15 -07:00
cahrens
23ffa2a616 Show note field, update filterable. 2013-07-08 16:55:32 -04:00
cahrens
73f4b1c676 Overloading methods does not work with variable names changed. 2013-07-08 16:43:30 -04:00
cahrens
69a998780a Remove test case moved to test_admin. 2013-07-08 16:10:43 -04:00
cahrens
28115af488 The course creator view adds granted users course creator status. 
Includes unit tests and modifications to authz.py.
 2013-07-08 16:08:06 -04:00
cahrens
5e8e3353ca Pylint/pep8 cleanup. 2013-07-08 16:07:02 -04:00
jkarni
ab4dfc248f Merge pull request #217 from edx/feature/jkarni/jsinput 
Feature/jkarni/jsinput
 2013-07-08 12:51:04 -07:00
Julian Arni
fd6abc88e2 Incorporate review comments 2013-07-08 14:32:02 -04:00
cahrens
2cceda948c Disable test point when run under CMS. 
The template exists when django admin is enabled, but the mappings in CMS' urls.py do not exist.
 2013-07-08 13:12:44 -04:00
Will Daly
e477cceefb Merge pull request #346 from edx/will/disable-flakey-tests 
Disabled tests that are failing in Jenkins
 2013-07-08 09:55:09 -07:00
cahrens
b53899aa54 Merge branch 'master' into christina/course-creator-table 2013-07-08 12:12:04 -04:00
cahrens
293ee0b0ae Update comment. 2013-07-08 12:09:53 -04:00
hikari-boulders
61806b2308 update create-dev-env.sh, change one small character 
in line 470, changed "curl -O" to "curl -OL" such that the scripts runs without problems.
 2013-07-08 17:55:15 +02:00
ichuang
f136edb469 tracking in idashboard should only log json-serializable objects 2013-07-08 11:52:39 -04:00
Sarina Canelake
bc0e590842 Merge pull request #343 from edx/sarina/pylint-R0921 
Ignore Pylint R0921
 2013-07-08 07:53:44 -07:00
Will Daly
7085b95bc0 Disabled video test that was failing on Mac OS X 2013-07-08 10:51:31 -04:00
chrisndodge
57d82dea10 Merge pull request #330 from edx/fix/cdodge/delete-course-delete-drafts 
[STUD-380] Fix/cdodge/delete course delete drafts
 2013-07-08 07:24:24 -07:00
Will Daly
01eb93eb47 Disabled tests that are failing in Jenkins 2013-07-08 10:02:01 -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