Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,229 Commits 1 Branch 0 Tags
90daffe33d5ce5ebc56d40aa8ea4b63dfe65aa8c
Commit Graph

1662 Commits

Author SHA1 Message Date
Andy Armstrong
358aa7754b Add "Teams Configuration" advanced setting 2015-05-15 14:13:41 -04:00
christopher lee
5cef287c5d MA-635 Block Mobile Content for unfulfilled milestones 
Previously, the mobile api did not check for pre-requisite courses
or entrance exams. This change checks for these milestones and then
returns course content accordingly.
 2015-05-15 09:39:54 -04:00
Awais Qureshi
b8efb5423a Merge pull request #7951 from edx/awais786/ECOM-1531-fake-page-ssecure 
ECOM-1531 adding the fake-page for softwar secure.
 2015-05-13 12:02:32 +05:00
Brian Talbot
898012518b LMS: removing manual Sass/CSS extend files needed for IE9 and below 2015-05-12 10:36:32 -04:00
Awais
58b7e7fb33 ECOM-1531 adding the fake-page for softwar secure. 2015-05-12 14:21:49 +05:00
Carson Gee
38b61fd86f Merge pull request #7699 from mitocw/feature/cg/ccx_settings 
Add CCX/IDDE configuration to yaml_config.py
 2015-05-08 18:14:03 -04:00
Feanil Patel
6289b190d9 Fix pep8 and pylint. 2015-05-08 09:01:50 -04:00
Feanil Patel
4cc39abfa4 Update celery config for config files I missed. 2015-05-08 09:01:50 -04:00
Feanil Patel
3b2a750d33 Update the cache backend for the new version of celery and djcelery. 2015-05-08 09:01:49 -04:00
Feanil Patel
27223ae80f Load celery for CMS as well. 2015-05-08 09:01:48 -04:00
Feanil Patel
34df5a32d2 Get LMS tests passing. 2015-05-08 09:01:48 -04:00
Martyn James
2f398559ae Merge pull request #7845 from edx/mjevtic/SOL-776 
(SOL-776)(SOL-740)(SOL-532) Prerequisites for course discovery feature
 2015-05-07 14:05:38 -04:00
Gabe Mulley
411df0ae3a Merge pull request #7802 from edx/gabe/user-track 
Make user_track use eventtracking
 2015-05-07 08:43:21 -04:00
marjev
8107073c58 (SOL-776)(SOL-740)(SOL-532) Added setting flags for COURSE DISCOVERY feature; Exposed course search input as well as the course result page; Added flag for limiting the number of course cards on the homepage; 2015-05-07 08:57:04 +02:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
muzaffaryousaf
f5de0bbf43 Enable unit preview by default. 
TNL-1261
 2015-05-06 12:40:44 +05:00
Christina Roberts
31a19c0f63 Merge pull request #7823 from edx/christina/notes-tagging 
Add tags plugin.
 2015-05-04 20:56:52 -04:00
cahrens
5fe384ca2b Add tags plugin. 
TNL-1924
 2015-05-04 16:00:18 -04:00
Greg Price
c006befdaf Merge pull request #7767 from edx/gprice/discussion-api-topics 
Add discussion topic API
 2015-04-30 18:05:08 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release 
Release (DO NOT MERGE)
 2015-04-30 16:24:47 -04:00
Greg Price
ebff94af3f Add discussion topic API 
This is the first stage of the new Discussion API.

JIRA: MA-604
 2015-04-30 14:25:05 -04:00
Feanil Patel
934207bf03 Fixes to get it working with master. 2015-04-28 10:23:08 -04:00
Andy Armstrong
f439a09e71 Obey microsite configuration for default profile image 
TNL-2073
 2015-04-27 15:04:51 -04:00
Martyn James
1eeca4d81f Merge pull request #7522 from edx/feature/dashboard-search 
Feature/dashboard search
 2015-04-27 09:46:35 -04:00
Davorin Sego
71feb068e3 Dashboard search feature 2015-04-24 09:45:12 -04:00
Phil McGachey
6c1d997347 [LTI Provider] Create LTI Provider app, initial views and OAuth signature validation 2015-04-23 13:45:47 -04:00
zubair-arbi
05068f1b94 fix reverification link in lms 
ECOM-1437
 2015-04-23 17:58:33 +05:00
Aamir
a900e1f7ec Merge pull request #7660 from edx/aamir-khan/ECOM-1396/checkoint-name-field 
Aamir khan/ecom 1396/checkoint name field
 2015-04-23 12:06:09 +05:00
Andy Armstrong
4f5a2e1bc8 Fix default profile images for edx.org 
TNL-2054
 2015-04-22 16:33:00 -04:00
aamir-khan
d606ae97fb ECOM-1396: added the function to check is the xblock published 2015-04-22 19:23:33 +05:00
Muhammad Ammar
7babb3efed Merge pull request #7696 from edx/ammar/tnl1740-add-simplified-and-traditional-chinese-transcript-language-options 
Add Simplified and Traditional Chinese as Transcript language options
 2015-04-21 18:28:17 +05:00
muzaffaryousaf
c2d83bd4a6 Bok_choy tests for upload/remove profile image. 
TNL-1538
 2015-04-17 17:23:17 -04:00
Andy Armstrong
f03841a6bb Add client-side events for viewing pages 
TNL-1504
 2015-04-17 17:23:16 -04:00
cahrens
970c77ffbf Pep8/pylint error. 2015-04-17 17:23:14 -04:00
cahrens
39688e337b Set default profile visibility to all_users. 2015-04-17 17:23:14 -04:00
Andy Armstrong
6c3b94d249 Bump User API and Profile Images API to v1 
TNL-1669
 2015-04-17 17:23:13 -04:00
Daniel Friedman
7330b2bf0a Pull additional profile image settings from configuration 2015-04-17 17:23:13 -04:00
Daniel Friedman
23f02d9492 Configurations for filesystem and s3 backends. 
TNL-1789
 2015-04-17 17:23:13 -04:00
Andy Armstrong
c898e4137b Add default profile images 
TNL-1796
 2015-04-17 17:23:12 -04:00
jsa
46b63164a0 Implement profile_image upload and remove endpoints 
TNL-1537

Co-Authored-By: Andy Armstrong <andya@edx.org>
Co-Authored-By: cahrens <christina@edx.org>
 2015-04-17 17:23:12 -04:00
Daniel Friedman
97e44ed20f Implement language proficiencies. 
TNL-1488
 2015-04-17 17:23:12 -04:00
Andy Armstrong
650a9a9b85 Implement parental controls for user profiles 
TNL-1606
 2015-04-17 17:23:11 -04:00
Daniel Friedman
6f6fdbfb5f Integrate profile images into Accounts API 
TNL-1545
 2015-04-17 17:23:11 -04:00
Adam
2745398dc0 Merge pull request #7729 from edx/adam/different-queue-small-emails 
Adam/different queue small emails
 2015-04-17 16:02:11 -04:00
Adam Palay
f37c7934f0 reset queue reference in aws.py, use low priority queue (TNL-1591) (TNL-2003) 2015-04-16 15:41:16 -04:00
Braden MacDonald
513591f409 Bump problem builder version to latest edx-release build 2015-04-16 11:56:50 -07:00
Carson Gee
b6970d9aa3 Put CCX URLs behind their feature flag 
- Moved the CCX URLS into their django app.
 2015-04-15 16:38:10 -04:00
Adam Palay
afb2dae631 Revert "Revert "use different queue for smaller emails (TNL-1591)"" 
This reverts commit 228cca4e38ec79f5cbb54098c788ab9556f602e2.
 2015-04-15 12:03:23 -04:00
Carson Gee
4afedbb001 Add CCX configuration to yaml_config.py 2015-04-15 10:39:32 -04:00
muhammad-ammar
cec4bb3101 Add Simplified and Traditional Chinese as Transcript language options 
TNL-1740
 2015-04-15 15:38:42 +05:00