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

14968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Jarvis
f6d7cc5516 save the cert record immediately after we set the status 
There was a potential though unlikely race condition because the .save()
was after the certificate request was put on the queue.

Now calling .save() immediately after we update the
cert.
 2013-06-27 15:57:51 -04:00
Will Daly
18c1bcdf12 Merge pull request #283 from edx/will/recover-jasmine-test-results 
Fix: deleting JS test reports in Jenkins
 2013-06-27 12:10:36 -07:00
Jay Zoldak
894d44a0d9 Merge pull request #286 from edx/zoldak/fix-discussion-override 
Make the UrlResetMixin load the urlconf after resetting it, and fix the ...
 2013-06-27 09:27:38 -07:00
Will Daly
ed57e7e555 Used dependency to ensure that REPORT_DIR exists before cleaning. 
This allows the build to pass in Jenkins
 2013-06-27 11:43:11 -04:00
Sarina Canelake
02a24716c6 Merge pull request #278 from edx/sarina/fix-modulestore-500s 
Catch InvalidLocationError
 2013-06-27 08:33:45 -07:00
Jay Zoldak
c98a77565f Make the UrlResetMixin load the urlconf after resetting it, and fix the comment client test that was leaving ENABLE_DISCUSSION_SERVICE at True 2013-06-27 11:05:09 -04:00
Christina Roberts
2b6d338d2d Merge pull request #276 from edx/christina/python-problem 
Make the problem handle empty fields and non-integers correctly.
 2013-06-27 06:44:53 -07:00
Peter Fogg
4b5fe427ed Merge pull request #282 from edx/peter-fogg/fix-default-videos 
Fix Lyla showing up everywhere.
 2013-06-27 06:19:56 -07:00
Calen Pennington
984fd2bc8b Merge pull request #281 from edx/cale/use-separate-venv-for-parallel-builds 
Use separate venv for parallel builds
 2013-06-27 06:11:35 -07:00
Calen Pennington
6e357db24c Merge pull request #268 from edx/dhm/cosmetic-cleanup 
Cosmetic Cleanups Incidental to Next Gen Modulestore Implementaton
 2013-06-27 05:44:49 -07:00
dcadams
6831e84834 Merge pull request #214 from edx/dcadams/email-on-invite 
Dcadams/email on invite
 2013-06-26 15:53:15 -07:00
dcadams
306ac48210 Email on enroll/un-enroll actions 
Optionally email students on enroll/un-enroll actions
by instructor from enrollment tab in LMS.
 2013-06-26 15:28:36 -07:00
Will Daly
9336ffde94 Added clean reports dependency to rake JavaScript test tasks. 
This ensures that `rake test` will clean the report directories
*before* running the JS tests.
 2013-06-26 17:14:12 -04:00
Brian Talbot
06b9390cfa Merge pull request #225 from edx/talbs/studio-sassvars 
Studio - revises transparent Sass color vars to use rgba() method
 2013-06-26 14:02:34 -07:00
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
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
cahrens
bb8c62d84c Make the problem handle empty fields and non-integers correctly. 2013-06-26 12:33:55 -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
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
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