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

7286 Commits

Author SHA1 Message Date
Will Daly
4afd5ea49f Refactored bok-choy directory structure 
Added fixtures for course and xblock creation
Added bok-choy Studio tests
Added bok-choy tests for ora self- and ai- assessment
Refactored auto-auth; added staff and course-enrollment options
Removed extra javascript properties from page objects
 2014-01-15 09:37:32 -05:00
Julia Hansbrough
f3f0e8a514 Merge pull request #1888 from edx/flowerhack/feature/certificate-revenue-reporting 
Verified Certificate Reports
 2014-01-15 06:18:17 -08:00
Julia Hansbrough
1664452a14 Final iteration 2014-01-15 13:06:50 +00:00
Julia Hansbrough
ea0ae11171 Response to CR 1-14 2014-01-15 00:27:14 +00:00
Jason Bau
e5215d72b1 Merge pull request #2165 from edx/jbau/course_about_better_errormsg 
add FAQ link to course_about error msg
 2014-01-14 14:10:29 -08:00
Jason Bau
1b2aa4543c add FAQ link to course_about error msg 
use double-quotes, not single
 2014-01-14 14:09:03 -08: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
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
1932c126b8 Rename DbModel to KvsFieldData. 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
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
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
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
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
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
Julia Hansbrough
a776476098 Response to CR 1-13 2014-01-13 16:39:47 +00:00
Julia Hansbrough
f2b0394211 CR response 2014-01-13 15:57:14 +00: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
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
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
David Baumgold
85453f703e Fix theme issues in Sass preprocessing 2014-01-10 10:40:09 -05:00
Carson Gee
ab151f9e7b Several code enhancements to sysadmin dashboard 
Improved testing (cleaning up afterwards, catching stdout)
Refactored import function to it's own file
Removed monkey patch to log capturing, but still needs work
Translation fixes
Removal of several gettext phrases
 2014-01-10 09:31:53 -05:00
Will Daly
4a9c239c3d Merge pull request #2030 from edx/will/bok-choy-integration 
Added configuration for running tests using the bok-choy framework
 2014-01-10 05:26:42 -08:00
Usman Khalid
864267a286 Removed stripped-main.html since it is not being used anymore. 
LMS-1584
 2014-01-10 17:29:52 +05:00
Usman Khalid
a336ae7df6 edge.html inherits from main.html 
LMS-1584
 2014-01-10 17:29:24 +05:00
Sarina Canelake
9363dba535 Merge pull request #2121 from edx/sarina/neuter-static-files 
Edit template for unused edx.org pages
 2014-01-09 15:46:20 -08:00
Calen Pennington
a6a004314a Use block type, rather than class names for StudentPreference field storage in LMS 2014-01-09 15:59:16 -05:00
Ned Batchelder
520822c3a6 Merge pull request #2122 from edx/ned/i18n-xblock-support 
Make LMS use runtime.service("i18n") for i18n.
 2014-01-09 12:52:13 -08:00
David Baumgold
96558c85f9 Merge pull request #2113 from edx/db/enable-theme-in-startup 
Do theme post-processing in startup hook
 2014-01-09 12:19:17 -08:00
Ned Batchelder
d138a2c6be Use Django for runtime i18n 
The django.utils.translation module has the right interface to serve as a
gettext.Translations object, so we use it for the runtime i18n service.

LMS-1597
 2014-01-09 14:19:56 -05:00
Sarina Canelake
b7eb3406e1 Edit template for unused edx.org pages 2014-01-09 13:32:28 -05:00
Sarina Canelake
c285bd11d5 Merge pull request #2108 from edx/jtauber/neuter-static-files 
remove edx.org-specific content no longer used
 2014-01-09 10:06:44 -08:00
Will Daly
dde5455227 Added configuration for running tests using the bok-choy framework 2014-01-09 12:57:50 -05:00
Sarina Canelake
56a917cfb7 Fix 'JOBS' and 'PRESS' links at bottom of old site 2014-01-09 12:30:15 -05:00
Sarina Canelake
674670b687 Remove unused image files from old website 2014-01-09 12:04:35 -05:00
David Ormsbee
ff192935d8 Removing JS gettext() in favor of server-side substitution. 
[LMS-1680]
 2014-01-09 10:24:09 -05:00
David Baumgold
08c9fd94d9 Do theme post-processing in startup hook 2014-01-08 13:27:30 -05:00