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

20410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cristian Salamea
a465b082da Specific django-toolbar version (stable released) and update the panels in dev envs 2014-01-16 14:11:17 -05:00
Christina Roberts
a3d22097b9 Merge pull request #2182 from edx/christina/duplicate 
Support duplicating an existing xblock to a supplied parent location.
 2014-01-16 11:04:39 -08:00
Mark Hoeber
9de3b6ac1e Merge pull request #2200 from edx/markhoeber/documentation/STUD-1087 
Markhoeber/documentation/stud 1087
 2014-01-16 10:39:04 -08:00
Mark Hoeber
c625dedb69 Grading Due Date update 
Added details about student view of due dates
 2014-01-16 13:38:00 -05:00
Giulio Gratta
9280f89f86 Merge pull request #2157 from edx/giulio/remove-ice 
Removed ice.min.js completely as ORA is changing anyway
 2014-01-16 10:37:58 -08:00
Mark Hoeber
a8326f58dd Link and image cleanup 2014-01-16 13:09:15 -05:00
Ned Batchelder
9dbd4c5b15 Merge pull request #2197 from edx/ned/add-responsetypes-registry 
Make a ResponseType registry.
 2014-01-16 10:09:03 -08:00
Mark Hoeber
a505fa951d Merge pull request #2173 from edx/markhoeber/documentation/STUD-1144 
Added notes about quotations to Advanced Settings page help
 2014-01-16 10:06:59 -08:00
Mark Hoeber
03d46dc672 Merge pull request #2198 from edx/markhoeber/documentation/release-notes-1-16-14 
Markhoeber/documentation/release notes 1 16 14
 2014-01-16 10:04:25 -08:00
Don Mitchell
3885e6cf78 Merge branch 'release' 
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
 2014-01-16 12:51:22 -05:00
Ned Batchelder
3942876e0c Make a ResponseType registry. 
And while I was in there, I made it a decorator, so it's nicer to use.
 2014-01-16 12:25:28 -05:00
Mark Hoeber
0fc5d88e4e Discussion Forums 
Fixed forum label to match UI
 2014-01-16 12:08:51 -05:00
Mark Hoeber
9b7f2d79f5 Fixed Course Start date 
change to 1/1/2030
 2014-01-16 11:55:26 -05:00
Mark Hoeber
157790daf6 Updating Grading Policy chapter 
removing bad link
 2014-01-16 11:50:42 -05:00
cahrens
81fecf3e6c Duplicate children so as to not create a DAG. 2014-01-16 11:24:35 -05:00
Don Mitchell
95f4acd594 Merge pull request #2152 from edx/rc/2014-01-16 
Release 2014-01-16
 2014-01-16 07:23:23 -08:00
zubair-arbi
565769b641 Merge pull request #2147 from zubair-arbi/zub/bugfix/std1136-emptycoursevideo 
dont update iframe src attribute if it is empty
 2014-01-16 01:09:17 -08:00
zubair-arbi
f58903a50f Merge pull request #2097 from zubair-arbi/zub/bugfix/std893-optionresponse 
escape single quotes in optioninput (optionresponse) tags
 2014-01-16 00:54:51 -08:00
zubiar-arbi
769c7221fa dont update iframe src attribute if it is empty 
STUD-1136
 2014-01-16 13:33:54 +05:00
Greg Price
9075dcefb6 Merge pull request #2186 from edx/gprice/timeago-i18n 
Internationalize our use of jquery.timeago
 2014-01-15 14:23:52 -08:00
Don Mitchell
41f8834453 Merge pull request #2167 from edx/dhm/split_block_id 
Encode periods and $ in block_id map
 2014-01-15 14:17:41 -08:00
Giulio Gratta
31caba3a2a Removed ice.min.js and removed piping code 2014-01-15 14:06:19 -08:00
Greg Price
0f09a3093e Internationalize our use of jquery.timeago 
Also get rid of an unused template and extra copies of jquery.timeago.
 2014-01-15 16:46:38 -05:00
Calen Pennington
80d54afdae Merge pull request #2178 from cpennington/ddt-without-six 
Use a version of ddt that supports unicode w/o requiring six at runtime
 2014-01-15 13:26:18 -08:00
Mark Hoeber
41d3cedc43 Merge pull request #2185 from edx/markhoeber/documentation/stud-1041 
Documentation accessibility
 2014-01-15 13:18:46 -08:00
Mark Hoeber
d422816326 Documentation accessibility 
Alt tags added to for all images. For STUD-1041
 2014-01-15 16:16:39 -05:00
Calen Pennington
4f1a420a2a Use a version of ddt that supports unicode w/o requiring six at runtime 2014-01-15 15:34:35 -05:00
Will Daly
ca180834dc Merge pull request #2128 from edx/will/bok-choy-fixtures-rebase 
Bok-choy fixtures, Studio tests, and (some) ORA tests
 2014-01-15 12:18:47 -08:00
Jim Abramson
0b617fc38f Merge pull request #2169 from edx/feature/jsa/forums-i18n-mako 
i18n: externalize strings in discussion forums templates and python code...
 2014-01-15 12:14:43 -08:00
Mark Hoeber
4eca32b36b Merge pull request #2112 from edx/markhoeber/documentation/stud-1132 
Course Start Date Changes
 2014-01-15 11:46:41 -08:00
Mark Hoeber
8d4b84b895 Merge pull request #2114 from edx/markhoeber/documentation/stud-1038 
Added doc for file sorting change
 2014-01-15 11:46:05 -08:00
cahrens
0d8d7cb393 Support duplicating an existing xblock to a supplied parent location. 
STUD-1190
 2014-01-15 14:36:40 -05:00
jsa
dfa4a03daa i18n: externalize strings in discussion forums templates and python code. 
JIRA: FOR-398, FOR-399
 2014-01-15 14:26:22 -05:00
Mark Hoeber
fd45874372 Updated help on Advanced Settings page 
Added note to use double, not single quotes for string values.
STUD-1144
 2014-01-15 14:21:59 -05:00
David Baumgold
c24820ae87 Change default start date for About pages 
So that About pages will display in the LMS if the user is not logged in
 2014-01-15 14:10:55 -05:00
Greg Price
ee1651daeb Merge pull request #2120 from edx/gprice/forum-unicode-tests 
Add forum tests for non-ASCII data
 2014-01-15 10:51:30 -08:00
chrisndodge
c523b4f09b Merge pull request #2104 from edx/feature/mattdrayer/authors-addition 
First PR!  Added myself to the AUTHORS file
 2014-01-15 10:47:48 -08:00
Mark Hoeber
a2da19fd3c Merge pull request #2179 from edx/sylvia/documentation/ORA_updates 
Sylvia/documentation/ora updates
 2014-01-15 09:40:15 -08:00
Don Mitchell
7ff137866b Merge pull request #2180 from edx/usman/openended_post_hostname_argument 
Added hostname argument to openended_post command.
 2014-01-15 09:05:32 -08:00
Calen Pennington
ebb5a52fe0 Merge pull request #2141 from cpennington/xblock-contract-docs 
Add documentation of LMS/Studio features usable by XBlocks
 2014-01-15 09:05:03 -08:00
Calen Pennington
310b819608 Merge pull request #2133 from edx/usman/openended_post_hostname_argument 
Added hostname argument to openended_post command.
 2014-01-15 08:55:21 -08:00
Sylvia Pearce
c758568deb Add scoring information 2014-01-15 11:34:22 -05:00
Calen Pennington
65d051af03 Add documentation of LMS/Studio features usable by XBlocks 
[LMS-192]
 2014-01-15 11:28:57 -05:00
Waheed Ahmed
a41ca43f4e Merge pull request #2058 from edx/waheed/ora195-json-serialization-error-fix 
JSON serialization error fixed.
 2014-01-15 08:18:27 -08:00
Mark Hoeber
bcb622eb75 RN Draft 1 
Draft for 1-16-2014
 2014-01-15 11:14:06 -05:00
Don Mitchell
7e02951571 Merge pull request #2064 from edx/dhm/auth_consolidate 
Replace authz with roles.py and reconcile their behaviors
 2014-01-15 07:21:03 -08:00
Andy Armstrong
9db8b4979c Merge pull request #2175 from edx/andya/typo 
Fix typo in the announcement template
 2014-01-15 06:59:12 -08:00
Waheed Ahmed
b98f4e0229 JSON serialization error fixed and added test for it. 
ORA-195
 2014-01-15 19:47:45 +05:00
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
Mark Hoeber
069cb79081 release notes 1-16-14 
Initial setup for RTD
 2014-01-15 09:19:46 -05:00