Commits · 8e8a3ce0bb3f2d3e373bba3132c4a1f3d4ea36db · edx / edx-platform · GitLab

28 Apr, 2015 5 commits
- Merge pull request #438 from edx-solutions/revert-435-derf/clean_up_migrations · 8e8a3ce0
```
Revert "clean up unnecessary migration"
```
  Fred Smith committed Apr 28, 2015
  8e8a3ce0 Browse Files
- Revert "clean up unnecessary migration" · 133a844c
  Fred Smith committed Apr 28, 2015
  
  133a844c Browse Files
- Merge pull request #435 from edx-solutions/derf/clean_up_migrations · 314da05d
```
clean up unnecessary migration
```
  Fred Smith committed Apr 28, 2015
  314da05d Browse Files
- mentoring: Update hash · b3ff4f59
  Xavier Antoviaque committed Apr 28, 2015
  
  b3ff4f59 Browse Files
- problem-builder: Update hash · c0b63023
  Xavier Antoviaque committed Apr 28, 2015
  
  c0b63023 Browse Files
27 Apr, 2015 3 commits
- Merge pull request #434 from edx-solutions/braden/add-problem-builder · 7e49e8c5
```
Bump Problem Builder to latest version
```
  Braden MacDonald committed Apr 27, 2015
  7e49e8c5 Browse Files
- Bump Problem Builder to latest version and make the platform detect it as a Django app · 5c1cc58d
  Braden MacDonald committed Apr 27, 2015
  
  5c1cc58d Browse Files
- clean up unnecessary migration · ba4c52a1
```
This migration is duplicated in the organization application.
```
  Fred Smith committed Apr 27, 2015
  ba4c52a1 Browse Files
24 Apr, 2015 3 commits
- Merge pull request #433 from edx-solutions/ekolpakov/dependency_updates · 2c973a7c
```
Bumped XBlock version to include List/Dict string coercion
```
  Zia Fazal committed Apr 24, 2015
  2c973a7c Browse Files
- Bumped XBlock version to include List/Dict string coercion · 47f4387e
  E. Kolpakov committed Apr 24, 2015
  
  47f4387e Browse Files
- problem-builder: Update hash · 549c63ef
  Xavier Antoviaque committed Apr 24, 2015
  
  549c63ef Browse Files
23 Apr, 2015 5 commits
- Update xblock-poll hash. · 78fba458
  Kelketek committed Apr 23, 2015
  
  78fba458 Browse Files
- Merge pull request #425 from edx-solutions/release · 146f412c
```
Merge Release back into master
Conflicts:
	cms/envs/aws.py
	requirements/edx/custom.txt
```
  Fred Smith committed Apr 23, 2015
  146f412c Browse Files
- Update xblock-poll hash. · 9053d9fa
  Kelketek committed Apr 23, 2015
  
  9053d9fa Browse Files
- while 0 is less than 3, 0 means 'not in leaderboard'. So don't send a… · 93adb169
```
while 0 is less than 3, 0 means 'not in leaderboard'. So don't send a Notification is somone is in the 0th rank in social engagement
```
  Chris Dodge committed Apr 23, 2015
  93adb169 Browse Files
- Merge pull request #432 from edx-solutions/braden/add-display_name-fix · b8c4740c
```
Consistently use display_name_with_default in Studio
```
  Xavier Antoviaque committed Apr 23, 2015
  b8c4740c Browse Files
21 Apr, 2015 4 commits
- Consistently use display_name_with_default in Studio · 29da0a8a
  Braden MacDonald committed Apr 21, 2015
  
  29da0a8a Browse Files
- 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 7 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