Commits · 28d3d3354ee2c32c4fe97e1806289b96ad02da3c · edx / edx-platform · GitLab

20 May, 2014 2 commits
- mattdrayer/api-userscleanup: Added docstrings and changed to fail-fast style · 28d3d335
  Matt Drayer committed May 20, 2014
  
  28d3d335 Browse Files
- Merge pull request #56 from edx-solutions/cdodge/add-user-preferences · f5681b19
```
Cdodge/add user preferences
```
  chrisndodge committed May 19, 2014
  f5681b19 Browse Files
19 May, 2014 1 commit
- cdodge/add-user-preferences: add access to the UserPreference table via the API · 8e499470
```
fixes
```
  Chris Dodge committed May 19, 2014
  8e499470 Browse Files
16 May, 2014 4 commits
- Merge pull request #54 from edx-solutions/cdodge/get-ip-restriction-list-from-config · 745c4b06
```
Cdodge/get ip restriction list from config
```
  chrisndodge committed May 16, 2014
  745c4b06 Browse Files
- cdodge/get-ip-restriction-list-from-config: change settings name to make clearer… · f9f09306
```
cdodge/get-ip-restriction-list-from-config: change settings name to make clearer and make sure we are getting values from lms.envs.json
```
  Chris Dodge committed May 16, 2014
  f9f09306 Browse Files
- Merge pull request #53 from edx-solutions/asadiqbal08/api-address-based-restriction · f2e3df1f
```
asadiqbal08/api-address-based-restriction:API Security: IP address based...
```
  chrisndodge committed May 16, 2014
  f2e3df1f Browse Files
- asadiqbal08/api-address-based-restriction:API Security: IP address based… · 11afe2d9
```
asadiqbal08/api-address-based-restriction:API Security: IP address based restriction added MCKIN-1108

uncomment the code
```
  Asad Iqbal committed May 16, 2014
  11afe2d9 Browse Files
15 May, 2014 7 commits
- mentoring/ooyala: Update hash · 700414ae
  Xavier Antoviaque committed May 15, 2014
  
  700414ae Browse Files
- Merge pull request #50 from edx-solutions/mattdrayer/api-csrftoken · 098ee6cc
```
mattdrayer/api-csrftoken: Include CSRF token in the response payload
```
  Matt Drayer committed May 15, 2014
  098ee6cc Browse Files
- Merge pull request #52 from edx-solutions/mattdrayer/api-groupidfix · cba3ad62
```
Mattdrayer/api groupidfix: Use group_id in response versus group_profile_id
```
  Matt Drayer committed May 15, 2014
  cba3ad62 Browse Files
- mattdrayer/api-groupidfix: Changed model reference to 'group_profile' · 508e0c01
  Matt Drayer committed May 15, 2014
  
  508e0c01 Browse Files
- Merge pull request #51 from edx-solutions/ziafazal/add-deadline-to-coursecontentdetail · bf87e48c
```
added 'due' field to coursecontentdetail
```
  Matt Drayer committed May 15, 2014
  bf87e48c Browse Files
- mentoring/ooyala: Update hashes · 233a4668
  Xavier Antoviaque committed May 15, 2014
  
  233a4668 Browse Files
- added "due" field to CourseContentDetail · af4320fb
  Zia Fazal committed May 15, 2014
  
  af4320fb Browse Files
14 May, 2014 9 commits
- mattdrayer/api-csrftoken: Include CSRF token in the response payload · 9d6d546f
  Matt Drayer committed May 14, 2014
  
  9d6d546f Browse Files
- Merge pull request #49 from edx-solutions/mjames/group-project-xblock · 6f8c8c3d
```
XBlock for group-project
```
  Martyn James committed May 14, 2014
  6f8c8c3d Browse Files
- Added dependency on xblock-group-project to custom requirements · 25c733fc
  Martyn James committed May 14, 2014
  
  25c733fc Browse Files
- Merge pull request #47 from edx-solutions/cdodge/course-grades · 913acd38
```
Add grading API end point
```
  chrisndodge committed May 14, 2014
  913acd38 Browse Files
- Add string decoding support and tests to xblock.mixin.DateTuple · 09d2cf4d
  Filippo Valsorda committed May 14, 2014
  
  09d2cf4d Browse Files
- Merge pull request #48 from edx-solutions/mattdrayer/api-userdetailpostfix · 30a96ddf
```
mattdrayer/api-userdetailpostfix: Addressed several issues related to up...
```
  Martyn James committed May 14, 2014
  30a96ddf Browse Files
- mattdrayer/api-userdetailpostfix: Addressed several issues related to updating… · 1960b392
```
mattdrayer/api-userdetailpostfix: Addressed several issues related to updating user/profile information

FInal fix
```
  Matt Drayer committed May 14, 2014
  1960b392 Browse Files
- Merge pull request #45 from edx-solutions/ziafazal/users_not_in_group_or_groupmodule_1027 · 331254d1
```
New API to get users
```
  Matt Drayer committed May 14, 2014
  331254d1 Browse Files
- mattdrayer/api-modulesgroups: API - Added grouping capability for courseware content · 7ed0d378
```
initial commit

add tests

back out config change
```
  Matt Drayer committed May 13, 2014
  7ed0d378 Browse Files
13 May, 2014 6 commits
- Further changes based on Matt's feedback · c6a12c99
```
Further changes based on Matt's feedback
```
  Zia Fazal committed May 13, 2014
  c6a12c99 Browse Files
- Merge pull request #46 from edx-solutions/cdodge/fix-updates-parsing · 3c53f16d
```
Cdodge/fix updates parsing
```
  chrisndodge committed May 13, 2014
  3c53f16d Browse Files
- cdodge/fix-updates-parsing: seems like studio now uses a different HTML… · 6bbe040d
```
cdodge/fix-updates-parsing: seems like studio now uses a different HTML formatting, e.g. sections & articles rather than ol & li

make backwards compatible to read older versions of Studio produced updates

add some tests
```
  Chris Dodge committed May 13, 2014
  6bbe040d Browse Files
- Changes base on Matt's Feedback · 3f6deda3
```
Changes base on Matt's Feedback
```
  Zia Fazal committed May 13, 2014
  3f6deda3 Browse Files
- New API to get users · 052d51c5
```
Added new API to get enrolled and not enrolled users in Course Content
Group: MCKIN-1027
```
  Zia Fazal committed May 13, 2014
  052d51c5 Browse Files
- Merge pull request #42 from edx-solutions/mattdrayer/api-modulesgroups · d956be1a
```
Mattdrayer/api modulesgroups
```
  Matt Drayer committed May 13, 2014
  d956be1a Browse Files
12 May, 2014 5 commits
- mattdrayer/api-modulesgroups: API - Added grouping capability for courseware content · d7ed4d1e
  Matt Drayer committed May 12, 2014
  
  d7ed4d1e Browse Files
- xblock-fields: Update hash of XBlock repository · 27a99433
  Xavier Antoviaque committed May 12, 2014
  
  27a99433 Browse Files
- Add xmodule fields enforce_type tests · 60d4ba94
  Filippo Valsorda committed May 12, 2014
  
  60d4ba94 Browse Files
- Enforce type of the XBlocks Fields when set · 1f30815e
```
This updates the XBlock dependency to edX/XBlock@***
and add the newly introduced enforce_type methods
```
  Filippo Valsorda committed May 12, 2014
  1f30815e Browse Files
- xblock-fields: Revert "Enforce type of the XBlocks Fields when set" · 7dc68f6e
```
This reverts commit e08b9898.
```
  Xavier Antoviaque committed May 12, 2014
  7dc68f6e Browse Files
09 May, 2014 5 commits
- Update Drag/Drop hash · 39154d24
  chrisndodge committed May 09, 2014
  
  39154d24 Browse Files
- Merge pull request #41 from edx-solutions/mattdrayer/api-timestampedmodels · 81a68631
```
Mattdrayer/api timestampedmodels
```
  Matt Drayer committed May 09, 2014
  81a68631 Browse Files
- Merge pull request #43 from edx-solutions/apply_group_type_fiter_1013 · 9d0f82dd
```
Apply group type fiter 1013
```
  chrisndodge committed May 09, 2014
  9d0f82dd Browse Files
- Merge pull request #44 from edx-solutions/fields_need_visible_updatable_via_api_761 · 00060b1f
```
Fields need visible updatable via api 761
```
  chrisndodge committed May 09, 2014
  00060b1f Browse Files
- apply_group_type_filter_1013 merge with master · 7bb3d0ea
```
apply_group_type_fiter_1013 added request parameter in delete function of UserCoursesDetail
https://github.com/edx-solutions/edx-platform/pull/43
```
  Muhammad Shoaib committed May 09, 2014
  7bb3d0ea Browse Files
08 May, 2014 1 commit
- ooyala: Update hash · c7e8ee25
  Xavier Antoviaque committed May 08, 2014
  
  c7e8ee25 Browse Files