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

5927 Commits

Author SHA1 Message Date
Adam
4a8cd270a1 Merge pull request #7988 from edx/shr/bug/PLAT-612-video-component-missing-tests 
edx-val-Fix VAL error on re-import
 2015-05-11 13:25:43 -04:00
Syed Hassan Raza
103fa38860 edx-val-Fix VAL error on re-import 2015-05-11 20:00:55 +05:00
Awais Jibran
5e91c37b4e Configuration error on course re-run 
TNL 2098
 2015-05-11 16:19:21 +05:00
Adam
58b34e1cc4 Merge pull request #7974 from edx/merge-release-to-master 
Merge release to master
 2015-05-08 14:24:14 -04:00
Feanil Patel
219b9a0cc6 Merge pull request #7842 from edx/feanil/update_celery 
Update to the latest version of celery, and django-celery.
 2015-05-08 13:41:18 -04:00
Martyn James
552c0bc734 Move location identifying strings into index 2015-05-08 11:29:07 -04:00
Adam Palay
8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master 
Conflicts:
	common/test/acceptance/tests/video/test_video_times.py
 2015-05-08 10:23:04 -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
27223ae80f Load celery for CMS as well. 2015-05-08 09:01:48 -04:00
Shrhawk
7b53584653 Merge pull request #7621 from edx/shr/bug/TNL-1858-Unable-to-delete-studio-page 
Delete static_tab for split courses raises 500 error
 2015-05-08 15:06:03 +05:00
Martyn James
fb51c6abd3 Exclude filtering for micorosite orgs 2015-05-07 21:39:07 -04:00
Syed Hassan Raza
e7aeb92182 update the attrib using dict-->update() function 2015-05-07 14:05:27 -04:00
Adam Palay
afec81b662 prevent overly nesting _field_data (TNL-2050) 2015-05-07 14:05:27 -04:00
Christine Lytwynec
56580510ea add lettuce features to the omitted directories in coveragerc files 2015-05-07 11:50:02 -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
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
Muzaffar yousaf
0ca9f9667a Merge pull request #7810 from edx/muzaffar/tnl1261-studio-prview 
Enable unit preview by default.
 2015-05-06 21:06:49 +05:00
Dino Cikatic
21917461cf Fixes index function to not index children without published version 2015-05-06 14:46:24 +02:00
Syed Hassan Raza
b7955fab77 Static tab as orphan 2015-05-06 16:18:14 +05:00
muzaffaryousaf
f5de0bbf43 Enable unit preview by default. 
TNL-1261
 2015-05-06 12:40:44 +05:00
Shrhawk
d60b4eed13 Merge pull request #7871 from edx/shr/bug/TNL-2094-6.00.x-export-issue 
update the attrib using dict-->update() function
 2015-05-05 12:08:29 +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
Syed Hassan Raza
1175047d12 update the attrib using dict-->update() function 2015-05-04 21:07:40 +05:00
Martyn James
c776272a8f Merge pull request #7654 from edx/mjames/SOL-280 
Index course information alongside courseware
 2015-04-30 23:27:17 -04:00
Martyn James
b9f1c5db60 Index course information alongside courseware 
Conflicts:
	cms/djangoapps/contentstore/tests/test_courseware_index.py
 2015-04-30 16:05:57 -04:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04:00
Ahsan Ulhaq
5a1d180f14 Merge pull request #7790 from edx/ahsan/AC-34-visually-hidden-contents-accessible-via-keyboard 
Visually hidden content accessible through keyboard
 2015-04-29 06:19:41 -04:00
Matt Drayer
c6ecf2551e Fix for SOL-475 (double exam grader bug) 
- Remove grader(s) upon deletion of existing entrance exam
- Remove grader(s) upon addition of new entrance exam
 2015-04-28 12:49:03 -04:00
Mark Hoeber
323e466e21 Merge pull request #7579 from edx/sylvia/docs/templateupdates 
Update component templates, round 1
 2015-04-27 20:43:29 -04:00
Mark Hoeber
356b10c271 Update component templates for accessibility and content 2015-04-27 14:45:36 -04:00
Nimisha Asthagiri
c8e0095fbb MA-668 Mobile Push Notification payload update 
Support iOS receiving the update even when in the background.
Support Android detecting duplicates.
 2015-04-24 17:23:22 -04:00
Ahsan Ulhaq
017916fa75 Visually hidden content accessible through keyboard 
The "New Course" and "New Library" buttons reveal a form to add course or library.
When not displayed, these forms are still accessible to a keyboard user.
Added display: "none" in css so that contents are visually as well as via
keyboard inaccessible

AC-34
 2015-04-23 20:41:46 +05:00
Nimisha Asthagiri
11044ebdf2 MA-614 Mobile Push Notification Studio UI 2015-04-18 15:30:25 -04:00
Nimisha Asthagiri
b124485ed6 MA-611, MA-613 Mobile Push Notification Studio Backend; Integration with Parse 2015-04-18 15:30:19 -04:00
Nimisha Asthagiri
a87c881024 MA-612 Mobile Push Notification Studio Django admin setting 2015-04-18 15:30:14 -04:00
muhammad-ammar
cfcb38c498 Update user message strings 2015-04-17 17:23:19 -04:00
muhammad-ammar
9c2d18710c Jasmine tests for account settings page. 
TNL-1499
 2015-04-17 17:23:14 -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
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
Eugeny Kolpakov
b1765d0a69 Merge pull request #7641 from open-craft/eugeny/problem-type-search 
Capa problem type filtering using edx-search
 2015-04-17 18:43:04 +03:00
E. Kolpakov
d4f85d876b Removed unnecessary comments 2015-04-17 12:24:37 +03:00
E. Kolpakov
3b348b7d3f Tests for reindex library management command 2015-04-17 12:20:31 +03:00
Braden MacDonald
00db27b63e Merge pull request #7638 from open-craft/problem-builder-version-bump 
Bump version of Problem Builder
 2015-04-16 16:38:57 -07:00
Braden MacDonald
513591f409 Bump problem builder version to latest edx-release build 2015-04-16 11:56:50 -07:00
Sarina Canelake
cb333c414a Merge pull request #7670 from louyihua/lms_i18n_1 
Better i18n (cont.)
 2015-04-16 14:05:53 -04:00
louyihua
b7c6b4ad55 Better i18n (cont.) 
1. Fix sentence breaks inside `photo_reverification.html` and `midcourse_photo_reverification.html`.
2. Combine three setences inside `choose.html`.
3. Adding some punctuation marks to reduce duplicated strings with only different Punctuation marks in translation.
4. Move the colons inside the strings to be translated. This may be not necessary for now, but I think this may help translation by removing potential word meaning conflict.
5. Sorry for
 2015-04-17 01:05:46 +08:00