Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• be4d5f3228 Merge pull request #292 from edx/ned/remove-pointless-addition-tests Ned Batchelder 2013-06-27 13:31:36 -07:00
• a484224ef5 Remove pointless addition tests Ned Batchelder 2013-06-27 16:27:39 -04:00
• 4557891e0d Standardize types used for logging events from the instructor dashboard Renzo Lucioni 2013-06-27 16:25:03 -04:00
• 9b14ea790c Properly increment student attempts Vik Paruchuri 2013-06-27 16:20:58 -04:00
• 32e6d4819f pep8/pylint cleanup. cahrens 2013-06-27 16:18:16 -04:00
• d1cb80a0ab Merge pull request #291 from edx/jarv/fix-certificates-race-cond John Jarvis 2013-06-27 13:14:11 -07:00
• 8164ca9a78 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe Vik Paruchuri 2013-06-27 16:11:24 -04:00
• 189fc89412 Merge branch 'release' Frances Botsford 2013-06-27 16:03:29 -04:00
• f6d7cc5516 save the cert record immediately after we set the status John Jarvis 2013-06-27 15:57:51 -04:00
• 18c1bcdf12 Merge pull request #283 from edx/will/recover-jasmine-test-results Will Daly 2013-06-27 12:10:36 -07:00
• 3c67e2754a Merge branch 'master' into jnater/courseware_tests Jean Manuel Nater 2013-06-27 13:53:47 -04:00
• 8d4c2af9f2 Teach rake test_$lib to understand specific test names Calen Pennington 2013-06-27 13:34:58 -04:00
• 6bcd11fbfb Working HTML docs Toddi Norum 2013-06-27 12:44:11 -04:00
• 894d44a0d9 Merge pull request #286 from edx/zoldak/fix-discussion-override Jay Zoldak 2013-06-27 09:27:38 -07:00
• ed57e7e555 Used dependency to ensure that REPORT_DIR exists before cleaning. This allows the build to pass in Jenkins Will Daly 2013-06-27 10:51:23 -04:00
• 02a24716c6 Merge pull request #278 from edx/sarina/fix-modulestore-500s Sarina Canelake 2013-06-27 08:33:45 -07:00
• c98a77565f Make the UrlResetMixin load the urlconf after resetting it, and fix the comment client test that was leaving ENABLE_DISCUSSION_SERVICE at True Jay Zoldak 2013-06-27 10:52:26 -04:00
• f095c5fec6 Add ENABLE_CREATOR_GROUP (set to False). cahrens 2013-06-27 11:00:43 -04:00
• 27e720cf3b Make it clear that this should only be run once. cahrens 2013-06-27 11:00:11 -04:00
• ea8e5f84ac Cleaned up code JonahStanley 2013-06-27 10:14:43 -04:00
• 0e0f22999d Add doc strings. cahrens 2013-06-27 09:52:18 -04:00
• ce100bad88 Add doc strings. cahrens 2013-06-27 09:48:47 -04:00
• 2b6d338d2d Merge pull request #276 from edx/christina/python-problem Christina Roberts 2013-06-27 06:44:53 -07:00
• 3babf53925 Handle the case of script being terminated before the user was deleted. cahrens 2013-06-27 09:44:09 -04:00
• 21a14eff94 update to changelog Frances Botsford 2013-06-27 09:32:16 -04:00
• 0e4bc920ae Merge pull request #284 from edx/peter-fogg/fix-default-videos Peter Fogg 2013-06-27 06:23:54 -07:00
• 4b5fe427ed Merge pull request #282 from edx/peter-fogg/fix-default-videos Peter Fogg 2013-06-27 06:19:56 -07:00
• 984fd2bc8b Merge pull request #281 from edx/cale/use-separate-venv-for-parallel-builds Calen Pennington 2013-06-27 06:11:35 -07:00
• 42f71156de Script for making all instructors content creators. cahrens 2013-06-26 14:42:17 -04:00
• 6e357db24c Merge pull request #268 from edx/dhm/cosmetic-cleanup Calen Pennington 2013-06-27 05:44:49 -07:00
• 6831e84834 Merge pull request #214 from edx/dcadams/email-on-invite dcadams 2013-06-26 15:53:15 -07:00
• 306ac48210 Email on enroll/un-enroll actions dcadams 2013-06-26 14:01:07 -07:00
• 7f017d0ca9 Addressed pull request feedback Jean Manuel Nater 2013-06-26 14:50:16 -04:00
• 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. Will Daly 2013-06-26 17:14:12 -04:00
• 06b9390cfa Merge pull request #225 from edx/talbs/studio-sassvars Brian Talbot 2013-06-26 14:02:34 -07:00
• 2a49d087de studio - revises transparent Sass color vars to use rgba() method Brian Talbot 2013-06-20 11:21:43 -04:00
• d9fc21fc1b Merge pull request #277 from edx/giulio/enable-iframe caesar2164 2013-06-26 14:01:48 -07:00
• ee5389800a Fix Lyla showing up everywhere. Peter Fogg 2013-06-26 16:24:04 -04:00
• dec20d76bc Use separate venv for parallel builds Calen Pennington 2013-06-26 16:25:44 -04:00
• 621777e6ae Explicitly test the creation and deletion of every component type JonahStanley 2013-06-26 16:01:31 -04:00
• f7d6d14946 Catch InvalidLocationError Sarina Canelake 2013-06-25 09:42:28 -04:00
• b985a7f128 Remove unused template Don Mitchell 2013-06-25 11:26:02 -04:00
• 1344b1e521 Make SessionKeyValueStore variable names clearer Don Mitchell 2013-06-25 11:23:07 -04:00
• 65b3bcdba6 Clean up variable naming Don Mitchell 2013-06-25 11:21:17 -04:00
• ff6ba014ce Remove noop if statement Don Mitchell 2013-06-24 14:48:45 -04:00
• 391ed8c964 Add docstring to CourseDescriptor.__init__ Don Mitchell 2013-06-25 11:56:55 -04:00
• 2cd18dfad3 Merge pull request #263 from edx/renzo/segment-io-whitelist-expansion Renzo Lucioni 2013-06-26 10:41:11 -07:00
• 50f837d9d8 move marketing iframe breakout script to inside existing conditional Giulio Gratta 2013-06-26 10:22:59 -07:00
• b03d93901f Pass arguments from ctxCall forward to set state Julian Arni 2013-06-26 12:36:04 -04:00
• 9d49a0e8b9 Fix check for waitfor attr Julian Arni 2013-06-26 12:35:34 -04:00
• bb8c62d84c Make the problem handle empty fields and non-integers correctly. cahrens 2013-06-26 12:33:55 -04:00
• 6e606291da Merge remote-tracking branch 'origin/release' into rc/2013-06-26 Frances Botsford 2013-06-26 12:30:18 -04:00
• 38d7ddf024 Merge pull request #245 from edx/jkarni/feature/createdevfolder jkarni 2013-06-26 08:19:11 -07:00
• c5851d39e9 Merge pull request #266 from edx/christina/course-create-permissions Christina Roberts 2013-06-26 08:15:14 -07:00
• e487521289 Update for change in add_user_to_creator_group API. cahrens 2013-06-26 09:06:12 -04:00
• 4a697a8da1 Verify that caller of add or remove from creator group is staff. cahrens 2013-06-25 17:07:51 -04:00
• 190c07d954 Add smoke coverage for add and remove of course group permissions. cahrens 2013-06-25 16:15:47 -04:00
• 2c60a7dbc1 pep8 cleanup cahrens 2013-06-25 15:46:08 -04:00
• 6e5c861018 Merge pull request #272 from edx/fix/LMS-500 Ned Batchelder 2013-06-26 07:49:54 -07:00
• 318372f2c0 Introduce course creator group. cahrens 2013-06-25 15:11:55 -04:00
• f94ec6cf2a merge conflicts resolved marco 2013-06-26 10:47:32 -04:00
• 84d505e8cc 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
• 46788f31c8 Remove obsolete and distracting SCSS file Ned Batchelder 2013-06-26 10:12:40 -04:00
• 72aa56a45e updated CHANGELOG.rst Alexander Kryklia 2013-06-26 13:00:15 +03:00
• c41c102b7a Update CHANGELOG.rst Jason Bau 2013-06-25 21:37:20 -06:00
• 4a3165414d Merge pull request #84 from edx/feature/jbau/activation-after-password-reset-confirm Jason Bau 2013-06-25 20:34:19 -07:00
• 734440f4b9 Refactored tests Jason Bau 2013-06-25 20:21:20 -07:00
• d9575a0874 Remove traling commas to make json valid Don Mitchell 2013-06-24 12:57:23 -04:00
• b42fe277d4 Add serial commas to modulestore definitions Don Mitchell 2013-06-24 12:56:03 -04:00
• 8b23eeca7e Minor pylint/whitespace changes Don Mitchell 2013-06-24 15:53:24 -04:00
• 3f49da385f Swap Logger call from check_fd to check Renzo Lucioni 2013-06-25 17:22:05 -04:00
• fe82e865aa Merge pull request #267 from edx/zoldak/fix-acceptance-xcontent Jay Zoldak 2013-06-25 14:04:30 -07:00
• 6c66736e3c Specify a different xcontent mongo db for the acceptance tests Jay Zoldak 2013-06-25 16:56:36 -04:00
• 9dad14c48e Merge pull request #265 from edx/christina/activation-email Christina Roberts 2013-06-25 13:21:51 -07:00
• 94e1746500 Merge pull request #258 from edx/rocha/pre-external-grader-cleanup Carlos Andrés Rocha 2013-06-25 13:17:11 -07:00
• 1e0702f374 Allow nested object methods for the grade and state functions Julian Arni 2013-06-25 16:14:34 -04:00
• 881d63dae7 Fixed Jasmine tests in light of Logger changes, and wrote test to cover case where data passed is not a dictionary Renzo Lucioni 2013-06-25 16:04:00 -04:00
• 68c0f04462 Merge pull request #264 from edx/will/update-diff-cover-v0.1.3 Will Daly 2013-06-25 12:45:16 -07:00
• 401dc82c46 Don't mention edge in the subject line; use same message for edx and edge. cahrens 2013-06-25 15:35:47 -04:00
• 84f4361d52 Avoid changing format of data sent to our logs, and prevent problem_check event from firing twice Renzo Lucioni 2013-06-25 15:15:28 -04:00
• bcbce3eff0 Add handful of events to the Segment.io whitelist Renzo Lucioni 2013-06-24 16:53:01 -04:00
• b14553d867 Merge pull request #220 from edx/jonahstanley/make-units-parallel Jonah Stanley 2013-06-25 11:44:01 -07:00
• ed62c5a6f9 Fix LMS-500: Random class in random module was None Ned Batchelder 2013-06-25 14:23:16 -04:00
• e4ee1c6c9b Rename arguments of modx_dispatch and handle_ajax related functions Carlos Andrés Rocha 2013-06-24 15:29:54 -04:00
• 2f02496c8f Reorder imports on module_render Carlos Andrés Rocha 2013-06-13 13:54:51 -04:00
• a24c3a9700 updated pinning icons and removed images marco 2013-06-14 15:10:17 -04:00
• 05a7d664f7 updated flag icons to be font-awesome based marco 2013-06-14 15:04:39 -04:00
• 770bfdc180 removed new post icon and added font-awesome replacement marco 2013-06-14 14:42:16 -04:00
• 0f84a52023 new post button using font-awesome marco 2013-06-14 11:44:48 -04:00
• 98cd032ade cleaned up topic header to allow for multiple line titles still being visible marco 2013-06-13 15:50:21 -04:00
• b83d5aa42d removed icon stack from email area of helpgrid marco 2013-06-12 16:02:17 -04:00
• 07e87a54bc icon color changes and profile link style to match profile page marco 2013-06-12 15:14:14 -04:00
• 9fe626469e sass build cleanup for baseline fixes marco 2013-06-12 14:39:10 -04:00
• 74ea364a5a cleaned up margin and padding to use baseline variable marco 2013-06-12 14:37:52 -04:00
• d648b18d72 removed border to the right of discussion list marco 2013-06-12 13:49:46 -04:00
• b870679673 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
• 52403420fd 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
• 23f19423be 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
• 397583e1ab Merge pull request #262 from edx/fix/brian/changelog brianhw 2013-06-25 10:24:42 -07:00
• c0805c334d Updated diff-cover to version 0.1.3 to fix a bug Will Daly 2013-06-25 13:23:13 -04:00