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

14939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
JonahStanley
8a9125f121 Test Mongo database is now unique and destroyed in teardown 2013-06-25 11:33:46 -04:00
Brian Wilson
a9a7f97d9b Update CHANGELOG for per-student problem rescoring. 2013-06-25 11:32:45 -04:00
David Baumgold
dddfdc735d Merge pull request #261 from edx/db/notification-event-prevent-default 
Call event.preventDefault() on notification action buttons
 2013-06-25 08:32:21 -07:00
David Baumgold
ddc986f775 Call event.preventDefault() on notification action buttons 
But allow you to specify that the event should not be prevented
 2013-06-25 11:29:42 -04:00
Peter Baratta
4c269c1079 Merge pull request #203 from edx/pbaratta/fix/capa-unicode 
Fix unicode for errors on capa problems
 2013-06-25 06:46:30 -07:00
Valera Rozuvan
08b994b87e Merge pull request #247 from edx/alex/fix_choiceresponse 
removes choiceresponse wiping after clicking Show Answer
 2013-06-25 05:55:27 -07:00
brianhw
3f2d33c580 Merge pull request #254 from edx/fix/brian/rescore-cleanup 
Enable per-student background tasks.
 2013-06-24 15:49:37 -07:00
Brian Wilson
332a440539 Enable per-student background tasks. 2013-06-24 18:47:50 -04:00
Peter Fogg
a28451ab53 Merge pull request #255 from edx/peter-fogg/fix-advanced-settings-lettuce-test 
Fix acceptance tests expecting outdated CSS.
 2013-06-24 14:17:37 -07:00
Peter Fogg
d5d495c24d Fix acceptance tests expecting outdated CSS. 2013-06-24 16:57:14 -04:00
Peter Baratta
3a8f591fe5 Add tests for the diff coverage; fix one hidden unicode bug 2013-06-24 16:49:33 -04:00
Peter Fogg
ad09236c82 Merge pull request #242 from edx/peter-fogg/advanced-backbone-notifications 
Refactor Advanced Settings page to use Backbone notifications.
 2013-06-24 12:37:26 -07:00
Jason Bau
83062c0b7d Tests + Now subclass PasswordResetForm instead of copy 
Changed to subclassing django's PasswordResetForm and
overriding clean_password() instead of copy/paste.
Less lines to worry about for diff-cover this way =)
 2013-06-24 11:54:31 -07:00
David Baumgold
4d2183d764 Merge pull request #253 from edx/db/notifications-secondary-single 
Backbone notifications secondary actions
 2013-06-24 11:48:55 -07:00
Jason Bau
f1825eff81 Update CHANGELOG.rst 2013-06-24 12:19:34 -06:00
Peter Fogg
fb573a1db6 Hide "success" alert as soon as we start editing another field. 2013-06-24 13:59:14 -04:00
Jason Bau
ab7b991e78 Update CHANGELOG.rst 2013-06-24 11:53:59 -06:00
Jason Bau
fde8e5b0a4 Merge pull request #246 from edx/fix/jbau/multiple-choice-label-width 
Change width of labels for multiple-choice capa problems to width of text, not 100%
 2013-06-24 10:52:06 -07:00
David Baumgold
72ffe2d8f2 Backbone notifications secondary actions 
Handle secondary actions on notifications either specified as a single object,
or as a list of objects. Under the hood, the initialize method converts a single
object to a list containing a single object.
 2013-06-24 13:44:50 -04:00
Ned Batchelder
bec6330c34 Merge pull request #251 from edx/ned/pylint-fixes 
Ned/pylint fixes
 2013-06-24 10:44:35 -07:00
Peter Fogg
3e376bd780 Prevent "saved" and "error" views from showing at the same time. 
Previously the "saved" view was never hidden, even after more data was
edited. So if one field was saved successfully and then another was
not, we would find ourselves in the unfortunate situation of seeing
both views at once, leading to much confusion.
 2013-06-24 11:06:53 -04:00
Peter Fogg
72e08456a8 Refactor Advanced Settings page to use Backbone notifications. 2013-06-24 09:48:37 -04:00