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

11117 Commits

Author SHA1 Message Date
Matt Drayer
495583ac7d Merge pull request #6782 from edx/mattdrayer/generalize-entrance-exam-scoring 
Decoupled entrance exam scoring from milestone fulfillment
 2015-01-28 23:15:58 -05:00
Matt Drayer
8b03ad3906 Decoupled entrance exam scoring from milestone fulfillment 2015-01-28 22:00:25 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Andy Armstrong
a9127c1897 Merge pull request #6804 from edx/will/revert-require-js-optimizer-again 
Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
 2015-01-28 18:30:16 -05:00
jsa
dbc465a518 reuse instances of OSFS in old mongo 2015-01-28 18:23:23 -05:00
Adam Palay
4a76a629f6 Revert "Fix tolerance broken" 
This reverts commit 66b949b745.
 2015-01-28 18:23:22 -05:00
John Eskew
e600d6e3b1 Add BlockData class to wrap all block data loaded from the Split 
modulestore, in order to separate serializable block data from
out-of-band, non-saved, temporary metadata.

Eliminate the deepcopy causing performance problems with import/export.

https://openedx.atlassian.net/browse/PLAT-416
 2015-01-28 18:23:22 -05:00
Calen Pennington
6cb55e1a36 Stringify ObjectIds before attempting to make a filename out of them 2015-01-28 18:23:22 -05:00
Calen Pennington
1160306438 Replace SplitMongo thread_cache usage with use of request_cache 2015-01-28 18:23:22 -05:00
Jonathan Piacenti
ed20d5a136 Inverted boolean for rendering in CheckVisible. 2015-01-28 22:58:56 +00:00
Jonathan Piacenti
bd57d56bdd Add classes to group of elements for cohort selector. 
Retriggring Jenkins build
 2015-01-28 22:51:46 +00:00
Matt Drayer
9d2a0a4e9d Merge pull request #6705 from edx/mattdrayer/update-milestones-hash 
Bok Choy test now passes
 2015-01-28 17:38:18 -05:00
Matt Drayer
e5f00e626a Bok Choy test now passes 2015-01-28 17:37:49 -05:00
Will Daly
b467ae8cde Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit b8184d188f.
 2015-01-28 17:26:46 -05:00
Matt Drayer
dc0816669d Merge pull request #6792 from edx/ziafazal/make-course-requirements-links 
make course requirement as link
 2015-01-28 16:56:35 -05:00
Matt Drayer
ce5c7948fa Added field to FILTERED_LIST plus a new bokchoy test 2015-01-28 13:11:36 -05:00
jsa
513f8cefd8 reuse instances of OSFS in old mongo 2015-01-28 12:45:49 -05:00
muzaffaryousaf
7b10d14f5d Adding 'user_is_staff' filed to opt_attrs in xblock user. 
TNL-1185
 2015-01-28 21:37:25 +05:00
Adam Palay
e20b77b4f8 Revert "Fix tolerance broken" 
This reverts commit 66b949b745.
 2015-01-28 10:21:01 -05:00
Chris Rodriguez
9e2494b21d Video player branding addition for XuetangX 2015-01-28 06:39:21 -05:00
muzaffaryousaf
2189ef7c50 Fixing the library tests. 
TNL-836
 2015-01-28 15:01:40 +05:00
Zia Fazal
ba5fd98aaf make course requirement as link 2015-01-28 14:26:27 +05:00
muzaffaryousaf
4d72910060 Adding get_anonymous_user_id in Xblock 'user' service. 
TNL-836
 2015-01-28 12:47:49 +05:00
Waheed Ahmed
4ac7b55757 Fixed transcript skip first line if it contains BOM(Byte Order Mark). 
TNL-935
 2015-01-28 12:26:16 +05:00
Giulio Gratta
c18ee8cc09 Add cosmetic price field to studio & logic 
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
 2015-01-27 15:15:43 -08:00
Andy Armstrong
6201af652b Merge pull request #6765 from edx/andya/requirejs-in-lms 
Add RequireJS to the LMS
 2015-01-27 17:57:33 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS 
[second attempt which addresses bug building Studio]
 2015-01-27 17:56:29 -05:00
Renzo Lucioni
bcf6461e0b Merge pull request #6769 from edx/renzo/fix-flaky-bok-choy-tests 
Fix intermittent failures in bok-choy tests of payment and verification
 2015-01-27 13:32:10 -05:00
Shrhawk
61e9519b53 Merge pull request #6709 from edx/shr/bug/TNL-1229-Burst-errors 
Invalid youtube_id raise NotFoundError for transcripts
 2015-01-27 20:29:13 +05:00
John Eskew
68325f1c2e Add BlockData class to wrap all block data loaded from the Split 
modulestore, in order to separate serializable block data from
out-of-band, non-saved, temporary metadata.

Eliminate the deepcopy causing performance problems with import/export.

https://openedx.atlassian.net/browse/PLAT-416
 2015-01-27 10:01:55 -05:00
Calen Pennington
d9dc82ba41 Stringify ObjectIds before attempting to make a filename out of them 2015-01-27 10:01:55 -05:00
Calen Pennington
c29f3af186 Replace SplitMongo thread_cache usage with use of request_cache 2015-01-27 10:01:54 -05:00
polesye
a2a28880c5 TNL-1116: Fix clicking bug. 2015-01-27 11:22:46 +02:00
Omar Al-Ithawi
38db6e695d Giant fixups for the editors around the studio 2015-01-27 11:11:55 +02:00
Syed Hassan Raza
e2ecb0db46 Invalid youtube_id raise NotFoundError for transcripts 
TNL-1229
 2015-01-27 11:48:08 +05:00
Renzo Lucioni
4f23c31d8b Fix intermittent failures in bok-choy tests of payment and verification 2015-01-26 17:22:21 -05:00
Will Daly
305f0c3338 Can disable rate limiting for enrollment API end-points using model-based configuration. 2015-01-26 15:28:04 -05:00
Omar Al-Ithawi
1714d23ae8 TinyMCE RTL in course bulk email 2015-01-25 18:07:08 +02:00
Stephen Sanchez
6616b7b5c9 Merge pull request #6731 from edx/sanchez/cache_course_enrollment_details 
Adding caching to the course details endpoint for the Enrollment API.
 2015-01-23 08:55:02 -05:00
Stephen Sanchez
267ec24f0a Merge pull request #6735 from edx/sanchez/allow_enrollment_without_username 
Enrollment API to be used without knowing the current user name.
 2015-01-22 16:37:45 -05:00
David Baumgold
ccc2dd8327 Merge pull request #6722 from Stanford-Online/giulio/shorten-course-module-py-line-lengths 
Shortened line length of studio help strings
 2015-01-22 16:16:33 -05:00
stephensanchez
896bc1c859 Adding caching to the course details endpoint for the Enrollment API. 2015-01-22 20:58:22 +00:00
stephensanchez
2d1d58225a Allow the enrollment API to be used without knowing the authenticted user name. 2015-01-22 19:50:02 +00:00
Giulio Gratta
47a0e3441e Shortened line length of studio help strings 2015-01-22 09:48:41 -08:00
Usman Khalid
3d4a853e00 Merge pull request #5926 from Stanford-Online/kluo/lti-grades-past-due 
Make LTI grade submissions respect deadlines
 2015-01-22 19:55:21 +05:00
Kevin Luo
af9dce82a3 Make LTI grade submissions respect deadlines 2015-01-21 17:05:46 -08:00
Will Daly
fcd7736d29 Merge pull request #6721 from edx/will/revert-requirejs-changes 
Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
 2015-01-21 19:07:34 -05:00
Braden MacDonald
4198da1ae1 Merge pull request #6657 from open-craft/fix-library-old-mongo-default 
Fix errors with libraries when old mongo is default (first) modulestore (SOL-234)
 2015-01-21 15:05:12 -08:00
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit 1d6fceda50.
 2015-01-21 17:13:27 -05:00
Will Daly
1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms 
Add RequireJS and RequireJS Optimizer configuration to the LMS
 2015-01-21 15:23:35 -05:00