Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,463 Commits 1 Branch 0 Tags
90bcb00e5885b95d879a70e7c84ef81b2153a523
Commit Graph

5463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kimth
90bcb00e58 Allow ckt editor to be embedded in sequence 2012-09-01 08:56:16 -04:00
kimth
6f03ebb198 Add message for student in CustomResponse error 2012-09-01 08:26:54 -04:00
kimth
3de7c3a322 Merge branch 'master' into kimth/mark-graded 2012-09-01 08:05:29 -04:00
arjun810
3f07e5fdb1 Merge pull request #612 from MITx/feature/view_courseware_buttons 
Don't show View Courseware buttons if they don't have access to load it
 2012-08-31 18:57:37 -07:00
David Ormsbee
877ae91b7f Don't show View Courseware buttons if they don't have access to load the courseware 2012-08-31 21:50:33 -04:00
kimth
de9c981aea Merge branch 'master' into kimth/mark-graded 2012-08-31 21:25:53 -04:00
David Ormsbee
059fc5e89e Merge pull request #610 from MITx/feature/arjun/fix_jump_test 
Fix jump to courseware test to expect a redirect
 2012-08-31 17:51:50 -07:00
Arjun Singh
9eecd43a4a Fix jump to courseware test to expect a redirect 2012-08-31 17:49:15 -07:00
kimth
ae022b662a Merge branch 'kimth/mark-graded' of https://github.com/MITx/mitx into kimth/mark-graded 2012-08-31 20:46:34 -04:00
kimth
4800aca5c9 Merge pull request #609 from MITx/features/kfiedler/mark-graded 
Features/kfiedler/mark graded
 2012-08-31 17:46:07 -07:00
kimth
56cc237eef Merge branch 'master' into kimth/mark-graded 2012-08-31 20:41:39 -04:00
David Ormsbee
b5b93cad30 Merge pull request #599 from MITx/feature/arjun/add_discussion_context 
Add context about which bit of courseware a post is about
 2012-08-31 17:22:07 -07:00
Arjun Singh
26ca1f5f5b Merge master 2012-08-31 15:13:50 -07:00
Arjun Singh
3a9542ebb1 Move function; stop shadowing map; add todo about caching for _DISCUSSIONINFO 2012-08-31 15:11:29 -07:00
kimth
05015a1375 Merge branch 'kimth/mark-graded' of https://github.com/MITx/mitx into kimth/mark-graded 2012-08-31 18:06:30 -04:00
kimth
8c0780bcdc Adjust comments 2012-08-31 18:05:54 -04:00
kimth
e482a32d27 Accordion distinguishes items to be graded 2012-08-31 18:05:54 -04:00
kimth
01f875a124 Merge branch 'master' into kimth/mark-graded 2012-08-31 18:02:37 -04:00
Kyle Fiedler
e7a7c71324 Added icon to mark it as having a due date 2012-08-31 17:58:08 -04:00
kimth
648d54b027 Adjust comments 2012-08-31 17:05:48 -04:00
kimth
e8c4bc0c25 Accordion distinguishes items to be graded 2012-08-31 17:05:48 -04:00
Tom Giannattasio
881404bab7 Merge pull request #602 from MITx/bug/kfiedler/sequence-nav 
Added fix for the sequnce nave hovers
 2012-08-31 14:01:26 -07:00
Kyle Fiedler
60ea621560 Remove problem-answer class that will now not be used 2012-08-31 16:55:50 -04:00
David Ormsbee
69ea7aa873 Merge pull request #597 from MITx/feature/victor/nested-links 
Feature/victor/nested links
 2012-08-31 13:48:05 -07:00
kimth
10a80ddfbd Merge pull request #606 from MITx/feature/kfiedler/problem-group 
Added class problem-and-answer with margin on the bottom
 2012-08-31 13:26:54 -07:00
Tom Giannattasio
3889388abf Merge pull request #596 from MITx/features/kfiedler/multicourse-buttons 
Make the two buttons that lead to the courseware more actionable
 2012-08-31 13:19:03 -07:00
Kyle Fiedler
f2fc51bd35 Added class problem-and-answer with margin on the bottom 2012-08-31 16:08:41 -04:00
Calen Pennington
5fdf795dd9 Merge pull request #605 from MITx/feature/prefetch_user_groups 
Reduce # of queries for auth checks on Progress page by prefetching user groups
 2012-08-31 13:06:49 -07:00
Kyle Fiedler
3edf1a6a84 Added buttons for both pages to make it even more clear to start class 2012-08-31 15:58:44 -04:00
Kyle Fiedler
7c1cc4ed21 Added hover on course about and more actionable text 2012-08-31 15:58:44 -04:00
Kyle Fiedler
0ff70472c9 Added styles for dashboard to have link around whole class 2012-08-31 15:58:44 -04:00
David Ormsbee
04439a3217 add comments explaining prefetch need 2012-08-31 15:20:13 -04:00
David Ormsbee
29be6f8209 Prefetch user groups to speed up auth checks required to render Progress page view for students 2012-08-31 15:16:31 -04:00
kimth
77612b0c60 Adjust comments 2012-08-31 14:38:39 -04:00
kimth
262b58778f Accordion distinguishes items to be graded 2012-08-31 14:37:31 -04:00
Kyle Fiedler
520256f67a Added fix for the sequnce nave hovers 2012-08-31 14:17:03 -04:00
kimth
05da125aed Merge pull request #600 from MITx/feature/kfiedler/hints 
Added styles for problems
 2012-08-31 10:30:50 -07:00
Kyle Fiedler
440539c081 Removed js from textbox 2012-08-31 13:27:32 -04:00
Kyle Fiedler
e6f9f8d9b0 Add js to the problem and move around that css and js to accomodate Tonys new HTML Structure 2012-08-31 11:15:06 -04:00
Arjun Singh
b58436545a Add note about positional modules; check for videosequence. 2012-08-31 06:45:59 -07:00
Carlos Andrés Rocha
20e48e6615 Merge pull request #475 from MITx/tmac/openid-provider 
OpenID provider implementation
 2012-08-31 06:23:03 -07:00
David Ormsbee
785ddb5df1 Merge pull request #584 from MITx/feature/victor/double-double-html 
Fix inline html bug.
 2012-08-31 05:34:22 -07:00
David Ormsbee
717223be92 Merge pull request #577 from MITx/feature/victor/fix-url_name-cleanup 
Feature/victor/fix url name cleanup
 2012-08-31 05:32:18 -07:00
Arjun Singh
3f58e1dd01 Remove context from inline posts 2012-08-31 05:08:00 -07:00
Arjun Singh
7108985325 Adding context to posts in the forum view. 2012-08-31 04:59:12 -07:00
Arjun Singh
32cb0897e9 Fixing sequentials nested inside of verticals, provides a path to sequentials nested in sequentials. Changes jump_to to redirect to courseware index. 2012-08-31 04:24:52 -07:00
Carlos Andrés Rocha
327b3a4648 [34078525] Log openid root_trust validation failures as errors 2012-08-31 06:43:28 -04:00
Carlos Andrés Rocha
0a81684ac3 [34078525] Fix error saving open_id request in session 2012-08-31 06:43:08 -04:00
Carlos Andrés Rocha
d702082daa [34078525] Add test settings for openid 2012-08-31 06:31:18 -04:00
Carlos Andrés Rocha
27fe80d57c [34078525] Use system random to generate passwords 2012-08-31 06:29:07 -04:00