Commits · 32d5fd2be9d5ba2265ff29ccabb8c53f2761ea1f · edx / edx-platform · GitLab

21 May, 2014 7 commits
- ooyala: Update hash · 32d5fd2b
  Xavier Antoviaque committed May 21, 2014
  
  32d5fd2b Browse Files
- Update drag-and-drop requirements hash · a5f2c59e
  chrisndodge committed May 21, 2014
  
  a5f2c59e Browse Files
- ooyala: Update hash · 7012147a
  Xavier Antoviaque committed May 21, 2014
  
  7012147a Browse Files
- mentoring: Update hash · 4cd4f523
  Xavier Antoviaque committed May 21, 2014
  
  4cd4f523 Browse Files
- ooyala: Update hash · 2a3dc3d0
  Xavier Antoviaque committed May 21, 2014
  
  2a3dc3d0 Browse Files
- Merge pull request #57 from edx-solutions/mattdrayer/api-userscleanup · c54f853d
```
Mattdrayer/api userscleanup
```
  Matt Drayer committed May 20, 2014
  c54f853d Browse Files
- Merge pull request #55 from edx-solutions/mattdrayer/api-coursescleanup · 6efcb4d0
```
Mattdrayer/api coursescleanup: Docstrings and some style improvements
```
  Matt Drayer committed May 20, 2014
  6efcb4d0 Browse Files
20 May, 2014 5 commits
- Merge pull request #58 from mtyaka/patch-2 · 4e3c1d27
```
Update django-splash.
```
  Xavier Antoviaque committed May 20, 2014
  4e3c1d27 Browse Files
- mattdrayer/api-userscleanup: Added docstrings and changed to fail-fast style · 28d3d335
  Matt Drayer committed May 20, 2014
  
  28d3d335 Browse Files
- mattdrayer/api-coursescleanup: Added docstrings and improved format/style in several places · 254979b6
  Matt Drayer committed May 20, 2014
  
  254979b6 Browse Files
- Update django-splash. · c7e4b6c1
```
The new release supports wildcards in path exclusion rules.
```
  Matjaz Gregoric committed May 20, 2014
  c7e4b6c1 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 1 commit
- mattdrayer/api-modulesgroups: API - Added grouping capability for courseware content · d7ed4d1e
  Matt Drayer committed May 12, 2014
  
  d7ed4d1e Browse Files