Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• aad6dc4345 Merge pull request #417 from edx/ihoover/feature_flag_auto_auth ihoover 2013-07-25 08:11:22 -07:00
• 5365d54202 Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui Vik Paruchuri 2013-07-25 11:09:53 -04:00
• c80a05f4d8 Merge pull request #471 from edx/giulio/fix-tooltips Sarina Canelake 2013-07-25 08:03:23 -07:00
• 30baebd7b5 Merge pull request #494 from edx/renzo/blank-problem-score Renzo Lucioni 2013-07-25 07:56:15 -07:00
• 2efcb0cdca Change default names for various LMS components Adam Palay 2013-07-24 10:09:12 -04:00
• 1bcafd32a9 Make the service-variant flag on manage.py longform only Calen Pennington 2013-07-25 09:34:51 -04:00
• d95693ebb7 hook up panel to new stats service Kevin Chugh 2013-07-25 03:23:04 -04:00
• 214a814b94 Adjustment to show sequence tool tips in LMS Giulio Gratta 2013-07-22 14:24:09 -07:00
• 5d106ee048 Merge branch 'master' into feature/kevin/email_notifications_panel Kevin Chugh 2013-07-25 00:31:42 -04:00
• 6923687c8e Merge pull request #460 from edx/sarina/update-diffcover Sarina Canelake 2013-07-24 20:18:15 -07:00
• fd304c4681 Change git clone protocal to https Trinh Nguyen 2013-07-25 07:48:19 +07:00
• 56883d65a1 csrf test fix ihoover 2013-07-23 18:58:34 -04:00
• 1a0055ae77 Blank common and advanced problems now display an inline score of '0 points' upon creation. Renzo Lucioni 2013-07-24 16:44:22 -04:00
• a569a5f6a7 Merge pull request #490 from edx/cale/make-cms.dev-environment-work-with-manage.py Calen Pennington 2013-07-24 13:26:50 -07:00
• e223d753e3 Merge pull request #489 from edx/dhm/export_policy Don Mitchell 2013-07-24 12:54:32 -07:00
• d2eca92f93 edx.org: abstracting new edx.org button extends and colors with other themes in mind Brian Talbot 2013-07-24 14:56:27 -04:00
• 95478a3499 edx.org: revising base link color variable to use darker value for accessibility Brian Talbot 2013-07-24 11:52:25 -04:00
• 3094471efc edx.org: revises iframe-based register/status buttons to match revised styles Brian Talbot 2013-07-24 11:40:37 -04:00
• cc95d004b5 edx.org: handles letter-spacing on buttons Brian Talbot 2013-07-24 11:39:40 -04:00
• 5f15e4227e edx.org: applies edx.org visual changes (with overrides/new mixins) Brian Talbot 2013-07-24 10:48:22 -04:00
• b5fda6d26d edx.org: adds in variables/mixins to support edx.org visual changes Brian Talbot 2013-07-24 10:47:43 -04:00
• dd338c17a5 Merge pull request #477 from edx/cale/xmodule-student-vieww Calen Pennington 2013-07-24 12:08:25 -07:00
• 3e9bbe2550 Make cms.dev environment work with manage.py Calen Pennington 2013-07-24 14:49:07 -04:00
• 400ff494cb Remove presumption of user's intent for imported xml attrs Don Mitchell 2013-07-24 14:08:34 -04:00
• 2d085c426d Add xlint check for any policy fields whose default changed. Don Mitchell 2013-07-24 14:07:39 -04:00
• 3774ea1565 Add an XBlock student_view to XModule Calen Pennington 2013-07-23 12:25:44 -04:00
• 8e12590668 Merge pull request #451 from edx/cale/add-a-manage.py-command-that-understands-the-extra-edx-options Calen Pennington 2013-07-24 07:34:13 -07:00
• 76055aa211 Add a manage.py command that understands the extra edX options Calen Pennington 2013-07-20 07:45:56 -04:00
• 420b092033 Merge pull request #467 from edx/fix/adam/file-upload Adam 2013-07-23 15:05:18 -07:00
• 86ee2bca7a Merge branch 'release' Diana Huang 2013-07-23 17:57:07 -04:00
• 09dc468342 Merge pull request #482 from edx/hotfix-2013-07-23 Diana Huang 2013-07-23 14:49:36 -07:00
• 077f0a2a10 Merge pull request #481 from edx/fix/cdodge/regression-on-tabs-initialization chrisndodge 2013-07-23 14:32:47 -07:00
• 402ae4d8bd added csrf tests ihoover 2013-07-23 17:32:21 -04:00
• 31e1b0e5e9 Studio: revises spacing fix for welcome to edX studio title Brian Talbot 2013-07-22 09:45:08 -04:00
• 2926c94330 Prevent XSS attack via submission_history page. Diana Huang 2013-07-22 14:20:18 -04:00
• 4148c00cc4 resolve conflicts ihoover 2013-07-23 16:26:11 -04:00
• c6c3e4b9d3 working under cms too ihoover 2013-07-23 16:23:54 -04:00
• ea31b17d57 Fix up auto auth tests. Jay Zoldak 2013-07-23 16:22:51 -04:00
• 0b6932f4b8 add new test to assert that course creation will populate default tabs as expected. Also update factory to not override defaults on tabs array. Also simplfy self.tab test condition. Chris Dodge 2013-07-23 16:15:39 -04:00
• 77a23a37d0 reordered email settings checkbox to impact styling for icon and cleaned up header navigation for discusisons marco 2013-07-23 15:43:12 -04:00
• 8584aae866 It seems like self.tabs is getting set to an empty set [] now rather than None. This causes the tab defaulting to not populate, leading to crashes in the LMS if someone makes a new course with additional tabs (e.g. static tabs or pdf-textbooks) Chris Dodge 2013-07-23 15:30:32 -04:00
• b76e7387aa Merge pull request #452 from edx/feature/cdodge/add-jump-to-substituions chrisndodge 2013-07-23 12:15:31 -07:00
• 3a5e1c7021 Merge pull request #463 from edx/fix/jkarni/linkoutline jkarni 2013-07-23 10:59:11 -07:00
• 6f3b49a6f9 add some chinese characters to the test content Chris Dodge 2013-07-23 10:33:50 -04:00
• c5ef8dc526 add line break between arguments Chris Dodge 2013-07-23 09:41:41 -04:00
• f78e3a221b fix fat finger string formatting Chris Dodge 2013-07-22 21:30:51 -04:00
• 345d2af540 address review feedback Chris Dodge 2013-07-22 20:44:39 -04:00
• 565564a46e add input/output information in doc strings Chris Dodge 2013-07-22 20:31:50 -04:00
• e24eb3e4eb added explicit unit test to verify the link rewriting Chris Dodge 2013-07-22 14:29:46 -04:00
• 80e0b99342 add a reference in the toy course to the test jump_to_id HTML module Chris Dodge 2013-07-22 12:14:52 -04:00
• 059450c0de Studio: revises HTML and styling around new unit ID on unit view Brian Talbot 2013-07-22 09:28:10 -04:00
• 63c5cfda94 add comment and fix mistake in test Chris Dodge 2013-07-20 21:51:11 -04:00
• 1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio Chris Dodge 2013-07-20 21:02:24 -04:00
• 6eac259c08 Merge pull request #415 from edx/peter-fogg/notification-stories Peter Fogg 2013-07-23 09:05:10 -07:00
• 69e8d4d32f Merge pull request #469 from edx/peter-fogg/fix-stud-486 Peter Fogg 2013-07-23 09:01:25 -07:00
• 8c94be8083 Merge pull request #436 from edx/fix/cdodge/stop-using-unmunged-urlnames-as-display-names chrisndodge 2013-07-23 08:33:27 -07:00
• 1da5af53d9 Studio: revises styling/message copy for authorship rights request error Brian Talbot 2013-07-23 10:37:07 -04:00
• 3d49a46197 Add error handler. cahrens 2013-07-23 10:16:45 -04:00
• 89705f275d Merge pull request #461 from edx/db/change-asset-to-pdf David Baumgold 2013-07-23 06:49:39 -07:00
• 4ee16f1664 Add diff-quality rake task (rake quality) Sarina Canelake 2013-07-22 14:47:37 -04:00
• 4c3a017486 Merge pull request #462 from edx/cale/use-xblock-children-api Calen Pennington 2013-07-23 04:56:44 -07:00
• 1eaba8b0b4 Merge pull request #41 from edx/alex/word_cloud_course_factory Alexander Kryklia 2013-07-23 04:47:38 -07:00
• 2b40462263 convert all datetime.now() to datetime.now(UTC) Adam Palay 2013-07-22 16:36:30 -04:00
• b2b3a50400 convert datetime.now() to datetime.now(UTC) for xqueue Adam Palay 2013-07-22 16:21:47 -04:00
• b744aaa360 make sure parsed times are set to UTC Adam Palay 2013-07-22 16:12:07 -04:00
• af522af2ca formatting Adam Palay 2013-07-22 11:06:58 -04:00
• 0833181ecc Studio: updates older extend references and solves Sass warnings/dupe display of accessibility-based text Brian Talbot 2013-07-22 16:30:26 -04:00
• 4a3b680ee6 Merge pull request #447 from edx/talbs/studio-fix-title Brian Talbot 2013-07-22 13:27:46 -07:00
• a9fb82cae6 Make XModuleDescriptor use the XBlock children API Calen Pennington 2013-07-22 13:20:50 -04:00
• 305bc23d68 Merge pull request #465 from edx/peter-fogg/fix-stud-485 Peter Fogg 2013-07-22 13:09:37 -07:00
• 060b2e17e5 Trim whitespace when adding course authors. Peter Fogg 2013-07-22 10:34:23 -04:00
• 820544c1c4 pin and flag icons using fontawesome now render properly through inline discussions marco 2013-07-22 15:36:44 -04:00
• 5b3cb53689 visual cleanup for discussion home bar marco 2013-07-22 15:17:10 -04:00
• d87dba9e04 Correctly persist checklist settings. Peter Fogg 2013-07-22 15:05:31 -04:00
• e6fd3b38d6 Merge pull request #459 from edx/gprice/notification-setting-endpoints Greg Price 2013-07-22 11:55:06 -07:00
• 5168a080ff Don't add users marked with is_staff to course creation table. cahrens 2013-07-22 14:45:22 -04:00
• 4f9a290a32 Link section to course outline Julian Arni 2013-07-22 14:08:14 -04:00
• 747102cfc2 additional git rebase cleanup marco 2013-07-22 14:09:40 -04:00
• 83b4dc634a final cleanup from git rebase marco 2013-07-22 13:51:52 -04:00
• 3495cebf31 modified html for discussion home to use tables instead of lists, cleaned up styling as well marco 2013-06-26 10:41:49 -04:00
• 9eca557761 updated flag icons to be font-awesome based marco 2013-06-14 15:04:39 -04:00
• 646ff9ea75 removed new post icon and added font-awesome replacement marco 2013-06-14 14:42:16 -04:00
• d8498bfbcf new post button using font-awesome marco 2013-06-14 11:44:48 -04:00
• 78ffc12ae0 cleaned up margin and padding to use baseline variable marco 2013-06-12 14:37:52 -04:00
• a9ea00aa27 removed border to the right of discussion list marco 2013-06-12 13:49:46 -04:00
• e87d07184d basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss marco 2013-06-12 13:47:39 -04:00
• e2f02cdf46 cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning marco 2013-06-05 15:17:19 -04:00
• 37c9de7a01 cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references marco 2013-06-04 15:15:12 -04:00
• 2c9e4ca54a addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown. marco 2013-06-04 11:04:06 -04:00
• ca2bb0e850 PDF Upload button now refers to "PDF" rather than "asset" David Baumgold 2013-07-22 12:54:31 -04:00
• b51aa31231 PDF uploader dialog refers to "PDF" instead of "asset" David Baumgold 2013-07-22 12:54:13 -04:00
• e3e6fd2002 Remove commented-out code and add test. Peter Fogg 2013-07-22 11:34:18 -04:00
• f780369afa Merge pull request #453 from edx/yarko/vagrant-up-fix David Baumgold 2013-07-22 09:29:54 -07:00
• 6629d5d3a3 Merge branch 'master' into talbs/studio-authorship cahrens 2013-07-22 12:15:42 -04:00
• 4cd99c192c Update diff-cover to latest version Sarina Canelake 2013-07-22 12:02:31 -04:00
• 38e040ae0d basic shell for discussion home page with both profile information and email notification settings marco 2013-06-03 17:23:02 -04:00
• 790328dfa8 Add acceptance test for one-click unsubscribe page Greg Price 2013-07-17 14:28:18 -04:00
• 47b51e9329 Add endpoints to set user notification preference Greg Price 2013-07-05 14:40:25 -04:00
• 8d49007666 blankslate edited, header bar now with home button marco 2013-04-11 23:20:49 -04:00
• c4a21fc906 Merge pull request #403 from edx/peter-fogg/fix-stud-421 Peter Fogg 2013-07-22 08:41:04 -07:00