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

8636 Commits

Author SHA1 Message Date
Adam
115d8c64f1 Merge pull request #4320 from edx/merge-rc-to-master 
Merge rc to master
 2014-07-08 13:14:18 -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
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
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
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
Ben McMorran
db5dd34a60 Fixes has_changes to search all the way to leaf nodes 2014-07-03 11:26:37 -04:00
Tim Babych
a153092cb5 Add FEATURE['ENABLE_GROUP_CONFIGURATIONS'] and os.environ['FEATURE_GROUP_CONFIGURATIONS']. 2014-07-03 15:30:18 +03:00
louyihua
ba30f0387e Missing "_()" in course_module.py 2014-07-03 10:55:00 +08:00
Ben McMorran
1952743985 Merge pull request #4273 from edx/benmcmorran/subtree-edited-info 
Adds subtree_edited_on, subtree_edited_by, and fixes has_changes
 2014-07-02 18:42:04 -04:00
Ben McMorran
a59f8494a6 Adds subtree_edited_on, subtree_edited_by, and fixes has_changes 2014-07-02 17:34:39 -04:00
Greg Price
6d87443a39 Update discussion tab sidebar header 
The home button is removed, the search box is always displayed, and many
visual adjustments are made, along with a large amount of refactoring.

Originally reviewed in #4211
 2014-07-02 16:58:34 -04:00
Greg Price
05d8eeecd7 Improve forum sorting and cohort filtering UX 
Thread entries now show an activity count that includes the original
post, and only one of the vote count and activity count is displayed
based on the user's selected sort. The sorting and filtering options now
both use a select and are somewhat more verbose, and the visual styling
of the sort/filter bar is updated.

Originally reviewed in #4165 with a bugfix in #4211
 2014-07-02 16:58:34 -04:00
Greg Price
e049cfaf3b Make "load more" in forums not appear incorrectly 
The rendering of the link happens in an event handler, and the
collection's attributes were not getting set properly before the reset
event triggering the rendering occurred.

Originally reviewed in #4072
 2014-07-02 16:58:34 -04:00
Greg Price
551cea9379 Add labels to forum thread list 
A thread will be labeled if it is pinned, if the user is following it,
or if it was authored by a staff member or community TA. This also
slightly changes the color used for community TA labels.

Originally reviewed in #4072
 2014-07-02 16:58:33 -04:00
Greg Price
89ba90a695 Re-design forum thread list 
Use larger and lighter title font, decrease padding, and use lighter
solid backgrounds instead of gradients. Also, refactor SASS code to
conform better to our new style, including using more specific class
names.

Originally reviewed in #4072
 2014-07-02 15:31:55 -04:00
Greg Price
1a0d8827f5 Refactor global var setup for forum Jasmine tests 
Originally reviewed in #4072
 2014-07-02 15:31:35 -04:00
Calen Pennington
3893a9aee6 Merge pull request #4258 from cpennington/studio-deprecated-urls 
Make Studio able to handle deprecated key formats in urls
 2014-07-02 14:26:46 -04:00
Adam
ad43c25c78 Merge pull request #4188 from edx/adam/fix-skiptests 
Explicitly skip tests in common unless we know we're running the LMS unittest suite
 2014-07-02 12:43:16 -04:00
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
Jay Zoldak
3515212196 Merge pull request #4266 from edx/revert-4050-linkedin-email 
Revert "Make LinkedIn auth provider request email by default."
 2014-07-01 14:36:50 -04:00
jsa
59e2a6ddde update NewPostViewSpec to correctly initialize NewPostView 2014-07-01 13:43:54 -04:00
Adam
653d6f21dd Merge pull request #4171 from edx/adam/fix-lms-2773 
Prevents students from accidentally changing their enrollment on login (...
 2014-07-01 10:38:50 -04:00
David Baumgold
ca7d895350 Revert "Make LinkedIn auth provider request email by default." 2014-07-01 10:05:01 -04:00
Usman Khalid
6a3d5eb079 Do not refund student if a certificate entry already exists for them. 
LMS-2920
 2014-07-01 16:29:07 +05:00
Adam Palay
536b9dbe31 in some cases we do want that redirect url 2014-06-30 17:05:48 -04:00
Adam Palay
92f53236cf fix 400s from change_enrollment causing 404s (LMS-6625) 2014-06-30 16:22:14 -04:00
Jim Abramson
5d37ea83f7 Merge pull request #4216 from edx/jsa/new-post-redesign 
consolidate new post form variants into single client-side template/view
 2014-06-30 14:39:46 -04:00
David Baumgold
b817e02602 Merge pull request #4050 from mtyaka/linkedin-email 
Make LinkedIn auth provider request email by default.
 2014-06-30 14:31:53 -04:00
Calen Pennington
1c882da397 Make Studio able to handle deprecated key formats in urls 2014-06-30 14:29:10 -04:00
Waheed Ahmed
cb3355b9e7 Merge pull request #4215 from edx/waheed/lms2892-ie-security-warning-fixed 
Fixed IE security warning on course page.
 2014-06-30 18:49:54 +05:00
Nimisha Asthagiri
91f102c778 Merge pull request #4232 from edx/nimisha/modulestore-enum-constants 
ModulestoreEnum class.
 2014-06-30 08:58:03 -04:00
Waheed Ahmed
68a0f4e45c Fixed IE security warning on course page. 
LMS-2892
 2014-06-30 13:56:08 +05:00
jsa
994ccd1110 consolidate new post form variants into single client-side template/view 2014-06-29 20:45:22 -04:00
Nimisha Asthagiri
d6049239e7 Merge pull request #4217 from louyihua/master 
Fix saving error of video editor with non-english translations
 2014-06-28 00:42:17 -04:00
Nimisha Asthagiri
4c717ee35d Merge pull request #4236 from edx/nimisha/fix_ms_merge_conflict_heartbeat 
Fix modulestore merge conflict with heartbeat.
 2014-06-27 22:26:30 -04:00
Nimisha Asthagiri
8dca8053f6 Fix branch settings. 2014-06-27 21:47:53 -04:00
Adam
13f41aea07 Merge pull request #4239 from edx/release 
Release
 2014-06-27 17:04:30 -04:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
Nimisha Asthagiri
8de4bcaf28 Fix modulestore merge conflict with heartbeat. 2014-06-27 13:57:33 -04:00
Adam Palay
b584c1a848 skip failing test 2014-06-27 13:24:23 -04:00
Oleg Marshev
39f2aabdd3 Do not look for country if no new ip. 2014-06-27 18:45:19 +03:00
Oleg Marshev
6b50517bd4 Merge pull request #4206 from edx/oleg/lti-xmlns-test 
Add test that xml body was parsed successfully.
 2014-06-27 11:28:27 +03:00
louyihua
7555c6ec0c Fix saving error of video editor in non-english translation 
Currently the code in ```tabs-aggregator.coffee``` uses the display name of a tab as the key to index the current tab. When a non-english translation is applied, the javascript code will get localized names instead of the original english names, which causes the following ```getValue``` function fails as it cannot reference the correct tab.
Use the 'data' attribute to store the original tab name.
 2014-06-27 14:08:44 +08:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540 
Refactor get_parent_locations STUD-1663
 2014-06-26 18:00:11 -04:00
cahrens
a4b172d9d8 Display names, help text, and "deprecated" for Advanced Settings. 
STUD-302, STUD-303
 2014-06-26 16:54:22 -04:00
Ben McMorran
400731c80f Uses present in bokchoy test 2014-06-26 14:01:29 -04:00
Ben McMorran
ff0bab8e55 Increases wait_for_notification timeout to 60 seconds 2014-06-26 13:47:34 -04:00
James Tauber
bc40dce817 Merge pull request #4201 from edx/jtauber/test-PR3769 
Test PR 3769 (Improves the way LMS serves /favicon.ico)
 2014-06-26 11:18:56 -04:00