Commit Graph

7051 Commits

Author SHA1 Message Date
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
Juho Kim
513c01b166 bringing up to master 2013-06-21 17:39:38 -04:00
Ned Batchelder
5a5d425eb3 Files that may not exist need F0401 suppressed during import. 2013-06-21 17:33:23 -04:00
Ned Batchelder
45815e2d03 Remove obsolete file comment_client/legacy.py 2013-06-21 17:33:23 -04:00
Ned Batchelder
57909ce1aa Fix all W0602, global used but no assignment done. 2013-06-21 17:33:23 -04:00
Ned Batchelder
df4b512b6f Change wildcard imports into specific imports 2013-06-21 17:33:06 -04:00
Jean Manuel Nater
1b94050ef6 Merge branch 'master' into jnater/courseware_tests
Conflicts:
	lms/djangoapps/open_ended_grading/tests.py
2013-06-21 16:38:31 -04:00
Ned Batchelder
e045860cb6 Pylint complains if you use string, even if you use it for what its still meant to be used for. 2013-06-21 16:35:47 -04:00
Ned Batchelder
bea50efc26 Remove the unused smart-accordion lettuce feature, and the code it used. 2013-06-21 16:30:33 -04:00
Jean Manuel Nater
9bfddd4891 Addressed pull request feedback. 2013-06-21 14:05:57 -04:00
Sarina Canelake
75b355c337 Remove unused reactivation email function 2013-06-21 13:12:18 -04:00
Jason Bau
07e56ac43b Merge pull request #67 from edx/features/jbau/stanford-shib
Shibboleth Auth
2013-06-21 09:32:30 -07:00
JonahStanley
b847930579 Changed a click to css_click and fixed earlier typo 2013-06-21 09:38:43 -04:00
Jason Bau
aa4e27f775 Shib PR responses to @cpennington and @ormsbee comments
* Changed unicode test cases to ascii encoding
* Removed 'stanford' hardcoding in TOS logic in lieu of
  'SHIB_DISABLE_TOS' MIT_FEATURES flag
* made 'external_auth' always an installed_app in lms
* log.exception changd to log.error where appropriate

But: did not change skipping tests to changing settings, for
reasons stated here:
https://github.com/edx/edx-platform/pull/67#issuecomment-19790330
2013-06-20 18:12:20 -07:00
Ned Batchelder
3eec09b87a Merge pull request #216 from edx/ned/remove-unused-imports
Ned/remove unused imports
2013-06-20 14:15:31 -07:00
Calen Pennington
d06a9a2043 Merge pull request #219 from edx/cale/remove-simplewiki
Remove simplewiki from the codebase
2013-06-20 13:43:38 -07:00
Calen Pennington
5344434259 Merge pull request #218 from edx/cale/pep8-e128
Clean up pep8 E128 issues
2013-06-20 13:42:43 -07:00
Jonah Stanley
b7f745c737 Merge pull request #228 from edx/jonahstanley/fix-flakey-tests
Jonahstanley/fix flakey tests
2013-06-20 13:14:21 -07:00
JonahStanley
281f900389 Changed format of docstring 2013-06-20 15:40:58 -04:00
JonahStanley
eec095a195 Changed naming of attempts to max_attempts and changed css_selector 2013-06-20 15:38:56 -04:00
JonahStanley
96c4d2877f Navigation now has a click success condition 2013-06-20 14:05:00 -04:00