Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4229 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Ahsan Ulhaq
eba02da233 Merge pull request #7544 from edx/ahsan/tnl-1675-iframe-elements-require-meaningful-title 
iframe elements require a meaningful title attribute
 2015-04-16 13:54:15 +05:00
E. Kolpakov
4d3750a526 Pylint fixes 2015-04-15 13:32:32 +03:00
E. Kolpakov
26b1e8d821 Made methods with no implementation abstract 2015-04-15 13:30:27 +03:00
E. Kolpakov
0b2b9fe2e8 Added management command to manually reindex libraries 2015-04-15 13:01:05 +03:00
E. Kolpakov
bd8754b0ee Removed stale test helper method 2015-04-14 16:12:16 +03:00
E. Kolpakov
9bbad95497 Moved library key normalization into library_tools module, fixed library update task test 2015-04-14 14:43:37 +03:00
E. Kolpakov
5737364388 Added library update task test 2015-04-14 12:51:23 +03:00
E. Kolpakov
89443cf5dd Fixed broken test 2015-04-14 12:43:21 +03:00
E. Kolpakov
77cc80f6b6 Added code to fire library_updated signal when library is updated 2015-04-14 12:41:24 +03:00
E. Kolpakov
bd891c21db Added setting to enable/disable library indexing + moved is_index_enabled into search indexer classes 
Added task and signal to fire library reindex
 2015-04-14 12:40:05 +03:00
E. Kolpakov
eb7c5be035 Refactored tests to explicitly state with which modulestores they work 2015-04-14 12:38:36 +03:00
E. Kolpakov
4f6905ed77 Added library search indexer and tests 
Search indexer is not bound to any library modifications, so tests fail - this is expected.
 2015-04-14 12:37:28 +03:00
E. Kolpakov
d34c6a0783 Filtering using search index + tests 2015-04-14 12:32:50 +03:00
Matt Drayer
ffe30da7a5 Add course-specific URL overrides for social sharing icons on student dashboard 
- sharing enabled for custom URLs only if URL actually specified
 2015-04-13 13:14:43 -04:00
louyihua
7a45d6e471 i18n fix in studio 
1. Fix the broken `gettext()` call in `courde_detail.js`
2. Change the string to avoid Transifex misunderstand the pattern '% o' in `checklist.underscore`.
3. Embed the `{filename}` part inside the string in `transcripts-choose.underscore` to provide better i18n flexibililty.
4. Remove all the call of `gettext()` and `${_()}` inside the `mock` directory to aovid mis-extraction by pybabel. (It seems that the `mock` directory is soly used in test? So the strings in this directory need not to be extracted and translated?)
5. The unicode char `\u2014` will trigger a bug inside pybabel which makes the extracted string untranslatable, so remove this char.
 2015-04-13 19:00:52 +08:00
Davorin Sego
e37a98d1be Indexing moved to celery task. Reorganised indexing to always allow for full course reindex. Indexing code no longer needs to be in common, because it is triggered by signal instead of being called.g 2015-04-10 14:30:19 -04:00
Christine Lytwynec
05a8e23d57 Merge pull request #7633 from edx/release 
Release
 2015-04-08 15:40:45 -04:00
Syed Hassan Raza
825aaed67f Split course's assests can access through '/' in asset url 2015-04-08 11:22:25 -04:00
louyihua
297d94a38b Make some strings i18n 2015-04-07 12:56:03 +08:00
Kelketek
5795ba3faf Merge pull request #7482 from open-craft/fix_duplicate_rcb 
Fix duplication of Randomized Content Blocks
 2015-04-03 12:50:09 -05:00
Nimisha Asthagiri
a204cacd74 Merge pull request #7561 from edx/mobile/PLAT-520 
PLAT-520 Fix Asset store import of null values.
 2015-04-03 12:46:21 -04:00
Nimisha Asthagiri
d9d4a007b9 PLAT-520 Fix Asset store import of null values 2015-04-03 11:39:51 -04:00
Sarina Canelake
40dc37dd0f Merge pull request #7563 from louyihua/translation_fix 
Ignore pylint error 7610 (translation-of-non-string) on where it is intended
 2015-04-03 08:47:36 -04:00
Awais Jibran
4ec713e968 Merge pull request #7554 from awaisdar001/aj/tnl473-fix-studio-container-bad-url 
Fixed invalid `usage key` errors which previously throw 500.
 2015-04-03 10:30:41 +05:00
louyihua
0d0d1a0ccd Ignore pylint error 7610 (translation-of-non-string) on where it is intended to do 
As some i18n features need ```ugettext``` or its shorcut ```_``` to be called on a non-string-literal, so the pylint check of ```translation-of-non-string``` should be explicitly disabled in such situations.
 2015-04-03 11:59:53 +08:00
Braden MacDonald
781634558e Improve the test to show a failure case 2015-04-03 01:59:02 +00:00
Jonathan Piacenti
fa95d323c6 Tested version handling, modified modulestore when it didn't work. 2015-04-02 21:41:27 +00:00
Jonathan Piacenti
51905f0cd5 Addressed notes for RCB duplication, removed management buttons from RCB container 2015-04-02 18:26:04 +00:00
Jonathan Piacenti
a6c00635b2 Fix issues with overrides on duplicated RCBs. 2015-04-02 18:23:28 +00:00
Greg Price
eafd12d8de Add "Imported" state to Studio video upload page 
Imported VAL videos get the value "imported" for their status. We
considered not including imported videos on the upload page but have
instead decided to include them, so it is necessary to have a display
string for the imported status value.
 2015-04-01 12:25:07 -04:00