Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,856 Commits 1 Branch 0 Tags
8a84e6790bdca4d44f8d132766db75544670a012
Commit Graph

5797 Commits

Author SHA1 Message Date
ichuang
0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-08-20 23:40:09 -04:00
ichuang
95952bd693 add tests of static_asset_path and importing with no static; 
fix (again) static_replace to work with static_asset_path
 2013-08-20 23:30:26 -04:00
ichuang
91bf6ad86d remove extra debugging line from courses.py 2013-08-20 18:11:40 -04:00
ichuang
fedfa7cab7 fix tabs.py to properly handle static_asset_path 2013-08-20 18:09:57 -04:00
ichuang
2fe4895e43 more static_asset_path handling in courses.py 2013-08-20 18:09:27 -04:00
ichuang
210fa112f3 modify handling of info/handouts and module_render to honor static_asset_path 2013-08-20 18:08:01 -04:00
Miles Steele
cb7a3ad8eb switch from log_event to Logger.log 
keep log_event for compatibility
 2013-08-20 16:52:18 -04:00
Christina Roberts
1a8b2fa0eb Merge pull request #735 from edx/fix/cdodge/pylint-violations 
address some pylint violations in the mixedmodulestore build report
 2013-08-20 05:42:55 -07:00
chrisndodge
c33571ff98 Merge pull request #732 from edx/fix/cdodge/get_items_needs_courseid 
Fix/cdodge/get items needs courseid
 2013-08-19 21:26:12 -07:00
Chris Dodge
6a3dafeed6 update hint manager to pass in a course_id when dereferencing a module 2013-08-19 23:42:27 -04:00
Chris Dodge
bc5e27fe17 update some more call sites in LMS to always pass in a course_id 2013-08-19 23:42:26 -04:00
Chris Dodge
a16aee340a get_items should take a course_id 2013-08-19 23:42:26 -04:00
Chris Dodge
2e1eb1dce5 add escaping 2013-08-19 23:41:49 -04:00
Chris Dodge
f599d4b508 don't put the substitutions in quotes 2013-08-19 23:41:49 -04:00
Chris Dodge
352e56eb4e address some pylint violations in the mixedmodulestore build report 2013-08-19 23:40:46 -04:00
Jonah Stanley
73ad057eff Merge pull request #710 from edx/jonahstanley/help-acceptance-test 
Jonahstanley/help acceptance test
 2013-08-19 14:02:29 -07:00
Adam Palay
cb3429570c set first FAQ link to mktg webiste too 2013-08-19 16:34:17 -04:00
Adam
bd45103fe9 Merge pull request #728 from edx/fix/adam/dash-delete 
fixes delete state on dashboard
 2013-08-19 07:45:59 -07:00
Diana Huang
9469991f52 Merge pull request #713 from edx/diana/button-updates 
Drupal side Register button updates
 2013-08-19 07:28:45 -07:00
Brian Talbot
fc4eb3786a mktg - revised sass/css for iframed button to match styles/consistency 2013-08-19 10:25:29 -04:00
Adam Palay
2e47d61cef fixes delete state on dashboard 2013-08-19 10:22:42 -04:00
JonahStanley
ce5d9b93b1 Added the full range of help modal options 
Fixed pylint violations
 2013-08-19 09:56:57 -04:00
chrisndodge
7aa4418934 Merge pull request #723 from edx/fix/cdodge/bad-links-can-cause-exception-on-rewrite 
Fix/cdodge/bad links can cause exception on rewrite
 2013-08-19 06:33:55 -07:00
ichuang
220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py
 2013-08-19 08:24:35 -04:00
Anton Stupak
7a68516d12 Fix formatting. 2013-08-19 10:39:52 +03:00
Anton Stupak
a921e44aa3 Fix steps. 2013-08-19 10:39:52 +03:00
Anton Stupak
d848477596 Remove unecessary assert. 2013-08-19 09:10:50 +03:00
Chris Dodge
033f922ec0 add a try catch around the staticstorage lookup, which can throw an exception 2013-08-17 10:33:59 -04:00
chrisndodge
594a73d437 Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore 
Feature/cdodge/add a mixed modulestore
 2013-08-17 07:32:51 -07:00
chrisndodge
8ba3214cd4 Merge pull request #496 from edx/feature/cdodge/add-a-mixed-modulestore 
Add a 'MixedModuleStore' which aggregates between XML and Mongo Modulestores
 2013-08-16 13:02:31 -07:00
JonahStanley
fc899ab116 Stylistic change and factored out method to common 2013-08-16 15:30:35 -04:00
Diana Huang
af76997ccd Add in a uniqueness constraint on mode, course, and currency. 2013-08-16 15:26:57 -04:00
Carlos Andrés Rocha
4e0f3d0791 Merge pull request #706 from rocha/enable-django-nose-for-all 
Enable the django_nose app by default
 2013-08-16 11:29:43 -07:00
Frances Botsford
d4ea8388a6 updated styling for marketing side register button to accommodate second line of text - and IE-specific styling 2013-08-16 11:28:07 -04:00
JonahStanley
43bee86074 Tightened up wording 2013-08-16 11:08:05 -04:00
JonahStanley
967fdee6bc Made filling field a bit safer 2013-08-16 10:55:14 -04:00
JonahStanley
97f70e8598 Fixed wording to better reflect BDD specs 2013-08-16 10:52:20 -04:00
Frances Botsford
445cf39f8b updated styling for marketing side register button to accommodate second line of text 2013-08-16 10:39:45 -04:00
JonahStanley
fc67c2ee6b Wrote preliminary help modal acceptance tests 2013-08-16 10:36:12 -04:00
Adam Palay
8aee225136 in grading, if problem cannot be created, return score as none 2013-08-16 10:25:38 -04:00
Chris Dodge
cf715cb727 fix pylint violations 2013-08-15 22:58:04 -04:00
Chris Dodge
61219169d4 change over the modulestore configuration to be a dict and use a property accessor. Also update some django-admin configs to use this means to set the runtime configuration 2013-08-15 22:58:04 -04:00
Chris Dodge
5ee5beafbe fix bad merge conflict resolution 2013-08-15 22:58:03 -04:00
Chris Dodge
aa8b054590 fix missed conflict resolution 2013-08-15 22:58:03 -04:00
Chris Dodge
5298f54f4c fix tests 2013-08-15 22:58:02 -04:00
Chris Dodge
cff93d324b WIP 2013-08-15 22:58:02 -04:00
Chris Dodge
82988972ad WIP: added a get_modulestore_type. Added some unit tests. changed over the isinstance() with respect to modulestores to use this get_modulestore_type() 2013-08-15 22:58:02 -04:00
Chris Dodge
b5253b52b6 add a set_modulestore_configuration to the modulestore interface. This can be used to pass in settings run the Django tier 2013-08-15 22:56:32 -04:00
Chris Dodge
6f11b98b4f initial commit for a mixed module store which can interoperate with both XML and Mongo module stores 2013-08-15 22:56:32 -04:00
Carlos Andrés Rocha
bbfe3662e2 Enable the django_nose app by default 
The django_nose it is very useful, even outside the test
environment. For example, it lets you to easily run test from
manage.py without additional changes to the test packages.
 2013-08-15 19:31:30 -04:00