Chris Dodge
345d2af540
address review feedback
2013-07-23 12:15:56 -04:00
Chris Dodge
565564a46e
add input/output information in doc strings
2013-07-23 12:15:56 -04:00
Chris Dodge
e24eb3e4eb
added explicit unit test to verify the link rewriting
2013-07-23 12:15:55 -04:00
Chris Dodge
80e0b99342
add a reference in the toy course to the test jump_to_id HTML module
2013-07-23 12:11:41 -04:00
Brian Talbot
059450c0de
Studio: revises HTML and styling around new unit ID on unit view
2013-07-23 12:10:49 -04:00
Chris Dodge
63c5cfda94
add comment and fix mistake in test
2013-07-23 12:10:49 -04:00
Chris Dodge
1c79b9c874
add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio
2013-07-23 12:10:49 -04:00
Peter Fogg
6eac259c08
Merge pull request #415 from edx/peter-fogg/notification-stories
...
Peter fogg/notification stories
2013-07-23 09:05:10 -07:00
Peter Fogg
69e8d4d32f
Merge pull request #469 from edx/peter-fogg/fix-stud-486
...
Trim whitespace when adding course authors.
2013-07-23 09:01:25 -07:00
chrisndodge
8c94be8083
Merge pull request #436 from edx/fix/cdodge/stop-using-unmunged-urlnames-as-display-names
...
change from_xml class method on video class to make sure we honor the fa...
2013-07-23 08:33:27 -07:00
Brian Talbot
1da5af53d9
Studio: revises styling/message copy for authorship rights request error
2013-07-23 10:37:07 -04:00
cahrens
3d49a46197
Add error handler.
2013-07-23 10:16:45 -04:00
David Baumgold
89705f275d
Merge pull request #461 from edx/db/change-asset-to-pdf
...
Change "asset" to "PDF" in textbooks interface
2013-07-23 06:49:39 -07:00
Sarina Canelake
4ee16f1664
Add diff-quality rake task (rake quality)
2013-07-23 09:16:35 -04:00
Calen Pennington
4c3a017486
Merge pull request #462 from edx/cale/use-xblock-children-api
...
Make XModuleDescriptor use the XBlock children API
2013-07-23 04:56:44 -07:00
Alexander Kryklia
1eaba8b0b4
Merge pull request #41 from edx/alex/word_cloud_course_factory
...
Word cloud tests
2013-07-23 04:47:38 -07:00
Adam Palay
2b40462263
convert all datetime.now() to datetime.now(UTC)
2013-07-22 17:39:11 -04:00
Adam Palay
b2b3a50400
convert datetime.now() to datetime.now(UTC) for xqueue
2013-07-22 17:39:11 -04:00
Adam Palay
b744aaa360
make sure parsed times are set to UTC
2013-07-22 17:39:11 -04:00
Adam Palay
af522af2ca
formatting
2013-07-22 17:39:11 -04:00
Brian Talbot
0833181ecc
Studio: updates older extend references and solves Sass warnings/dupe display of accessibility-based text
2013-07-22 16:30:26 -04:00
Brian Talbot
4a3b680ee6
Merge pull request #447 from edx/talbs/studio-fix-title
...
Studio: adds a space back to the phrase 'Welcome to edX Studio'
2013-07-22 13:27:46 -07:00
Calen Pennington
a9fb82cae6
Make XModuleDescriptor use the XBlock children API
...
N.B. When we are in a world of mixed XModules and XBlocks, the
system/runtime will have to be cognizant of that when asked to return a
XModule from an XModuleDescriptor child
[#LMS-190]
2013-07-22 16:15:57 -04:00
Peter Fogg
305bc23d68
Merge pull request #465 from edx/peter-fogg/fix-stud-485
...
Correctly persist checklist settings.
2013-07-22 13:09:37 -07:00
Peter Fogg
060b2e17e5
Trim whitespace when adding course authors.
2013-07-22 15:58:22 -04:00
marco
820544c1c4
pin and flag icons using fontawesome now render properly through inline discussions
2013-07-22 15:36:44 -04:00
marco
5b3cb53689
visual cleanup for discussion home bar
2013-07-22 15:17:10 -04:00
Peter Fogg
d87dba9e04
Correctly persist checklist settings.
...
Incidentally, fixes an acceptance test (which would have caught this
bug) not running. Its step regex was "They are correctly selected
after I reload the page$", which happens to be matched by "I reload
the page$", another step definition. Lettuce seems to arbitrarily pick
between definitions if they both match a step, so it's good to ensure
that each step isn't a sub-regexes of another.
2013-07-22 15:10:59 -04:00
Greg Price
e6fd3b38d6
Merge pull request #459 from edx/gprice/notification-setting-endpoints
...
Add endpoints to set user notification preference
2013-07-22 11:55:06 -07:00
cahrens
5168a080ff
Don't add users marked with is_staff to course creation table.
2013-07-22 14:45:22 -04:00
Julian Arni
4f9a290a32
Link section to course outline
2013-07-22 14:26:47 -04:00
marco
747102cfc2
additional git rebase cleanup
2013-07-22 14:09:40 -04:00
marco
83b4dc634a
final cleanup from git rebase
2013-07-22 13:51:52 -04:00
marco
3495cebf31
modified html for discussion home to use tables instead of lists, cleaned up styling as well
2013-07-22 13:46:47 -04:00
marco
9eca557761
updated flag icons to be font-awesome based
2013-07-22 13:44:19 -04:00
marco
646ff9ea75
removed new post icon and added font-awesome replacement
2013-07-22 13:43:19 -04:00
marco
d8498bfbcf
new post button using font-awesome
2013-07-22 13:43:19 -04:00
marco
78ffc12ae0
cleaned up margin and padding to use baseline variable
2013-07-22 13:39:14 -04:00
marco
a9ea00aa27
removed border to the right of discussion list
2013-07-22 13:38:31 -04:00
marco
e87d07184d
basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss
2013-07-22 13:20:27 -04:00
marco
e2f02cdf46
cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning
2013-07-22 13:16:09 -04:00
marco
37c9de7a01
cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references
2013-07-22 13:07:53 -04:00
marco
2c9e4ca54a
addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown.
2013-07-22 13:04:07 -04:00
David Baumgold
ca2bb0e850
PDF Upload button now refers to "PDF" rather than "asset"
2013-07-22 12:54:31 -04:00
David Baumgold
b51aa31231
PDF uploader dialog refers to "PDF" instead of "asset"
2013-07-22 12:54:16 -04:00
Peter Fogg
e3e6fd2002
Remove commented-out code and add test.
2013-07-22 12:33:01 -04:00
David Baumgold
f780369afa
Merge pull request #453 from edx/yarko/vagrant-up-fix
...
Fixes for `vagrant up`
2013-07-22 09:29:54 -07:00
cahrens
6629d5d3a3
Merge branch 'master' into talbs/studio-authorship
...
Conflicts:
cms/djangoapps/contentstore/views/user.py
cms/static/sass/elements/_controls.scss
cms/templates/activation_active.html
cms/templates/activation_complete.html
cms/templates/activation_invalid.html
2013-07-22 12:15:42 -04:00
Sarina Canelake
4cd99c192c
Update diff-cover to latest version
2013-07-22 12:02:31 -04:00
marco
38e040ae0d
basic shell for discussion home page with both profile information and email notification settings
2013-07-22 11:55:29 -04:00
