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

5612 Commits

Author SHA1 Message Date
Martyn James
9ac7176b8f Merge pull request #6223 from edx/feature/SOL-20 
Merge feature SOL-20
 2015-01-16 12:54:45 -05:00
Martyn James
dcc8e95648 Implements SOL-20. Filtering for assets table by asset type 2015-01-16 12:53:24 -05:00
Waheed Ahmed
47a372282a Fixed transcript skip first line if it contains BOM(Byte Order Mark). 
TNL-935
 2015-01-16 12:21:43 +05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
Christina Roberts
2897a8efb3 Merge pull request #6299 from edx/cohorted-courseware 
Cohorted courseware
 2015-01-15 11:50:13 -05:00
John Eskew
9e20057da1 Merge pull request #6478 from edx/jeskew/change_handled_exception_for_assets 
Handle the correct exception upon asset not found.
 2015-01-15 10:44:01 -05:00
cahrens
9607aa233c Remove unnecessary pylint suppression. 
Possibly caused by a bad merge.
 2015-01-15 10:37:25 -05:00
Brian Talbot
69ed266f7e Studio: removing left whitespace from icons in unit visibility controls 2015-01-15 10:37:25 -05:00
Frances Botsford
6398af715a Make group config styles generic 2015-01-15 10:37:25 -05:00
Frances Botsford
8abec98c3d fixed group config sidebar spacing, icon cleanup 2015-01-15 10:37:25 -05:00
cahrens
66375b8541 Bok choy test for editing of content groups on Group Configuration page. 2015-01-15 10:37:24 -05:00
Frances Botsford
ebeb9a9948 added cohort group editing styles 2015-01-15 10:37:24 -05:00
Daniel Friedman
fff84928fa Create and edit content groups in Studio 2015-01-15 10:37:24 -05:00
Frances Botsford
4f99657b6d first pass at adding cohort groups to group configuration page 2015-01-15 10:33:49 -05:00
Andy Armstrong
21a9873757 Don't allow visibility editing in content libraries 2015-01-15 10:33:48 -05:00
Andy Armstrong
bca6274eb5 Miscellaneous text updates 2015-01-15 10:33:48 -05:00
Andy Armstrong
798342e177 Rename 'cohorted content group' to 'content group' 2015-01-15 10:33:48 -05:00
cahrens
1897fb65f9 Update for paged container not having a visibility editor. 2015-01-15 10:33:48 -05:00
cahrens
4b00566e4d Update course access check. 2015-01-15 10:33:48 -05:00
Brian Talbot
d556cdd586 syncing icon class syntax + semantically hiding changed icons from assistive tech 
TNL-1137
 2015-01-15 10:33:47 -05:00
Andy Armstrong
b77e65cdc2 Assign cohorts to groups in the instructor dashboard 
TNL-653
 2015-01-15 10:33:46 -05:00
Brian Talbot
6fb45ef95c Studio: resolving scroll/overflow UI in component visibility settings 2015-01-15 10:33:45 -05:00
Brian Talbot
95ee72607d Studio: resolving visual spacing of hide from students checkboxes 2015-01-15 10:33:45 -05:00
Andy Armstrong
4fa33e25ed Studio support for cohorted courseware 
TNL-652
 2015-01-15 10:33:45 -05:00
Brian Talbot
206ea8caeb Studio: adding UI and styling for component-level access modal 2015-01-15 10:33:45 -05:00
jsa
17d892c521 make block.get_parent() work. 
Co-Authored-By: Christina Roberts <christina@edx.org>
Co-Authored-By: Daniel Friedman <dfriedman@edx.org>
Co-Authored-By: Don Mitchell <dmitchell@edx.org>
 2015-01-15 10:33:44 -05:00
John Eskew
df5ba26ac6 Handle the correct exception to cause a 404 error upon asset not found 
instead of a 500 error. Add 404 test.
 2015-01-15 09:44:05 -05:00
Bertrand Marron
c4a7d770cc Remove all ellipses 
It's a problem for accessibility
 2015-01-15 09:03:12 -05:00
David Baumgold
ab87cd746d Merge pull request #6630 from edx/no-i18n-mock 
Don't internationalize mock templates
 2015-01-15 09:01:07 -05:00
Tim Babych
dbfc12ce01 Merge pull request #6321 from edx/feature/edxnotes 
TNL-213: Student Notes
 2015-01-15 02:02:13 +02:00
David Baumgold
6453d03b80 Don't internationalize mock templates 2015-01-14 17:35:20 -05:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content. 
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
 2015-01-14 23:34:11 +02:00
David Baumgold
f9d8198ef3 Merge pull request #6576 from edx/db/configure-tender-domain 
Make Tender optional and configurable
 2015-01-14 15:02:09 -05:00
Brian Talbot
8316fe8560 Merge pull request #6607 from edx/talbs/fix-studio-xblockwarnings-fontawesome 
FIX - Studio: resolving xblock warning messages icons
 2015-01-14 12:13:35 -05:00
David Baumgold
4d323271ee Make Tender optional and configurable 2015-01-14 11:25:55 -05:00
David Baumgold
df5dd1a4db Merge pull request #6385 from ataki/ataki/gridfs-hotfix 
Fix visual bug with large file error msg in cms.
 2015-01-14 10:42:56 -05:00
Brian Talbot
8fc89ca04f Studio: resolving icon class styling issue with xblock warning messages 2015-01-13 18:36:58 -05:00
Braden MacDonald
6be35e0fc1 Merge pull request #6459 from edx/content-libraries 
Content libraries MVP
 2015-01-13 11:20:20 -08:00
Braden MacDonald
bce8ee692f Fix bug when deleting first of two recently added blocks 2015-01-13 10:11:59 -08:00
Waheed Ahmed
05d9d139b5 Fixed CodeMirror editor view height in studio. 
TNL-920
 2015-01-13 12:11:20 +05:00
Braden MacDonald
012e6e6fd3 Update font awesome icons 2015-01-12 13:21:27 -08:00
Braden MacDonald
6ea5a8a595 Fix hard-coded studio name 2015-01-12 13:08:40 -08:00
Adam Palay
ba102b4a66 fix quality violation 2015-01-12 13:52:15 -05:00
Adam Palay
7e45858276 resolve merge conflicts between release and master 2015-01-12 13:47:30 -05:00
Braden MacDonald
e4ea28f7f6 Minor pylint fixes 2015-01-12 10:39:12 -08:00
E. Kolpakov
195d5b57bc pylint fixes 2015-01-12 09:58:51 -08:00
Adam
8dd7b78065 Merge pull request #6501 from edx/adam/update-copy-date 
update copyright dates
 2015-01-12 10:59:11 -05:00
Don Mitchell
2bf3966716 Add a fix_not_found command to get rid 
of dangling children references to blocks.
TNL-1141
 2015-01-12 10:42:52 -05:00
E. Kolpakov
1a387d8217 Test for paging in items.py 2015-01-12 13:42:55 +03:00