Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Commit Graph

  • 3787307d93 Put WAITTIME_BETWEEN_REQUESTS in common rather than dev env kimth 2012-08-24 11:23:26 -04:00
  • 088d204d9c Added CodeResponse tests kimth 2012-08-24 11:09:27 -04:00
  • 10c953e8a4 Merge pull request #534 from MITx/feature/kfiedler/wiki Tom Giannattasio 2012-08-24 08:03:37 -07:00
  • 2ac5b0a3bd Merge pull request #542 from MITx/feature/ichuang/fix-admin-page-url-load Calen Pennington 2012-08-24 08:01:56 -07:00
  • 97ab53e786 Queuekey --> Queuestate in tests kimth 2012-08-24 08:28:47 -04:00
  • fdecaef7ef Fix datetime name conflict kimth 2012-08-24 08:23:46 -04:00
  • eb4068cc11 Make profile page look reasonable Arjun Singh 2012-08-24 03:14:42 -07:00
  • eb65b95232 Removing stray return statement Arjun Singh 2012-08-24 03:06:44 -07:00
  • fe74f9bc85 reconstruct after editing Rocky Duan 2012-08-24 02:17:58 -07:00
  • cc5fbdd5a7 fixed appearance of loading icon near sort bar Rocky Duan 2012-08-24 02:05:11 -07:00
  • 80195176e9 use escape html everywhere and only send discussion data relavent Rocky Duan 2012-08-24 01:45:55 -07:00
  • 88a3e828f6 don't use raw html when rendering Rocky Duan 2012-08-24 01:04:11 -07:00
  • 95a7a5b08b Student must wait XQUEUE_WAITTIME_BETWEEN_REQUESTS between queueing submissions kimth 2012-08-23 18:39:57 -04:00
  • 7e6656f2df fixed profiled user id (toggle moderator status) Rocky Duan 2012-08-23 15:21:27 -07:00
  • 5a1c792723 Merge pull request #546 from MITx/feature/rocky/discussion David Ormsbee 2012-08-23 15:17:13 -07:00
  • 3761b02ce8 hide reply button after closing thread Rocky Duan 2012-08-23 15:12:02 -07:00
  • 575a91e2ef Merge pull request #539 from MITx/feature/rocky/blank_slate_fix David Ormsbee 2012-08-23 15:08:25 -07:00
  • 9cf9165b04 Merge pull request #545 from MITx/feature/rocky/discussion David Ormsbee 2012-08-23 15:03:02 -07:00
  • 673cc2bbb3 Keep queueuing time kimth 2012-08-23 17:43:38 -04:00
  • ca09c7427b some tiny bug fixes Rocky Duan 2012-08-23 11:43:05 -07:00
  • 77f928d118 Queuestate records both secret key and time of queue request kimth 2012-08-23 17:24:59 -04:00
  • 27729db1c7 Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-23 16:57:19 -04:00
  • 2783ff7e63 added simple table filtering to gradebook Tom Giannattasio 2012-08-23 16:57:03 -04:00
  • b494441e7a started new gradebook functionality Tom Giannattasio 2012-08-23 16:40:48 -04:00
  • d94ef54549 Added cheatsheet popup to wiki editor. Carlos Andrés Rocha 2012-08-23 16:30:58 -04:00
  • f9616c6ed3 Merge pull request #544 from MITx/feature/arjun/fix_password_reset_domain David Ormsbee 2012-08-23 11:58:09 -07:00
  • 65c5a21a7f Merge pull request #543 from MITx/feature/arjun/fix_activation_domain David Ormsbee 2012-08-23 11:57:55 -07:00
  • 202edb0ecb making password reset email link have the current site's domain rather than edx.org hardcoded. Arjun Singh 2012-08-23 11:47:30 -07:00
  • a7f1e7c147 use the request's hostname rather than settings.SITE_NAME for activation emails Arjun Singh 2012-08-23 11:37:46 -07:00
  • bc63b99a10 disable subdomain filtering in dev_ike (should allow non-fall2012 courses) ichuang 2012-08-23 13:13:58 -04:00
  • 8274aa112f the admin page should be loaded based on settings.DEBUG, not askbot ichuang 2012-08-23 13:12:46 -04:00
  • 582694b029 Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-23 13:10:38 -04:00
  • 9a3a4f4a88 set active accordion state Tom Giannattasio 2012-08-23 13:10:14 -04:00
  • 8e7eef24a2 add manage_course_groups command to lms_migration ichuang 2012-08-23 13:10:08 -04:00
  • afa67599ea Merge pull request #540 from MITx/feature/arjun/fix_discussion_syncing David Ormsbee 2012-08-23 10:09:02 -07:00
  • 3e6f3430b6 remove blank slate after new post Rocky Duan 2012-08-23 10:06:27 -07:00
  • ef3ec494ea Merge pull request #538 from MITx/feature/arjun/fix_partial_credit ichuang 2012-08-23 10:04:51 -07:00
  • ed6317f37c getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service Arjun Singh 2012-08-23 10:03:36 -07:00
  • 48e7966ef2 partial credit for an inputfield Arjun Singh 2012-08-23 09:11:13 -07:00
  • 4e3d821178 Merge pull request #537 from MITx/feature/cale/xqueue_callback_url_proto Calen Pennington 2012-08-23 08:51:54 -07:00
  • f2c5a064aa Pull the http or https from the forwarded proto for the xqueue callback url Calen Pennington 2012-08-23 11:49:23 -04:00
  • 9a68d902aa Merge pull request #536 from MITx/feature/fix_404 Calen Pennington 2012-08-23 08:29:17 -07:00
  • 0b309ea40a Can't return Http404, have to raise it. David Ormsbee 2012-08-23 11:27:54 -04:00
  • 5950520e71 tweaked sequence nav and discussion profile sidebar Tom Giannattasio 2012-08-23 11:11:22 -04:00
  • 50f4fae955 Merge pull request #532 from MITx/feature/bridger/new_wiki David Ormsbee 2012-08-23 07:39:33 -07:00
  • d05b3de018 Merge pull request #535 from MITx/feature/forum_unicode David Ormsbee 2012-08-23 07:36:59 -07:00
  • 2feda8467e fix unicode error on forum profile view page David Ormsbee 2012-08-23 10:32:27 -04:00
  • 773055cf54 fix wiki falsh message Kyle Fiedler 2012-08-23 10:28:31 -04:00
  • 07eead2349 Updated django-wiki to better handle relative wiki links. Bridger Maxwell 2012-08-23 10:11:31 -04:00
  • a2372e659c Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-23 10:04:17 -04:00
  • 7d7b5be95a Merge pull request #531 from MITx/feature/arjun/fix_discussion_sync David Ormsbee 2012-08-23 07:04:02 -07:00
  • 2c1571d66c applied line height to course content wrapper to avoid strange line heights with improper markup Tom Giannattasio 2012-08-23 10:04:00 -04:00
  • a075cc79fd remove stray import Arjun Singh 2012-08-23 06:50:16 -07:00
  • 7f3a4889b8 make discussions work for new users Arjun Singh 2012-08-23 06:48:22 -07:00
  • 0a6f5567e1 Merge pull request #530 from MITx/rocha/fix-for-https-video-player David Ormsbee 2012-08-23 06:30:41 -07:00
  • ba3df747cc Merge pull request #529 from MITx/feature/cale/heartbeat-waits-for-courses jarv 2012-08-23 06:25:31 -07:00
  • ad2fff2900 Retrieving video information from YouTube using https instead of http. Carlos Andrés Rocha 2012-08-23 09:24:51 -04:00
  • 5af67c1bf2 Put course location urls in heartbeat page, rather than lists Calen Pennington 2012-08-23 09:19:26 -04:00
  • 57444bdd25 Make heartbeat url wait for courses to be loaded Calen Pennington 2012-08-23 09:16:40 -04:00
  • 410335edb8 Merge pull request #528 from MITx/jarv/maintenance Calen Pennington 2012-08-23 05:40:01 -07:00
  • f0b60fed10 adding maintenance static data John Jarvis 2012-08-23 08:30:04 -04:00
  • cf2f5d2af2 Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-23 08:24:58 -04:00
  • 163eb9d49f fixed bottom sequence nav buttons and firefox outling bug Tom Giannattasio 2012-08-23 08:24:54 -04:00
  • d084506d38 Merge pull request #525 from MITx/feature/arjun/comment_depth David Ormsbee 2012-08-23 05:21:02 -07:00
  • ec94d75106 Merge pull request #526 from MITx/feature/forum_config arjun810 2012-08-23 05:07:11 -07:00
  • ec4858801e read the comment service shared key from django config David Ormsbee 2012-08-23 08:02:19 -04:00
  • c52dd5faea another unicode fix for forums David Ormsbee 2012-08-23 07:59:53 -04:00
  • d8342255be Merge pull request #519 from MITx/feature/arjun/cs188_css Victor Shnayder 2012-08-23 04:58:24 -07:00
  • b0e418a390 Merge pull request #518 from MITx/feature/arjun/fix_choicegroup kimth 2012-08-23 04:56:59 -07:00
  • d1a8cd3f65 Limiting depth of comments Arjun Singh 2012-08-23 04:50:03 -07:00
  • 27347fbc87 Merge pull request #524 from MITx/feature/forum_unicode David Ormsbee 2012-08-23 04:40:59 -07:00
  • a24fd328d9 Fix error when unicode string is in message viewed in single-thread template David Ormsbee 2012-08-23 07:40:18 -04:00
  • dc13ff81b7 Merge pull request #521 from MITx/feature/rocky/loading David Ormsbee 2012-08-23 04:31:11 -07:00
  • bc005e5f46 adjusted dashboard sidebar to accommodate long emails Tom Giannattasio 2012-08-23 07:29:35 -04:00
  • 2653690205 Merge pull request #520 from MITx/feature/rocky/discussion David Ormsbee 2012-08-23 04:28:51 -07:00
  • 6de0599731 Merge branch 'master' into feature/rocky/discussion David Ormsbee 2012-08-23 07:22:49 -04:00
  • 22cbc1bdf8 Merge pull request #523 from MITx/feature/cale/aws-subdomain-branding Calen Pennington 2012-08-23 03:31:53 -07:00
  • f4e75f5c39 Add subdomain_branding key to aws settings Calen Pennington 2012-08-23 06:30:43 -04:00
  • e4890a8bff fixed pluralize Rocky Duan 2012-08-23 02:52:51 -07:00
  • f2507d7c52 hide similar post wrapper when no results Rocky Duan 2012-08-23 02:51:46 -07:00
  • 5d90366917 fixed file uploading Rocky Duan 2012-08-23 02:50:26 -07:00
  • 0b00e3b099 make similar posts url working Rocky Duan 2012-08-23 02:17:17 -07:00
  • 5fb2bbbd7f make similar posts go away when submitted post Rocky Duan 2012-08-23 02:03:50 -07:00
  • 2b6a0928ca fixed loading for discussion module Rocky Duan 2012-08-23 01:55:31 -07:00
  • 16ca13f203 Merge branch 'feature/rocky/discussion' into feature/rocky/loading Rocky Duan 2012-08-23 01:52:07 -07:00
  • 233f817f0b include discussion js group in coursewar & removed unnecessary code Rocky Duan 2012-08-23 01:51:51 -07:00
  • abe12ddd7c display loading status Rocky Duan 2012-08-23 01:47:47 -07:00
  • 74bc232946 fixed discussion title and edit Rocky Duan 2012-08-23 00:07:57 -07:00
  • 007de179e1 add user profile page back Rocky Duan 2012-08-22 23:44:15 -07:00
  • 4dae36cd8e only execude code when backbone is defined Rocky Duan 2012-08-22 20:13:42 -07:00
  • 45431ae789 scroll to top after reloading threads Rocky Duan 2012-08-22 19:41:08 -07:00
  • 0757712e4b Get rid of inline flag for choicegroup, radiogroup, and checkboxgroup. This should be done via CSS. This change only affects radiogroup and checkboxgroup as far as changing the behavior goes Arjun Singh 2012-08-22 23:11:51 -07:00
  • 1c9029c163 cs188 styling Arjun Singh 2012-08-22 22:57:14 -07:00
  • e347c98e12 Merge pull request #517 from MITx/feature/fix_discussions_with_dashes David Ormsbee 2012-08-22 22:18:24 -07:00
  • e3cdad0d2b change url regexp to handle discussions in coursenames with dashes David Ormsbee 2012-08-23 01:17:49 -04:00
  • c0372c2529 fix (aka de-feature) the "see all children" link on the wiki Victor Shnayder 2012-08-23 00:40:08 -04:00
  • 79b0ff62a5 Merge pull request #512 from MITx/feature/rocky/discussion David Ormsbee 2012-08-22 21:33:07 -07:00
  • 53c3d60ef1 Do JS fix for collectstatic that we had on main for discussion's index.html David Ormsbee 2012-08-23 00:32:45 -04:00
  • 2d67a4c0f4 Merge branch 'master' into feature/rocky/discussion David Ormsbee 2012-08-23 00:28:04 -04:00
  • daf33dbcd9 Merge pull request #514 from MITx/feature/arjun/customize_info_sidebar David Ormsbee 2012-08-22 21:23:14 -07:00