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

15584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
2a49d087de studio - revises transparent Sass color vars to use rgba() method 2013-06-26 17:02:02 -04:00
caesar2164
d9fc21fc1b Merge pull request #277 from edx/giulio/enable-iframe 
move marketing iframe breakout script to inside existing conditional
 2013-06-26 14:01:48 -07:00
Peter Fogg
ee5389800a Fix Lyla showing up everywhere. 
Previously XML data wasn't parsed in VideoDescriptor.__init__, leading
to the defaults being used for video settings.
 2013-06-26 16:30:13 -04:00
Calen Pennington
dec20d76bc Use separate venv for parallel builds 2013-06-26 16:25:44 -04:00
JonahStanley
621777e6ae Explicitly test the creation and deletion of every component type 
The testing of all settings/text editing have been done elsewhere and should be done when testing a new component
 2013-06-26 16:01:31 -04:00
Sarina Canelake
f7d6d14946 Catch InvalidLocationError 2013-06-26 15:24:48 -04:00
Don Mitchell
b985a7f128 Remove unused template 2013-06-26 14:19:34 -04:00
Don Mitchell
1344b1e521 Make SessionKeyValueStore variable names clearer 2013-06-26 14:19:33 -04:00
Don Mitchell
65b3bcdba6 Clean up variable naming 2013-06-26 14:19:33 -04:00
Don Mitchell
ff6ba014ce Remove noop if statement 2013-06-26 14:19:33 -04:00
Don Mitchell
391ed8c964 Add docstring to CourseDescriptor.__init__ 2013-06-26 14:19:33 -04:00
Renzo Lucioni
2cd18dfad3 Merge pull request #263 from edx/renzo/segment-io-whitelist-expansion 
Add handful of events to the Segment.io whitelist
 2013-06-26 10:41:11 -07:00
Giulio Gratta
50f837d9d8 move marketing iframe breakout script to inside existing conditional 2013-06-26 10:22:59 -07:00
Julian Arni
b03d93901f Pass arguments from ctxCall forward to set state 2013-06-26 12:36:04 -04:00
Julian Arni
9d49a0e8b9 Fix check for waitfor attr 2013-06-26 12:35:34 -04:00
cahrens
bb8c62d84c Make the problem handle empty fields and non-integers correctly. 2013-06-26 12:33:55 -04:00
Frances Botsford
6e606291da Merge remote-tracking branch 'origin/release' into rc/2013-06-26 2013-06-26 12:30:18 -04:00
jkarni
38d7ddf024 Merge pull request #245 from edx/jkarni/feature/createdevfolder 
Greater dir naming flexibility.
 2013-06-26 08:19:11 -07:00
Christina Roberts
c5851d39e9 Merge pull request #266 from edx/christina/course-create-permissions 
New course creator group.
 2013-06-26 08:15:14 -07:00
cahrens
e487521289 Update for change in add_user_to_creator_group API. 2013-06-26 10:52:26 -04:00
cahrens
4a697a8da1 Verify that caller of add or remove from creator group is staff. 2013-06-26 10:52:26 -04:00
cahrens
190c07d954 Add smoke coverage for add and remove of course group permissions. 2013-06-26 10:52:26 -04:00
cahrens
2c60a7dbc1 pep8 cleanup 2013-06-26 10:52:26 -04:00
Ned Batchelder
6e5c861018 Merge pull request #272 from edx/fix/LMS-500 
Fix LMS-500: Random class in random module was None
 2013-06-26 07:49:54 -07:00
cahrens
318372f2c0 Introduce course creator group. 2013-06-26 10:48:31 -04:00
Ned Batchelder
46788f31c8 Remove obsolete and distracting SCSS file 2013-06-26 10:12:40 -04:00
Alexander Kryklia
72aa56a45e updated CHANGELOG.rst 2013-06-26 13:00:15 +03:00
Jason Bau
c41c102b7a Update CHANGELOG.rst 2013-06-25 21:37:20 -06:00
Jason Bau
4a3165414d Merge pull request #84 from edx/feature/jbau/activation-after-password-reset-confirm 
Moves user activation from just clicking on reset password to following the link in the password reset email
 2013-06-25 20:34:19 -07:00
Jason Bau
734440f4b9 Refactored tests 2013-06-25 20:21:20 -07:00
Don Mitchell
d9575a0874 Remove traling commas to make json valid 2013-06-25 22:34:36 -04:00
Don Mitchell
b42fe277d4 Add serial commas to modulestore definitions 2013-06-25 22:34:36 -04:00
Don Mitchell
8b23eeca7e Minor pylint/whitespace changes 2013-06-25 22:34:29 -04:00
Renzo Lucioni
3f49da385f Swap Logger call from check_fd to check 2013-06-25 17:22:05 -04:00
Jay Zoldak
fe82e865aa Merge pull request #267 from edx/zoldak/fix-acceptance-xcontent 
Specify a different xcontent mongo db for the acceptance tests
 2013-06-25 14:04:30 -07:00
Jay Zoldak
6c66736e3c Specify a different xcontent mongo db for the acceptance tests 2013-06-25 16:56:36 -04:00
Christina Roberts
9dad14c48e Merge pull request #265 from edx/christina/activation-email 
Don't mention edge in the subject line; use same message for edx and edg...
 2013-06-25 13:21:51 -07:00
Carlos Andrés Rocha
94e1746500 Merge pull request #258 from edx/rocha/pre-external-grader-cleanup 
Cleanup before adding external grader
 2013-06-25 13:17:11 -07:00
Julian Arni
1e0702f374 Allow nested object methods for the grade and state functions 2013-06-25 16:14:34 -04:00
Renzo Lucioni
881d63dae7 Fixed Jasmine tests in light of Logger changes, and wrote test to cover case where data passed is not a dictionary 2013-06-25 16:04:00 -04:00
Will Daly
68c0f04462 Merge pull request #264 from edx/will/update-diff-cover-v0.1.3 
Updated diff-cover to version 0.1.3 to fix a bug
 2013-06-25 12:45:16 -07:00
cahrens
401dc82c46 Don't mention edge in the subject line; use same message for edx and edge. 2013-06-25 15:35:47 -04:00
Renzo Lucioni
84f4361d52 Avoid changing format of data sent to our logs, and prevent problem_check event from firing twice 2013-06-25 15:33:16 -04:00
Renzo Lucioni
bcbce3eff0 Add handful of events to the Segment.io whitelist 2013-06-25 15:33:16 -04:00
Jonah Stanley
b14553d867 Merge pull request #220 from edx/jonahstanley/make-units-parallel 
Jonahstanley/make units parallel
 2013-06-25 11:44:01 -07:00
Ned Batchelder
ed62c5a6f9 Fix LMS-500: Random class in random module was None 
Deleting the module object isn't needed to replace it, and deleting
a module object causes all of its attributes to be set to None.
 2013-06-25 14:23:16 -04:00
Carlos Andrés Rocha
e4ee1c6c9b Rename arguments of modx_dispatch and handle_ajax related functions 
Refactor a bit modx_dispatch
 2013-06-25 13:38:57 -04:00
Carlos Andrés Rocha
2f02496c8f Reorder imports on module_render 2013-06-25 13:31:53 -04:00
brianhw
397583e1ab Merge pull request #262 from edx/fix/brian/changelog 
Update CHANGELOG for per-student problem rescoring.
 2013-06-25 10:24:42 -07:00
Will Daly
c0805c334d Updated diff-cover to version 0.1.3 to fix a bug 2013-06-25 13:23:13 -04:00