Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
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
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
swdanielli
890eba26e2 Update AUTHORS 2014-07-03 12:58:14 -04:00
David Baumgold
05d6c63049 Add openedx-analytics discussion group to CONTRIBUTING file 2014-07-03 12:42:43 -04:00
Carlos Andrés Rocha
d11bb29c67 Merge pull request #4304 from rocha/display-na-on-instructor-dashboard 
Use deprecated course_key when calling the analytics API.
 2014-07-03 12:35:19 -04:00
Carlos Andrés Rocha
1939678958 Use deprecated course_key when calling the analytics API. 
Previously it was serializing the course_key directly, which is not
interpreted correctly by the API.
 2014-07-03 12:25:16 -04:00
Christine Lytwynec
52bc17545b skipping update assets, not just collectstatic, in unit tests 2014-07-03 11:56:13 -04:00
Carlos Andrés Rocha
2518d8e9a9 Merge pull request #4301 from rocha/display-na-on-instructor-dashboard 
Don't show 500 errors if connection to data API fails
 2014-07-03 11:47:39 -04:00
Carlos Andrés Rocha
5be08cc231 Don't show 500 errors if connection to data API fails 
Some of the metrics on the instructor dashboard are computed by the new
analytics data pipeline. Don't show 500 errors if the connection to the
pipeline API fails. Instead display that the data is not available and
log an error.

AN-1476
 2014-07-03 11:42:39 -04:00
Ben McMorran
db5dd34a60 Fixes has_changes to search all the way to leaf nodes 2014-07-03 11:26:37 -04:00
Andy Armstrong
30c573c72a Merge pull request #4287 from louyihua/localization-cms 
Missing "_()" in course_module.py
 2014-07-03 10:22:57 -04:00
Tim Babych
cfbf317b39 Merge pull request #4267 from edx/tim/feature-group-configurations 
BLD-1217: Create feature flag for switching Group Configurations editing on and off
 2014-07-03 16:38:28 +03:00
Will Daly
c7f6671545 Merge pull request #4289 from edx/will/revert-ora2-release 
Revert ORA2 release
 2014-07-03 08:32:12 -04:00
Tim Babych
a153092cb5 Add FEATURE['ENABLE_GROUP_CONFIGURATIONS'] and os.environ['FEATURE_GROUP_CONFIGURATIONS']. 2014-07-03 15:30:18 +03:00
Andy Armstrong
b48bf54f13 Merge pull request #4286 from louyihua/studio-advanced-settings-localization 
Make the strings in "Advanced Settings" page localizable
 2014-07-03 07:53:53 -04:00
louyihua
ac8d6fc1a6 Make the strings in "Advanced Settings" page localizable 
The fields should be translated before render into html templates.
 2014-07-03 10:57:26 +08: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
Greg Price
be04740edb Merge pull request #4291 from edx/forum-sidebar-improvements 
Forum sidebar improvements
 2014-07-02 18:17:53 -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
Andy Armstrong
220a028b82 Merge pull request #4282 from louyihua/fix-name-in-studio 
Misuse of 'gettext' in mako templates
 2014-07-02 14:43:32 -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
David Baumgold
0765fbb434 Merge pull request #4269 from Stanford-Online/giulio/fix-css-typo 
stupid simple css typo fix
 2014-07-02 14:25:39 -04:00
Will Daly
28cb25a1e4 Revert "ORA2 release-2014-06-30T13.39; update EASE to bump the NLTK version to 2.0.4" 
This reverts commit f40834fa2f.
 2014-07-02 14:21:29 -04:00