Commits · a7a5d9dbe6b91e5cd82a720e438f034ec652d9aa · edx / edx-platform

25 Nov, 2014 1 commit
- Fixed production deployment issue caused by staticfiles url replacements (see… · a7a5d9db
```
Fixed production deployment issue caused by staticfiles url replacements (see replace_static_urls/__init__.py -> replace_static_urls)
```
  E. Kolpakov committed Nov 25, 2014
  a7a5d9db Browse Files
21 Nov, 2014 3 commits
- Copied discussion tests from upstream · d9f7b6f3
  E. Kolpakov committed Nov 21, 2014
  
  d9f7b6f3 Browse Files
- Fixed changing thread type · 72ccb87d
  E. Kolpakov committed Nov 21, 2014
  
  72ccb87d Browse Files
- Added discussion xblocks to course categories map · c67fc0d9
  E. Kolpakov committed Nov 21, 2014
  
  c67fc0d9 Browse Files
20 Nov, 2014 2 commits
- Fixed broken backbone history navigation in course mode. Moved runtime-specific… · 30c31894
```
Fixed broken backbone history navigation in course mode. Moved runtime-specific settings modifications to runtime callbacks.
```
  E. Kolpakov committed Nov 20, 2014
  30c31894 Browse Files
- Reworked discussion assets management to work on production like environment… · 0ef7fa2c
```
Reworked discussion assets management to work on production like environment (pipelines+nginx proxy)
```
  E. Kolpakov committed Nov 20, 2014
  0ef7fa2c Browse Files
19 Nov, 2014 1 commit
- Removed unused discussion-app.css, corrected utils.py to streamline icluding discussion js files · 8ad62cbc
  E. Kolpakov committed Nov 19, 2014
  
  8ad62cbc Browse Files
14 Nov, 2014 9 commits
- Global setting for asynchronous ajax calls - to overcome firefox's strictness… · de68896f
```
Global setting for asynchronous ajax calls - to overcome firefox's strictness about using synchronous ajax with credentials
```
  E. Kolpakov committed Nov 14, 2014
  de68896f Browse Files
- Disabled starting discussion course apps (DiscussionApp and DiscussionProfileApp) on DOM ready: · 6f38997e
```
* Added scripts to XModule templates to start the apps..
* Added explicit call in XBlock to start required app.

Added concept of local urls - required to substitute absolute links for user profiles for relative in Apros
```
  E. Kolpakov committed Nov 14, 2014
  6f38997e Browse Files
- Fixed other broken bok_choy tests: environment setup · b848b53e
  E. Kolpakov committed Nov 14, 2014
  
  b848b53e Browse Files
- Fixed broken bok_choy tests + added API key for bok_choy environment setup · fc6e690f
  E. Kolpakov committed Nov 14, 2014
  
  fc6e690f Browse Files
- Temporary fix for runtime.resources_fs error · 0dae90ae
  Don Mitchell committed Nov 14, 2014
  
  0dae90ae Browse Files
- Backported edx-platform hosted discussion XBlock to edx-solutions (part 2) · a9f74b94
  E. Kolpakov committed Nov 14, 2014
  
  a9f74b94 Browse Files
- Add topic selection to inline thread editing, fixing errors · 102fb523
```
Co-Authored-By: Brian Talbot <btalbot@edx.org>

TNL-549

Conflicts:
	common/static/coffee/spec/discussion/view/discussion_thread_edit_view_spec.js
	common/static/coffee/src/discussion/discussion_module_view.coffee
	common/static/coffee/src/discussion/views/discussion_thread_edit_view.js
	lms/djangoapps/django_comment_client/forum/views.py
```
  jsa committed Nov 14, 2014
  102fb523 Browse Files
- Copied test specs · cb6bc3b0
  jsa committed Nov 14, 2014
  
  cb6bc3b0 Browse Files
- Moved discussion XBlock to edx-platform · 70067eb6
```
(cherry picked from commit a7c0a2a)
```
  E. Kolpakov committed Nov 14, 2014
  70067eb6 Browse Files
13 Nov, 2014 2 commits
- drag-n-drop: Update hash · 6efca845
  Xavier Antoviaque committed Nov 13, 2014
  
  6efca845 Browse Files
- Merge pull request #311 from open-craft/fix_test_runners · 13b13910
```
A few patches to fix dependency issues with Organizations.
```
  Xavier Antoviaque committed Nov 13, 2014
  13b13910 Browse Files
12 Nov, 2014 1 commit
- mentoring: update hash · 5ff43758
  Xavier Antoviaque committed Nov 12, 2014
  
  5ff43758 Browse Files
11 Nov, 2014 1 commit
- discussion: Update hash · 0197f00c
  Xavier Antoviaque committed Nov 11, 2014
  
  0197f00c Browse Files
10 Nov, 2014 4 commits
- Merge pull request #315 from edx-solutions/mattdrayer/api-remove-isactive-user-filter · e2a8d8dc
```
mattdrayer/api-remove-isactive-user-filter: Removed registration check f...
```
  Matt Drayer committed Nov 10, 2014
  e2a8d8dc Browse Files
- mattdrayer/api-remove-isactive-user-filter: Removed registration check from older operations · 9421eef3
  Matt Drayer committed Nov 10, 2014
  
  9421eef3 Browse Files
- Merge pull request #314 from edx-solutions/ziafazal/api-update-user-title-when-empty · 3f11ab14
```
ziafazal/api-update-user-title-when-empty:accept empty user title
```
  Matt Drayer committed Nov 10, 2014
  3f11ab14 Browse Files
- ziafazal/api-update-user-time-when-emtpy:accept empty user title · 20f972b4
```
added comment
```
  Zia Fazal committed Nov 10, 2014
  20f972b4 Browse Files
07 Nov, 2014 2 commits
- Merge pull request #293 from edx-solutions/ziafazal/api-move-cmc-to-progress · 546ae2c0
```
moved cmc from api_manager to progress
```
  Matt Drayer committed Nov 07, 2014
  546ae2c0 Browse Files
- Updating group project xblock hash · 4822b37a
  Martyn James committed Nov 07, 2014
  
  4822b37a Browse Files
06 Nov, 2014 4 commits
- A few patches to fix dependency issues with Organizations. · 5e967365
  Jonathan Piacenti committed Nov 06, 2014
  
  5e967365 Browse Files
- Merge pull request #308 from edx-solutions/derf/progress_detached_categories_setting · 5031854b
```
set PROGRESS_DETACHED_CATEGORIES for prod environments
```
  Fred Smith committed Nov 06, 2014
  5031854b Browse Files
- set PROGRESS_DETACHED_CATEGORIES for prod environments · f2d4a14f
  Fred Smith committed Nov 06, 2014
  
  f2d4a14f Browse Files
- mattdrayer/api-migrate_transitional_ids: Cleaned up two additional tables · 84a3a512
```
merged with master

changes after matts suggestions
```
  Matt Drayer committed Nov 06, 2014
  84a3a512 Browse Files
05 Nov, 2014 4 commits
- image-explorer: Update hash · fb5c7c7c
  Xavier Antoviaque committed Nov 05, 2014
  
  fb5c7c7c Browse Files
- Merge pull request #304 from edx/clintonb/api-cleanup · 31dabfcf
```
Using course ID regex from set
```
  Matt Drayer committed Nov 05, 2014
  31dabfcf Browse Files
- Merge branch 'release' into master · b1324d3e
  Xavier Antoviaque committed Nov 05, 2014
  
  b1324d3e Browse Files
- mentoring: Update hash · 6567b83f
  Xavier Antoviaque committed Nov 05, 2014
  
  6567b83f Browse Files
04 Nov, 2014 5 commits
- Using course ID regex from set · f7d18806
```
- API now use same regex as the rest of LMS
- Content regex includes the period (.) character
```
  Clinton Blackburn committed Nov 04, 2014
  f7d18806 Browse Files
- Merge pull request #303 from edx-solutions/mattdrayer/api-migrate_transitional_ids · 9169d854
```
mattdrayer/api-migrate_transitional_ids: Cleaned up two additional table...
```
  Matt Drayer committed Nov 04, 2014
  9169d854 Browse Files
- Merge pull request #302 from edx-solutions/mattdrayer/api-migrate_transitional_ids · 7c5e0c05
```
mattdrayer/api-migrate_transitional_ids: Cleaned up two additional table...
```
  Matt Drayer committed Nov 04, 2014
  7c5e0c05 Browse Files
- mattdrayer/api-migrate_transitional_ids: Cleaned up two additional tables · fda05a6c
  Matt Drayer committed Nov 03, 2014
  
  fda05a6c Browse Files
- Merge pull request #301 from edx-solutions/master · 00033f21
```
changes from master to release
```
  Fred Smith committed Nov 03, 2014
  00033f21 Browse Files
03 Nov, 2014 1 commit
- Merge pull request #300 from edx-solutions/mattdrayer/api-update-project-fkey · 14ceffcb
```
mattdrayer/api-update-project-fkey: Added organizations FK
```
  Matt Drayer committed Nov 03, 2014
  14ceffcb Browse Files