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

24235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Giulio Gratta
1935187cf5 stupid simple css typo fix 2014-07-02 09:50:03 -07: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
clytwynec
c4a5299e55 Merge pull request #4283 from edx/clytwynec/lms_cms_joint_bokchoy_test 
add lms_base and cms_base urls to bokchoy envs
 2014-07-02 12:42:49 -04:00
Mark Hoeber
cf3d777468 Merge pull request #4272 from edx/markhoeber/documentation/doc-298 
Updated Course End Date info
 2014-07-02 11:49:37 -04:00
Mark Hoeber
8c2a922ce8 Updated Course End Date info 2014-07-02 11:49:06 -04:00
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
louyihua
94faa6b836 Misuse of 'gettext' into mako templates 
To translate strings in mako templates, the pattern of ```${_()}``` should be used instead of ```gettext``` even if the strings to be translated is located in a ```script``` block.
 2014-07-02 20:59:18 +08:00
Will Daly
9322714d9e Merge pull request #4281 from edx/usman/lms6634-support-page-url-matching 
Fixed urlpatterns regex for support views in dashboard app.
 2014-07-02 08:45:01 -04:00
Usman Khalid
c201d78c43 Fixed urlpatterns regex for support views in dashboard app. 
LMS-6634
 2014-07-02 16:01:25 +05: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
Jim Abramson
96c77a7ffc Merge pull request #4271 from edx/jsa/fix-new-post-view-spec 
update NewPostViewSpec to correctly initialize NewPostView
 2014-07-01 13:58:04 -04:00
jsa
59e2a6ddde update NewPostViewSpec to correctly initialize NewPostView 2014-07-01 13:43:54 -04:00
Usman Khalid
a278697506 Merge pull request #4268 from edx/usman/lms6631-certificate-mode 
Moved GeneratedCertificates.MODES back inside model.
 2014-07-01 22:32:03 +05:00
Christina Roberts
3f2a6d1edf Merge pull request #4241 from louyihua/fix-name-in-studio 
Change 'Course Name' to 'Course Run' in "Schedule & Details" page
 2014-07-01 11:53:20 -04:00
Usman Khalid
446270c0ff Moved GeneratedCertificates.MODES back inside model. 
LMS-6631
 2014-07-01 19:46:51 +05: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