Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,986 Commits 1 Branch 0 Tags
dffd8648b3e464bdb45458f18f87cc217432c653
Commit Graph

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jhelbert
451953752e Merge pull request #4285 from edx/jhelbert/enrollment-mode-change-events 
Jhelbert/enrollment mode change events
 2014-07-09 17:57:39 -04:00
Julia Hansbrough
d9dd45662e Enables LMS to handle deprecated URLs 
LMS-2651
 2014-07-09 21:51:37 +00:00
Nimisha Asthagiri
cd8f0e6ced Merge pull request #4309 from edx/nimisha/refactor_mixed_context_managers 
Nimisha/refactor mixed context managers
 2014-07-09 17:01:08 -04:00
Justin Helbert
e78a398f45 This emits enrollment mode changes events 2014-07-09 20:27:00 +00:00
Christina Roberts
227205fb10 Merge pull request #4344 from edx/christina/revert_to_published 
Add revert_to_published method.
 2014-07-09 16:01:13 -04:00
Nimisha Asthagiri
ce9aea80b1 Move context_managers to base class, overridden by mixed. 2014-07-09 15:55:53 -04:00
Jay Zoldak
557a252314 Merge pull request #4317 from edx/zoldak/increase-sqlite-timeout 
Increase the test SQLite DB timeout. TE-397
 2014-07-09 14:40:58 -04:00
Don Mitchell
211f0797fb Merge pull request #4294 from edx/split_mongo_assets_cherry 
Split mongo assets cherry
 2014-07-09 14:22:04 -04:00
Minh-Tue Vo
a5a3f6255d Merge pull request #4343 from edx/mvo/removing_unused_action_chains 
Removing unused import
 2014-07-09 13:38:56 -04:00
cahrens
e984ca15a1 Add revert_to_published method. 
STUD-1860
 2014-07-09 13:12:39 -04:00
Greg Price
c256539627 Merge pull request #4350 from edx/gprice/for-154 
Fix bug in inline discussion post creation
 2014-07-09 12:17:24 -04:00
Greg Price
98d7b28c6b Merge pull request #4318 from edx/gprice/forum-sidebar-debt 
Reduce tech debt in forum sidebar
 2014-07-09 12:13:54 -04:00
Greg Price
c3845de76a Fix bug in inline discussion post creation 
Commit 994ccd1 contained a bug that caused new posts created via the
courseware interface to not get posted to the correct topic. They would
appear to work but would actually be posted to the "undefined" topic.
This has now been fixed.

JIRA: FOR-154
 2014-07-09 12:00:14 -04:00
Daniel Friedman
f9120e1d06 Merge pull request #4324 from edx/dan-f/add-to-authors 
Add myself to AUTHORS.
 2014-07-09 11:56:58 -04:00
Don Mitchell
a74ba6b932 Make pictures smaller 2014-07-09 08:34:03 -04:00
Andy Armstrong
69e205957b Merge pull request #4345 from edx/andy/fix-i18n-bug 
Fix i18n bug on Studio's Advanced Settings page
 2014-07-08 23:43:56 -04:00
Andy Armstrong
dbd3ffed66 Fix i18n bug on Studio's Advanced Settings page 
STUD-1955

HTML escaped localized text that was output to
JavaScript.
 2014-07-08 19:22:07 -04:00
Ned Batchelder
eefa18b393 Merge pull request #4333 from edx/ned/fix-readme-links 
Fix the link to the Ubuntu installation instructions
 2014-07-08 16:57:41 -04:00
Stephen Sanchez
f23492e14e Updating AWS settings 2014-07-08 16:38:12 -04:00
Minh Tue Vo
ba989424f8 removing unused import 2014-07-08 15:57:07 -04:00
David Baumgold
450842586a Merge pull request #4341 from edx/db/release-script-always-fetch 
Always call `git fetch edx` before finding PR branches
 2014-07-08 15:40:26 -04:00
David Baumgold
326ca21dd8 Always call git fetch edx before finding PR branches 2014-07-08 15:38:20 -04:00
Andy Armstrong
4cb1a510fc Merge pull request #4326 from edx/andya/fix-stud-1948 
Fix user handling bug in split test module
 2014-07-08 15:09:14 -04:00
Andy Armstrong
afb311ff51 Fix user handling bug in split test module 
STUD-1948
 2014-07-08 15:01:22 -04:00
Will Daly
d352d4aef3 Merge pull request #4323 from edx/will/ora2-release-2014-07-07T19.28 
ORA2 release-2014-07-07T19.28
 2014-07-08 13:52:29 -04:00
Will Daly
e582337522 ORA2 release-2014-07-07T19.28 2014-07-08 13:50:28 -04:00
Stephen Sanchez
ef68541069 updating ora2 version 2014-07-08 13:16:23 -04:00
Stephen Sanchez
573d3c89fc Updating settings and requirements for lms and cms to support file upload 2014-07-08 13:15:37 -04:00
Adam
115d8c64f1 Merge pull request #4320 from edx/merge-rc-to-master 
Merge rc to master
 2014-07-08 13:14:18 -04:00
Ned Batchelder
c460a4e6fb Fix the link to the Ubuntu installation instructions 2014-07-08 12:02:56 -04:00
Don Mitchell
173be7d279 Allow to_deprecated_string to do its magic 2014-07-07 17:48:46 -04:00
Don Mitchell
cc6dfbbc75 Asset support in split 
LMS-2876
 2014-07-07 17:11:43 -04:00
Andy Armstrong
5f11aa9aee Revert "First attempt to fix split test" 
This reverts commit a16f5487bc.
 2014-07-07 16:49:11 -04:00
Andy Armstrong
a16f5487bc First attempt to fix split test 2014-07-07 16:40:17 -04:00
Daniel Friedman
dc3dab115a Add myself to AUTHORS. 2014-07-07 16:01:36 -04:00
Don Mitchell
356da9ca75 Merge pull request #4315 from edx/bug/delete_draft 
Deleting a child of a unit should convert the unit to draft
 2014-07-07 14:50:00 -04:00
Greg Price
3f6287a267 Clean up forum nav Sass 
Now that the sidebar class is no longer used, many rules no longer need
!important and can move out of _shame.scss.
 2014-07-07 14:21:53 -04:00
Greg Price
a4de82e1c3 Remove sidebar class from forum nav 
This will enable much cleanup of the relevant SASS rules.
 2014-07-07 14:21:53 -04:00
Sarina Canelake
cda3d2968d Merge pull request #4314 from edx/sarina/070714-language-update 
Sarina/070714 language update
 2014-07-07 14:19:08 -04:00
Adam Palay
d63a5abfbc Merge branch 'rc/2014-07-02' into testmergemaster 
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
 2014-07-07 13:54:03 -04:00
Tim Babych
34ac6abe1c Merge pull request #4316 from edx/anton/group-experiments 
BLD-1117, BLD-1217: Add read-only list of Group Configurations, Create feature flag.
 2014-07-07 20:03:43 +03:00
Sarina Canelake
a9b35ab22b Clean up i18n paver commands 2014-07-07 12:40:50 -04:00
Sarina Canelake
1b37c0b4a2 Update translations (autogenerated message) 2014-07-07 12:40:48 -04:00
Jay Zoldak
c216699953 Increase the test SQLite DB timeout. TE-397 2014-07-07 12:32:43 -04:00
Don Mitchell
1f71a67a85 Deleting a child of a unit should convert the unit to draft 
if the unit is draftable but isn't yet draft.
 2014-07-07 11:01:02 -04:00
Tim Babych
453c583714 Hide GroupConfiguration behind feature flag in cms/templates/settings.html. 2014-07-04 08:23:35 +03:00
David Baumgold
1bc48af784 Merge pull request #4306 from edx/db/openedx-analytics 
Add openedx-analytics discussion group to CONTRIBUTING file
 2014-07-03 15:50:20 -04:00
Christina Roberts
62d0e534af Merge pull request #4302 from edx/benmcmorran/fix-has-changes 
Fixes has_changes to search all the way to leaf nodes
 2014-07-03 15:37:48 -04:00
Greg Price
f3a8436e68 Tweak forum topic browse menu 
The filter box will now remain fixed while the rest of the menu scrolls.
This also fixes a minor cosmetic bug in which the thread list would
overflow its container if the user opened the browse menu, scrolled the
page, and then closed the browse menu.
 2014-07-03 14:14:55 -04:00
clytwynec
71ae04b965 Merge pull request #4299 from edx/clytwynec/skip_update_assets_for_unittests 
skipping update assets, not just collectstatic, in unit tests
 2014-07-03 13:12:49 -04:00