Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,693 Commits 1 Branch 0 Tags
2df3fe93440cb8b58bf86fbcc796eaad09be4ce8
Commit Graph

12693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
2df3fe9344 Revert "fix merge conflict" 
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
 2013-04-26 12:40:35 -04:00
Diana Huang
5560a4add4 Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs" 
This reverts commit 57427f9ac5, reversing
changes made to 37621c26cd.
 2013-04-26 12:40:02 -04:00
Calen Pennington
8c54d5d610 Fix accidental force push that reset master 
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410. 5d912b8a is a merge commit
that merged a branch onto master, so I am merging the same commit
back into master.
 2013-04-26 10:50:53 -04:00
Diana Huang
1b344ff06e Merge pull request #1889 from MITx/diana/clean-login-methods 
Move Pearson login to external_auth
 2013-04-25 12:51:21 -07:00
Diana Huang
886e74342d Move the testcenter login to external_auth 
* hide the login behind a setting that is turned off by default
* clean out some of the outdated settings and hardcoded test strings
 2013-04-25 11:12:19 -04:00
cahrens
a7ccbb174b merge 2013-04-24 17:05:08 -04:00
cahrens
c7962cf07b Don't explicitly declare display_name. 2013-04-24 16:41:58 -04:00
Calen Pennington
e43c2bd410 Merge pull request #1886 from MITx/fix/cale/pre-test-tasks 
Make sure to run :predjango before gather_assets so that the xmodule_ass...
 2013-04-24 13:13:51 -07:00
Calen Pennington
1371fe0308 Make sure to run :predjango before gather_assets so that the xmodule_assets command is set up 2013-04-24 15:30:16 -04:00
Calen Pennington
9d94adbd1f Merge pull request #1871 from MITx/feature/cale/fast-dev-server 
Speed up local development
 2013-04-24 12:12:05 -07:00
cahrens
45f86b662a Delete unused file. 2013-04-24 14:59:32 -04:00
cahrens
cc2d06975e Remove duplicated StringyX definitions. 2013-04-24 14:59:32 -04:00
cahrens
9e9886339a Refer to inherited field. 2013-04-24 14:59:31 -04:00
cahrens
e874de1249 Some cleanup TODOs. 2013-04-24 14:59:31 -04:00
cahrens
378b2ba7f7 Delete unused file. 2013-04-24 14:46:35 -04:00
cahrens
9d04908ad1 Remove duplicated StringyX definitions. 2013-04-24 14:40:55 -04:00
Calen Pennington
4d55f87ab1 Add comments on duplicate calls to compile_assets 2013-04-24 12:33:44 -04:00
Calen Pennington
980fb92eef Merge pull request #1873 from MITx/feature/cale/faster-tests 
Speed up testing by running pylint in fewer batches
 2013-04-24 09:29:16 -07:00
Christina Roberts
7315855d18 Merge pull request #1868 from MITx/feature/i18n 
Feature/i18n
 2013-04-24 08:55:55 -07:00
Steve Strassmann
dd71ae818a ModuleStoreTestCase moved to new location 2013-04-24 11:33:47 -04:00
Steve Strassmann
8ab467a9fc add config files for PyBabel and update.py 2013-04-24 11:17:02 -04:00
cahrens
cd2fa7104a Refer to inherited field. 2013-04-24 11:04:45 -04:00
Steve Strassmann
111ec62bb6 merged from master 2013-04-24 10:42:35 -04:00
Steve Strassmann
8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n 2013-04-24 10:41:09 -04:00
cahrens
f69d38bb4c Merge branch 'master' into feature/christina/metadata 2013-04-24 09:48:39 -04:00
Kevin Chugh
57427f9ac5 Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs 
use new API verbs
 2013-04-24 06:47:38 -07:00
ichuang
37621c26cd Merge pull request #1884 from MITx/feature/cale/histogram-rendering 
Only render a histogram for modules that have scores associated with the...
 2013-04-24 05:24:34 -07:00
Calen Pennington
9be7f8fcbb Merge pull request #1882 from MITx/doc/showanswer 
Doc/showanswer
 2013-04-24 04:34:38 -07:00
Calen Pennington
621a935577 Merge pull request #1858 from MITx/feature/ichuang/masquerade-v3 
Allow course staff to masquerade as students in viewing courseware
 2013-04-24 04:17:34 -07:00
ichuang
a307696d67 more showanswer possibilities -> doc 2013-04-23 16:15:46 -04:00
ichuang
bcce41078b add more documentation about showanswer policy key 2013-04-23 16:12:49 -04:00
Your Name
67f57a7145 use new API verbs 2013-04-23 13:28:23 -04:00
Will Daly
57fde4ba15 Merge pull request #1877 from MITx/feature/will/update_testing_docs 
Feature/will/update testing docs
 2013-04-23 09:34:07 -07:00
Your Name
acfd0d9fd6 fix merge conflict 2013-04-23 10:30:51 -04:00
Your Name
e4194c99d8 Merge branch 'master' of github.com:MITx/mitx 2013-04-23 10:28:40 -04:00
Kevin Chugh
d6bc426ecd Merge pull request #1731 from MITx/feature/kevin/pinning_inline 
Feature/kevin/pinning inline
 2013-04-23 07:24:22 -07:00
Steve Strassmann
6f10348836 addressed comments from pull request 2013-04-23 10:07:51 -04:00
Your Name
068e02efd5 make unflag all permissions match javascript 2013-04-22 17:51:48 -04:00
Your Name
3f1d97b065 Merge branch 'master' into feature/kevin/flagging 2013-04-22 17:22:33 -04:00
Your Name
5e73e8f286 Merge branch 'master' of github.com:MITx/mitx 2013-04-22 17:22:24 -04:00
Diana Huang
d7f2d4b710 Merge pull request #1876 from MITx/diana/matlab-input-updates 
Make updates to the MatlabInput InputType
 2013-04-22 13:46:15 -07:00
Diana Huang
32881ed265 Change the name of the button so that it is clearer. 2013-04-22 16:38:41 -04:00
Your Name
30104979e7 fix downvoting url 2013-04-22 16:25:16 -04:00
Your Name
af1c411ddf gentler url diff 2013-04-22 16:23:21 -04:00
Your Name
b8114b9eb2 restore accidentally deleted chunk 2013-04-22 16:17:54 -04:00
Your Name
8a02001a4f minimize diff by restoring function locations 2013-04-22 15:40:19 -04:00
Your Name
385026172e remove double Comment from merge conflict 2013-04-22 15:28:27 -04:00
Christina Roberts
a1360a2710 Merge pull request #1879 from MITx/fix/cdodge/import-can-create-draft-sequences 
when updating the list of children of sequentials, we must use the 'dire...
 2013-04-22 12:17:30 -07:00
Your Name
0bcef4ddb7 fix merge conflicts 2013-04-22 12:54:33 -04:00
Your Name
7994e1b344 pep8 fixes 2013-04-22 12:53:30 -04:00