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
Jean Manuel Nater
3c67e2754a
Merge branch 'master' into jnater/courseware_tests
...
Conflicts:
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/instructor/tests/test_enrollment.py
2013-06-27 13:53:47 -04: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
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
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
Jean Manuel Nater
7f017d0ca9
Addressed pull request feedback
2013-06-26 17:19:13 -04:00
Sarina Canelake
f7d6d14946
Catch InvalidLocationError
2013-06-26 15:24:48 -04:00
Giulio Gratta
50f837d9d8
move marketing iframe breakout script to inside existing conditional
2013-06-26 10:22:59 -07:00
marco
f94ec6cf2a
merge conflicts resolved
2013-06-26 10:47:32 -04:00
marco
84d505e8cc
modified html for discussion home to use tables instead of lists, cleaned up styling as well
2013-06-26 10:41:49 -04:00
Ned Batchelder
46788f31c8
Remove obsolete and distracting SCSS file
2013-06-26 10:12:40 -04: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
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
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
marco
a24c3a9700
updated pinning icons and removed images
2013-06-25 13:28:55 -04:00
marco
05a7d664f7
updated flag icons to be font-awesome based
2013-06-25 13:28:55 -04:00
marco
770bfdc180
removed new post icon and added font-awesome replacement
2013-06-25 13:28:55 -04:00
marco
0f84a52023
new post button using font-awesome
2013-06-25 13:28:55 -04:00
marco
98cd032ade
cleaned up topic header to allow for multiple line titles still being visible
2013-06-25 13:28:55 -04:00
marco
b83d5aa42d
removed icon stack from email area of helpgrid
2013-06-25 13:28:55 -04:00
marco
07e87a54bc
icon color changes and profile link style to match profile page
2013-06-25 13:28:55 -04:00
marco
9fe626469e
sass build cleanup for baseline fixes
2013-06-25 13:28:54 -04:00
marco
74ea364a5a
cleaned up margin and padding to use baseline variable
2013-06-25 13:28:54 -04:00
marco
d648b18d72
removed border to the right of discussion list
2013-06-25 13:28:54 -04:00
marco
b870679673
basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss
2013-06-25 13:28:54 -04:00
marco
52403420fd
cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning
2013-06-25 13:28:54 -04:00
marco
23f19423be
cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references
2013-06-25 13:28:54 -04:00
marco
38d8863ca1
added in vendor font references to lms for font-awesome
2013-06-25 13:19:54 -04:00
marco
8ef258d465
addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown.
2013-06-25 13:19:54 -04:00
marco
46998bd702
basic shell for discussion home page with both profile information and email notification settings
2013-06-25 13:19:53 -04:00
marco
3df08dc1c4
blankslate edited, header bar now with home button
2013-06-25 13:19:53 -04:00
Brian Wilson
332a440539
Enable per-student background tasks.
2013-06-24 18:47:50 -04:00
Jean Manuel Nater
c4c68f516b
Removed some unnecessary imports.
2013-06-24 17:31:49 -04:00
Jean Manuel Nater
799b938d5b
Merge branch 'master' into jnater/courseware_tests
2013-06-24 17:24:42 -04:00
Jean Manuel Nater
1b344e4d4d
Removed some unused functions.
2013-06-24 17:20:59 -04:00
Jean Manuel Nater
7fd1190505
Updated a doc string.
2013-06-24 17:13:33 -04:00
Jean Manuel Nater
986b63d85d
Removed run_wrapped() and replaced its functionality with patch.dict():
2013-06-24 17:07:43 -04:00
Jean Manuel Nater
e44ef1a54e
Removed the use of random.choice()
2013-06-24 16:24:09 -04: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
Ned Batchelder
bec6330c34
Merge pull request #251 from edx/ned/pylint-fixes
...
Ned/pylint fixes
2013-06-24 10:44:35 -07:00
Jean Manuel Nater
32a0a2d29d
In the middle of addressing pull request comments. This is a safety commit in case I have to revert some changes I'm about to make.
2013-06-24 11:13:59 -04:00
Jason Bau
4a98e2eda7
Moves user activation away from just clicking on reset password
...
To following the link in the password reset email
2013-06-23 22:33:54 -07:00
Jason Bau
2eefa494b1
Width of labels for multiple-choice capa problems = width of text
...
Stanford got some feedback from our students/faculty that students
were making accidental clicks on radio-button capa questions.
They would click way to the right of the label text, but it would
still select the corresponding input, which caused some students
to make unintentional changes to their answers. This was because
labels for these inputs were display:block and width:100%
Changing these labels to float:left clear:both should fix it.
2013-06-21 23:46:56 -07:00
mlsteele
88060c0590
Merge pull request #144 from edx/fix/msteele/instructor_tests
...
fix gradebook tests
2013-06-21 19:16:09 -07:00
Juho Kim
ae960ccf5a
analytics service update
2013-06-21 17:40:54 -04:00
