Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,322 Commits 1 Branch 0 Tags
3ebac80778dd571ac978692032a678971cbcfb50
Commit Graph

20322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones 
STUD-1006
 2014-01-14 17:04:44 -05:00
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -05:00
Ned Batchelder
5b60b8bb3c Merge pull request #2170 from edx/ned/convert-contributing 
Converted CONTRIBUTING to .rst
 2014-01-14 11:51:24 -08:00
Ned Batchelder
d6b05cfcd0 Converted CONTRIBUTING to .rst 2014-01-14 14:08:07 -05:00
Calen Pennington
d2a0df4118 Merge pull request #2129 from cpennington/xblocks-xml-import-export 
XBlock Xml Serialization/Deserialization
 2014-01-14 10:56:09 -08:00
Greg Price
3c3ef50e13 Merge pull request #2168 from edx/gprice/forum-coffee-i18n 
Internationalize forums CoffeeScript code
 2014-01-14 10:55:08 -08:00
Calen Pennington
a55724d117 Prevent unicode data from being injected into a Location using the _replace function 2014-01-14 13:28:49 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization 
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
 2014-01-14 13:28:47 -05:00
Ned Batchelder
566bb16220 Implement InheritanceFieldData 2014-01-14 13:09:36 -05:00
Ned Batchelder
1932c126b8 Rename DbModel to KvsFieldData. 2014-01-14 13:09:36 -05:00
Ned Batchelder
679f1d68fc Remove unused things. 2014-01-14 13:09:36 -05:00
Ned Batchelder
b6bd293266 Clean up some pre-existing formatting. 2014-01-14 13:09:35 -05:00
Greg Price
a8e3bca8c8 Internationalize forums CoffeeScript code 2014-01-14 13:04:51 -05:00
Greg Price
a1dc49cc9b Remove defunct forum post tagging code 2014-01-14 13:03:56 -05:00
Brian Talbot
3faf7456b9 Merge pull request #2159 from edx/talbs/lms-fix-certificate-button 
LMS: FIX - Add Styling Back to Certificate Download Button
 2014-01-14 09:59:16 -08:00
Jason Bau
6aeadb874b Merge pull request #2163 from edx/jbau/sass-path-bugfix 
small bugfixes for theming+sass+templates
 2014-01-14 08:45:00 -08:00
Sarina Canelake
129c24477f Merge pull request #2062 from jazkarta/feature-idde2 
Individual Due Date Extension feature
 2014-01-14 08:00:14 -08:00
Chris Rossi
831f907c79 Add individual due dates feature. 
Adds a feature to the edX platform which allows instructors to set
individual due dates for students on particular coursework. This code is
meant primarily for on-campus use--it is not intended that this feature
would be used for MOOCs. It adds a new tab, "Extensions", to the beta
instructor dashboard which allows changing due dates per student. This
feature is enabled by setting FEATURES['INDIVIDUAL_DUE_DATES'] = True.
 2014-01-14 10:19:02 -05:00
Brian Talbot
e475f835cf Merge pull request #2164 from edx/talbs/update-copyright 
Copyright Notice Updates
 2014-01-14 07:17:04 -08:00
Sarina Canelake
371c41e5ac Merge pull request #2158 from edx/sarina/remove-university-refs 
Sarina/remove university refs
 2014-01-14 07:06:45 -08:00
Sarina Canelake
9ce10493ad Remove references to old university images 2014-01-14 09:27:03 -05:00
Brian Talbot
367d2dc2ae Studio/LMS: Updates copyright notices to 2014 2014-01-13 19:59:24 -05:00
Jason Bau
6560c4faf8 small bugfixes for theming+sass+templates 
change ruby and to &&
 2014-01-13 15:28:35 -08:00
Jason Bau
7b6cf0dc95 Merge pull request #2162 from edx/jbau/sass-path-bugfix 
Revert "small bugfixes for theming+sass+templates"
 2014-01-13 15:22:32 -08:00
Jason Bau
eb15355b74 Revert "small bugfixes for theming+sass+templates" 
This reverts commit 5f3313ece4.
 2014-01-13 14:35:24 -08:00
Will Daly
f553f68a5d Merge pull request #2161 from edx/will/disable-more-video-tests 
Disabled video updateplaytime JS test
 2014-01-13 13:59:29 -08:00
Ned Batchelder
c4792e667e Merge pull request #2139 from edx/ned/add-apostrophe-to-lorem 
Add apostrophe to lorem and fix single-quoted strings
 2014-01-13 13:48:23 -08:00
Will Daly
60a56c4876 Disabled video updateplaytime JS test 2014-01-13 16:47:08 -05:00
Brian Talbot
fd94be6a01 LMS: resolves missing certificate download button styling 
* adds in Sass placeholder to mirror older/inherited button styling used in LMS
* uses light theming Sass variables for button styling
* adds specific selector for certificate download button
 2014-01-13 16:26:36 -05:00
Mark Hoeber
bd079648e2 Merge pull request #2155 from edx/sylvia/documentation/AA_updates 
Sylvia/documentation/aa updates
 2014-01-13 12:57:17 -08:00
spearce
2cd03b7eb7 Delete placeholder topic 2014-01-13 15:50:04 -05:00
spearce
229e921631 Update docs per Anant's feedback 2014-01-13 15:47:02 -05:00
Jason Bau
7692f0d8db Merge pull request #2143 from edx/jbau/sass-path-bugfix 
small bugfix for theming+sass path
 2014-01-13 12:06:34 -08:00
Will Daly
13cda103c2 Merge pull request #2154 from edx/will/disable-teams-and-static-tests 
Disabled static pages and course team test seen to fail in master
 2014-01-13 11:18:01 -08:00
Will Daly
7adb48c0f0 Disabled static pages and course team test seen to fail in master 2014-01-13 14:14:52 -05:00
Will Daly
167cf94a6f Merge pull request #2153 from edx/will/disable-video-test 
Disabled video start and end time test
 2014-01-13 10:39:58 -08:00
Will Daly
3f126ac46c Disabled video start and end time test 2014-01-13 13:37:58 -05:00
Feanil Patel
a86086b771 Merge pull request #2041 from edx/feanil/transfer_students 
Add a command to transfer students from one course to another.
 2014-01-13 08:30:51 -08:00
Christina Roberts
6c49e0db14 Merge pull request #2105 from edx/christina/reorder-privates 
Fix bug about draft verticals reordering.
 2014-01-13 07:22:17 -08:00
Anton Stupak
9abe8ae39a Merge pull request #2135 from edx/anton/fix-video-volume-cookie 
Video: Fix volume cookie.
 2014-01-13 07:08:40 -08:00
cahrens
38c516e9e9 Fix bug about draft verticals reordering. 
STUD-714
 2014-01-13 09:25:16 -05:00
polesye
af56a2df72 BLD-518: Fix video volume cookie. 2014-01-13 12:03:57 +02:00
Jason Bau
5f3313ece4 small bugfixes for theming+sass+templates 2014-01-10 16:36:23 -08:00
Ned Batchelder
fd13908b90 Fix single-quoted translated strings to be double-quoted. 2014-01-10 14:40:34 -05:00
Ned Batchelder
4e298a1abb Add an apostrophe to the Lorem text. 2014-01-10 14:35:17 -05:00
Feanil Patel
16d6d23fbc Save state before unenrolling student from old course. 2014-01-10 14:16:04 -05:00
Usman Khalid
76f4eaf947 Merge pull request #2068 from edx/usman/lms1584-edge-home-page 
Fix register button on edge
 2014-01-10 11:01:44 -08:00
Feanil Patel
1be33651b0 CertificateItems should be updated for all course students. 
Not just students that are currently active.  Students may have enrolled with verified certs, paid, gotten
a refund, and un-enrolled from the original course.  This function should now capture that.
 2014-01-10 13:18:39 -05:00
Calen Pennington
2ad4749a5d Merge pull request #2119 from cpennington/xblocks-behind-feature-flag 
Enable pure XBlocks, hidden by feature flags
 2014-01-10 09:51:23 -08:00
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag 
[LMS-226]
[LMS-2013]
 2014-01-10 11:40:03 -05:00