Commits · 46850d3de0c6ee2f44ba3f0ea3c2dbba34de820a · edx / edx-platform

21 Apr, 2015 3 commits
- Added problem-builder to requirements · 46850d3d
  Xavier Antoviaque committed Apr 21, 2015
  
  46850d3d Browse Files
- Merge pull request #424 from edx-solutions/ziafazal/changes-after-notifications-rebase · a122e36e
```
changes to make things work after rebase with master
```
  Zia Fazal committed Apr 21, 2015
  a122e36e Browse Files
- Merge pull request #429 from edx-solutions/ekolpakov/dependency_updates · b21eaae6
```
Updated XBlock version
```
  Zia Fazal committed Apr 21, 2015
  b21eaae6 Browse Files
20 Apr, 2015 1 commit
- Updated XBlock version · 9a5c801e
  E. Kolpakov committed Apr 20, 2015
  
  9a5c801e Browse Files
17 Apr, 2015 1 commit
- default store for new course should be None · 28963057
  Zia Fazal committed Apr 17, 2015
  
  28963057 Browse Files
16 Apr, 2015 1 commit
- fixing issues to make sure all tests pass on cmd · b2a63b79
  Zia Fazal committed Apr 16, 2015
  
  b2a63b79 Browse Files
14 Apr, 2015 4 commits
- Removed unused css · c7d84182
  Zia Fazal committed Apr 14, 2015
  
  c7d84182 Browse Files
- improved code quality · 131f136d
  Zia Fazal committed Apr 14, 2015
  
  131f136d Browse Files
- Merge pull request #427 from edx-solutions/eugeny/settings-service-backward-compatibility · 290ccc52
```
Settings service backward compatibility
```
  Zia Fazal committed Apr 14, 2015
  290ccc52 Browse Files
- Fix for publish button not working in studio · 674b8988
  Zia Fazal committed Apr 14, 2015
  
  674b8988 Browse Files
13 Apr, 2015 5 commits
- Temporary support for old SettingsService used by ooyala · 2e4caae0
```
(cherry picked from commit 83dc3a3)
```
  Braden MacDonald committed Apr 13, 2015
  2e4caae0 Browse Files
- SettingsService for accessing server-wide settings from XBlock · 3560c025
```
(cherry picked from commit aa3b9dc)
```
  E. Kolpakov committed Apr 13, 2015
  3560c025 Browse Files
- Merge pull request #426 from edx-solutions/ekolpakov/dependency_updates · bb07f436
```
Switched to rebased XBlock version + restored some xblock dependencies. 
```
  Zia Fazal committed Apr 13, 2015
  bb07f436 Browse Files
- Switching discussion ids to use UNIQUE_ID XBlock sentinel · 7a6d9b27
  E. Kolpakov committed Apr 13, 2015
  
  7a6d9b27 Browse Files
- Switched to rebased XBlock version + restored some xblock dependencies · 53a2d1fa
  E. Kolpakov committed Apr 13, 2015
  
  53a2d1fa Browse Files
10 Apr, 2015 1 commit
- changes to make things work as expected · 62f722e1
```
changes to make things work as expected after rebase with master branch
having notifications
```
  Zia Fazal committed Apr 10, 2015
  62f722e1 Browse Files
08 Apr, 2015 24 commits

changes after feedback from matt on 4/1 · 23fec59a
Zia Fazal committed Apr 08, 2015

23fec59a Browse Files
cherry picked commit c5a7ca3 · 4a3b8911
Zia Fazal committed Apr 08, 2015

4a3b8911 Browse Files
cherry picked commit a17d1e3 · 96081f71
Zia Fazal committed Apr 08, 2015

96081f71 Browse Files
cherry picked commit 93328f4 · 73406596
Zia Fazal committed Apr 08, 2015

73406596 Browse Files
added default value for complete_status · d7e42747
Zia Fazal committed Apr 08, 2015

d7e42747 Browse Files
Added test for resource hasher. · 0c44a6a3
Jonathan Piacenti committed Apr 08, 2015

0c44a6a3 Browse Files
Reverted to using non cached permissions check as cached version fails tests… · 39639013
```
Reverted to using non cached permissions check as cached version fails tests (and there are no clean way to make it pass)
```
E. Kolpakov committed Apr 08, 2015
39639013 Browse Files
tie into the xblock publish API point for progress and grading events · 6ee47671
Chris Dodge committed Apr 08, 2015

6ee47671 Browse Files
Switched to using cached_has_permission in templates, rather than having those… · 0d97fbb7
```
Switched to using cached_has_permission in templates, rather than having those permissions in template context
```
E. Kolpakov committed Apr 08, 2015
0d97fbb7 Browse Files
Fixed missing `user` context variable in dicussion course + switched to using… · 47c8bf41
```
Fixed missing `user` context variable in dicussion course + switched to using more efficient `cached_has_permissions`
```
E. Kolpakov committed Apr 08, 2015
47c8bf41 Browse Files
Global setting for asynchronous ajax calls - to overcome firefox's strictness… · 363c5490
```
Global setting for asynchronous ajax calls - to overcome firefox's strictness about using synchronous ajax with credentials
```
E. Kolpakov committed Apr 08, 2015
363c5490 Browse Files
Fixed broken bok_choy tests + added API key for bok_choy environment setup · af2a3a53
E. Kolpakov committed Apr 08, 2015

af2a3a53 Browse Files
Backported edx-platform hosted discussion XBlock to edx-solutions (part 2) · a8c9ec4a
E. Kolpakov committed Apr 08, 2015

a8c9ec4a Browse Files
Moved discussion XBlock to edx-platform · b7da6b2f
```
(cherry picked from commit a7c0a2a)
```
E. Kolpakov committed Apr 08, 2015
b7da6b2f Browse Files

completed tests and added type filter

removed organizations app

migration to delete tables

committed Apr 08, 2015

0e82b607 Browse Files

Reverted a minor change in get_cohort to fix failing test in course_groups · 5ab8ba6e
Alan Boudreault committed Apr 08, 2015

5ab8ba6e Browse Files
Fix api_manager failing tests about cohorts · 6d91a9ac
Alan Boudreault committed Apr 08, 2015

6d91a9ac Browse Files

XBlock Discussion changes · 895e4f63

Conflicts:
	cms/djangoapps/contentstore/views/helpers.py
	common/static/coffee/src/discussion/content.coffee
	common/static/coffee/src/discussion/discussion_filter.coffee
	common/static/coffee/src/discussion/discussion_module_view.coffee
	common/static/coffee/src/discussion/discussion_router.coffee
	common/static/coffee/src/discussion/views/discussion_content_view.coffee
	common/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee
	common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
	common/static/coffee/src/discussion/views/discussion_thread_view.coffee
	common/static/coffee/src/discussion/views/new_post_view.coffee
	common/static/coffee/src/discussion/views/response_comment_show_view.coffee
	common/static/coffee/src/discussion/views/thread_response_show_view.coffee
	common/static/coffee/src/discussion/views/thread_response_view.coffee
	lms/djangoapps/django_comment_client/forum/views.py
	lms/static/sass/discussion/_discussion.scss
	lms/templates/discussion/_discussion_module.html
	lms/templates/discussion/_filter_dropdown.html
	lms/templates/discussion/_js_head_dependencies.html
	lms/templates/discussion/_thread_list_template.html
	lms/templates/discussion/_underscore_templates.html
	lms/templates/discussion/index.html
	lms/templates/discussion/mustache/_inline_discussion.mustache
	lms/templates/discussion/mustache/_pagination.mustache
	lms/templates/discussion/mustache/_profile_thread.mustache

committed Apr 08, 2015

895e4f63 Browse Files

revert deprecated block_type change for local_resource_url · 07b463a9
Alan Boudreault committed Apr 08, 2015

07b463a9 Browse Files
Added new assistant role · e8e29753
Martyn James committed Apr 08, 2015

e8e29753 Browse Files
mattdrayer/api-middleware-regex: Support for opaque keys, server API namespace · b2f00926
Matt Drayer committed Apr 08, 2015

b2f00926 Browse Files
mattdrayer/api-course-observer-role: Added new 'observer' role, plus batch PUT operation · 3578cca7
Matt Drayer committed Apr 08, 2015

3578cca7 Browse Files

mattdrayer/rebase-20140701: Updated api to support opaque keys · 7f106296

Also contains:

* mattdrayer/rebase-20140722b: cherry-pick 0325694
* mattdrayer/rebase-20140722: cherry-pick e8b1217
* Sessions API Documentation
* mattdrayer/rebase-20140722: cherry-pick ofao48d
* mattdrayer/rebase-20140722: cherry-pick b0c343c
* mattdrayer/rebase-20140722: cherry-pick d56e973
* mattdrayer/status-500-fix: Small API bug
* added content_id to workgroup review submissions
* mattdrayer/api-user-preferences-delete: Added new Detail view, GET/DELETE operations
* mattdrayer/rebase-20140722: cherry-pick 0624385
* handle exception if user never accessed any course module
* mattdrayer/rebase-20140722: cherry-pick caada51
* cdodge/add-progress-publish-api-endpoint: expose a new xblock runtime publish special cased event type 'progress' which adds an entry into the CourseCompletions table
* add default setting for feature flag in common.py
* mattdrayer/rebase-20140722: cherry-pick 7a1e12c
* mattdrayer/rebase-20140722: Functional stabilization

committed Apr 08, 2015

7f106296 Browse Files

API Doc · 542b87cf
Mark Hoeber committed Apr 08, 2015

542b87cf Browse Files