Commit Graph

  • fd31ab3057 make markdown & latex work for response / comments (not perfect) Rocky Duan 2012-09-02 01:11:25 -07:00
  • 77e0ef3fe3 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions Rocky Duan 2012-09-02 00:29:59 -07:00
  • d22feb1b8b escape html Rocky Duan 2012-09-02 00:29:48 -07:00
  • 1405cf97fd Create a new template that inherits from course_navigation.html to avoid repeating the course navigation template and augment it with the new post button. Ibrahim Awwal 2012-09-01 21:16:04 -07:00
  • 9433e89710 add docs for gitreload ichuang 2012-09-01 10:16:38 -04:00
  • ea4019c0a0 Add comment to sequence/display.coffee kimth 2012-09-01 09:01:19 -04:00
  • 90bcb00e58 Allow ckt editor to be embedded in sequence kimth 2012-09-01 08:56:16 -04:00
  • 6f03ebb198 Add message for student in CustomResponse error kimth 2012-09-01 08:26:54 -04:00
  • d82534bc23 improving new post Arjun Singh 2012-09-01 05:10:29 -07:00
  • 3de7c3a322 Merge branch 'master' into kimth/mark-graded kimth 2012-09-01 08:05:29 -04:00
  • 95cfbcc8c7 new post 'works' Arjun Singh 2012-09-01 03:41:49 -07:00
  • b913c93f46 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions Arjun Singh 2012-09-01 02:01:01 -07:00
  • f6ee6f2a0f working on newpost Arjun Singh 2012-09-01 02:00:55 -07:00
  • 7007814638 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions Rocky Duan 2012-09-01 01:07:09 -07:00
  • 09dade0802 clear comment input after submit & not submit empty comment Rocky Duan 2012-09-01 01:06:56 -07:00
  • 49f0dbd9e6 Make the index page not stupid, but not particularly useful either. Ibrahim Awwal 2012-09-01 00:03:15 -07:00
  • a67b76ae27 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions Rocky Duan 2012-08-31 23:46:33 -07:00
  • fde77b7a89 fixed user link and back button Rocky Duan 2012-08-31 23:46:13 -07:00
  • 8d3a70df46 Remove empty script tag. Ibrahim Awwal 2012-08-31 23:44:32 -07:00
  • f6ca91a504 Refactor some things more and make the forum index sort of work, although the sticky sidebar is broken, probably because there's no content in the thread view pane. Ibrahim Awwal 2012-08-31 23:42:32 -07:00
  • e3728f6898 fix new post dropdown Arjun Singh 2012-08-31 21:07:36 -07:00
  • 3f07e5fdb1 Merge pull request #612 from MITx/feature/view_courseware_buttons arjun810 2012-08-31 18:57:37 -07:00
  • 877ae91b7f Don't show View Courseware buttons if they don't have access to load the courseware David Ormsbee 2012-08-31 21:50:33 -04:00
  • de9c981aea Merge branch 'master' into kimth/mark-graded kimth 2012-08-31 21:25:53 -04:00
  • ecc65d6ebc Moved some templates into separate files. Ibrahim Awwal 2012-08-31 18:01:33 -07:00
  • 059fc5e89e Merge pull request #610 from MITx/feature/arjun/fix_jump_test David Ormsbee 2012-08-31 17:51:50 -07:00
  • 9eecd43a4a Fix jump to courseware test to expect a redirect Arjun Singh 2012-08-31 17:49:15 -07:00
  • ae022b662a Merge branch 'kimth/mark-graded' of https://github.com/MITx/mitx into kimth/mark-graded kimth 2012-08-31 20:46:34 -04:00
  • 4800aca5c9 Merge pull request #609 from MITx/features/kfiedler/mark-graded kimth 2012-08-31 17:46:07 -07:00
  • 56cc237eef Merge branch 'master' into kimth/mark-graded kimth 2012-08-31 20:41:39 -04:00
  • b5b93cad30 Merge pull request #599 from MITx/feature/arjun/add_discussion_context David Ormsbee 2012-08-31 17:22:07 -07:00
  • 4ce4c0c444 Fix the dropdown filtering so it actually ignores the unread messages count. Ibrahim Awwal 2012-08-31 17:15:31 -07:00
  • f6ee08271d Ensure that js files are returned in alphabetical order by django-pipeline. Ibrahim Awwal 2012-08-28 22:38:56 -07:00
  • e600004b1f Make the comment client not explode if it doesn't get a sort preference from the comment service. Ibrahim Awwal 2012-08-31 15:19:17 -07:00
  • 26ca1f5f5b Merge master Arjun Singh 2012-08-31 15:13:50 -07:00
  • 3a9542ebb1 Move function; stop shadowing map; add todo about caching for _DISCUSSIONINFO Arjun Singh 2012-08-31 15:11:29 -07:00
  • 05015a1375 Merge branch 'kimth/mark-graded' of https://github.com/MITx/mitx into kimth/mark-graded kimth 2012-08-31 18:06:30 -04:00
  • 8c0780bcdc Adjust comments kimth 2012-08-31 14:38:39 -04:00
  • e482a32d27 Accordion distinguishes items to be graded kimth 2012-08-31 14:37:31 -04:00
  • 01f875a124 Merge branch 'master' into kimth/mark-graded kimth 2012-08-31 18:02:37 -04:00
  • e7a7c71324 Added icon to mark it as having a due date Kyle Fiedler 2012-08-31 17:58:08 -04:00
  • 648d54b027 Adjust comments kimth 2012-08-31 14:38:39 -04:00
  • e8c4bc0c25 Accordion distinguishes items to be graded kimth 2012-08-31 14:37:31 -04:00
  • 881404bab7 Merge pull request #602 from MITx/bug/kfiedler/sequence-nav Tom Giannattasio 2012-08-31 14:01:26 -07:00
  • d1238a277f tweaked sidebar bugs Tom Giannattasio 2012-08-31 16:58:13 -04:00
  • 60ea621560 Remove problem-answer class that will now not be used Kyle Fiedler 2012-08-31 16:55:50 -04:00
  • 69ea7aa873 Merge pull request #597 from MITx/feature/victor/nested-links David Ormsbee 2012-08-31 13:48:05 -07:00
  • 10a80ddfbd Merge pull request #606 from MITx/feature/kfiedler/problem-group kimth 2012-08-31 13:26:54 -07:00
  • 3889388abf Merge pull request #596 from MITx/features/kfiedler/multicourse-buttons Tom Giannattasio 2012-08-31 13:19:03 -07:00
  • d8591c286d basic discussion profile styles Tom Giannattasio 2012-08-31 16:14:11 -04:00
  • f2fc51bd35 Added class problem-and-answer with margin on the bottom Kyle Fiedler 2012-08-31 16:08:41 -04:00
  • 5fdf795dd9 Merge pull request #605 from MITx/feature/prefetch_user_groups Calen Pennington 2012-08-31 13:06:49 -07:00
  • 3edf1a6a84 Added buttons for both pages to make it even more clear to start class Kyle Fiedler 2012-08-31 15:58:31 -04:00
  • 7c1cc4ed21 Added hover on course about and more actionable text Kyle Fiedler 2012-08-30 11:47:40 -04:00
  • 0ff70472c9 Added styles for dashboard to have link around whole class Kyle Fiedler 2012-08-30 11:08:07 -04:00
  • b167e0f70a added filter drop; tweaked sidebar coordinate settings to accommodate new post Tom Giannattasio 2012-08-31 15:20:53 -04:00
  • 04439a3217 add comments explaining prefetch need David Ormsbee 2012-08-31 15:20:13 -04:00
  • 29be6f8209 Prefetch user groups to speed up auth checks required to render Progress page view for students David Ormsbee 2012-08-31 15:16:31 -04:00
  • 77612b0c60 Adjust comments kimth 2012-08-31 14:38:39 -04:00
  • 262b58778f Accordion distinguishes items to be graded kimth 2012-08-31 14:37:31 -04:00
  • 520256f67a Added fix for the sequnce nave hovers Kyle Fiedler 2012-08-31 14:17:03 -04:00
  • 05da125aed Merge pull request #600 from MITx/feature/kfiedler/hints kimth 2012-08-31 10:30:50 -07:00
  • 440539c081 Removed js from textbox Kyle Fiedler 2012-08-31 13:27:32 -04:00
  • e6f9f8d9b0 Add js to the problem and move around that css and js to accomodate Tonys new HTML Structure Kyle Fiedler 2012-08-31 11:15:06 -04:00
  • 164dae71fb Fixing syntax error John Jarvis 2012-08-31 10:09:15 -04:00
  • 66c5894e91 syntax error John Jarvis 2012-08-31 10:03:14 -04:00
  • b58436545a Add note about positional modules; check for videosequence. Arjun Singh 2012-08-31 06:45:59 -07:00
  • cef089f722 tracking log filename now determined by puppet, formatting cleanup John Jarvis 2012-08-31 09:38:13 -04:00
  • 20e48e6615 Merge pull request #475 from MITx/tmac/openid-provider Carlos Andrés Rocha 2012-08-31 06:23:03 -07:00
  • faabb01d42 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions Tom Giannattasio 2012-08-31 09:17:12 -04:00
  • 1515919f5e fixed posted details margin bug Tom Giannattasio 2012-08-31 09:16:59 -04:00
  • 785ddb5df1 Merge pull request #584 from MITx/feature/victor/double-double-html David Ormsbee 2012-08-31 05:34:22 -07:00
  • 717223be92 Merge pull request #577 from MITx/feature/victor/fix-url_name-cleanup David Ormsbee 2012-08-31 05:32:18 -07:00
  • 3f58e1dd01 Remove context from inline posts Arjun Singh 2012-08-31 05:07:41 -07:00
  • 7108985325 Adding context to posts in the forum view. Arjun Singh 2012-08-31 04:59:12 -07:00
  • 32cb0897e9 Fixing sequentials nested inside of verticals, provides a path to sequentials nested in sequentials. Changes jump_to to redirect to courseware index. Arjun Singh 2012-08-31 04:24:52 -07:00
  • a98dcd958e Let admins see answers of problems at any time kimth 2012-08-31 07:09:54 -04:00
  • 327b3a4648 [34078525] Log openid root_trust validation failures as errors Carlos Andrés Rocha 2012-08-31 06:34:22 -04:00
  • 0a81684ac3 [34078525] Fix error saving open_id request in session Carlos Andrés Rocha 2012-08-31 06:33:39 -04:00
  • d702082daa [34078525] Add test settings for openid Carlos Andrés Rocha 2012-08-31 06:31:18 -04:00
  • 27fe80d57c [34078525] Use system random to generate passwords Carlos Andrés Rocha 2012-08-31 06:29:07 -04:00
  • 795c116389 populate dropdown Arjun Singh 2012-08-31 03:27:02 -07:00
  • 5bfb51681a Display current topic and adjust font size. Matthew Mongeau 2012-08-30 20:03:13 -04:00
  • 28343b3afb Hide menu when clicking body. Matthew Mongeau 2012-08-30 19:50:00 -04:00
  • dc9f49b6d2 Show dropdown on click. Matthew Mongeau 2012-08-30 19:43:38 -04:00
  • d815d50aee Remove obsolete eager flag for xml modulestore Victor Shnayder 2012-08-30 19:26:50 -04:00
  • 484735bf03 make jump_to go to right position in a sequence. Victor Shnayder 2012-08-30 18:55:38 -04:00
  • 021ccde1b4 Make jump_to work with the xml modulestore Victor Shnayder 2012-08-30 18:47:11 -04:00
  • 3521d42175 Add highlighting back in Matthew Mongeau 2012-08-30 17:46:23 -04:00
  • 88100bf79f Remove loading icon. Matthew Mongeau 2012-08-30 17:04:37 -04:00
  • 6a27f6ddc4 Track comment Matthew Mongeau 2012-08-30 17:01:21 -04:00
  • 000a745c6e Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions Tom Giannattasio 2012-08-30 16:52:55 -04:00
  • a728134129 merge conflict fixes Tom Giannattasio 2012-08-30 16:52:34 -04:00
  • 31f7d6f4f4 Keep active thread active Matthew Mongeau 2012-08-30 16:50:46 -04:00
  • 074ba9ce71 Sorting Matthew Mongeau 2012-08-30 16:44:10 -04:00
  • 22aa325d83 Enable linking into the middle of sequences Victor Shnayder 2012-08-30 16:37:40 -04:00
  • da413f6de8 added sticky sidebar Tom Giannattasio 2012-08-30 16:37:22 -04:00
  • 1939b001e4 Added better animation in Kyle Fiedler 2012-08-30 16:24:02 -04:00
  • 6ee27d02e4 Searching and fixes. Matthew Mongeau 2012-08-30 15:55:46 -04:00
  • 4c8ff6419e Merge branch 'master' of github.com:MITx/mitx into jarv/add-local-logging John Jarvis 2012-08-30 15:37:04 -04:00