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

Commit Graph

  • 972837a954 Merge pull request #510 from MITx/kimth/blog-link-fix David Ormsbee 2012-08-22 21:22:29 -07:00
  • 8e560688ae Merge pull request #516 from MITx/feature/fix_backbone_js David Ormsbee 2012-08-22 21:21:59 -07:00
  • 32403fb2a2 Put dev.py's DEBUG back to True (cough) David Ormsbee 2012-08-23 00:21:35 -04:00
  • af079a9362 Fix coffee includes for discussion forum. David Ormsbee 2012-08-23 00:19:55 -04:00
  • cd1bc95efe adding the ability to override the sidebar name Arjun Singh 2012-08-22 20:02:18 -07:00
  • cdc8e02aeb Add discussion coffee scripts to courseware js so we don't add a dependency on Backbone to non-courseware JS David Ormsbee 2012-08-22 23:34:03 -04:00
  • 4e7ba6e651 Merge pull request #513 from MITx/feature/bridger/new_wiki David Ormsbee 2012-08-22 20:18:36 -07:00
  • 0e21ed030c removed new post button & added recent threads to single thread page Rocky Duan 2012-08-22 19:22:35 -07:00
  • 43ef4f6482 fixed recent threads & tags links Rocky Duan 2012-08-22 19:09:58 -07:00
  • 82ebc14bd6 Fixed inline circuit editing to only work if 'circuit-schematic' is at the beginning of a line. Bridger Maxwell 2012-08-22 21:15:52 -04:00
  • e7732bf32f Wiki directory links now go to the article, with a smaller link for viewing sub-listings. Bridger Maxwell 2012-08-22 21:05:17 -04:00
  • 99614ea302 Merge pull request #511 from MITx/feature/dave/forum_fixes David Ormsbee 2012-08-22 17:55:07 -07:00
  • 3105ff3c41 Blog link fix kimth 2012-08-22 20:33:51 -04:00
  • baa6eadfb5 Merge branch 'master' into feature/dave/forum_fixes David Ormsbee 2012-08-22 20:30:49 -04:00
  • 3fa5205780 Merge pull request #509 from MITx/feature/victor/better-courseware-errors David Ormsbee 2012-08-22 17:22:32 -07:00
  • 1b25433a39 Allow error-template-rendering errors to propagate to top-level 500 handler Victor Shnayder 2012-08-22 20:21:10 -04:00
  • 44ee0200a5 Fix undefined variables if LMS_MIGRATION was off Victor Shnayder 2012-08-22 20:19:58 -04:00
  • a792c5a83a Fixed wiki bug with 500 errors for empty dir listing. Bridger Maxwell 2012-08-22 20:16:35 -04:00
  • 9cd69e6ccd Added ability for staff users to moderate an article. Bridger Maxwell 2012-08-22 20:03:30 -04:00
  • aeee2791ea Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes David Ormsbee 2012-08-22 20:00:06 -04:00
  • 2e39131b31 Tiny fix to handle when data_or_params isn't passed in David Ormsbee 2012-08-22 19:16:28 -04:00
  • 952c9d56cf moved some stuff Rocky Duan 2012-08-22 15:57:04 -07:00
  • ee21751848 Merge branch 'merge' Rocky Duan 2012-08-22 15:52:00 -07:00
  • 631aaaf5ba removed unnecessary file Rocky Duan 2012-08-22 15:51:45 -07:00
  • 05d28200ef Merge branch 'master' of github.com:MITx/mitx into merge Rocky Duan 2012-08-22 15:51:08 -07:00
  • ebf971fad3 Profiles and permalinks both appear to be broken, so disabling both for now David Ormsbee 2012-08-22 18:22:50 -04:00
  • 3913427c6a Merge pull request #507 from MITx/kimth/fix_syllabus David Ormsbee 2012-08-22 14:51:31 -07:00
  • 0d689b3164 Quick workaround on syllabus_present that broke staging kimth 2012-08-22 17:50:21 -04:00
  • 908a5c5d59 Merge branch 'master' of github.com:MITx/mitx into merge Rocky Duan 2012-08-22 14:11:44 -07:00
  • ca36fb6792 Merge pull request #506 from MITx/feature/tomg/fall-design David Ormsbee 2012-08-22 14:11:31 -07:00
  • 3cbaba1961 fixed autosubscribe Rocky Duan 2012-08-22 14:11:19 -07:00
  • c1befd5fd4 Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-22 17:06:03 -04:00
  • 1a7b5b8564 fixed tutorial sequence nav bug Tom Giannattasio 2012-08-22 17:05:42 -04:00
  • 3b76fe16d8 make inline page working Rocky Duan 2012-08-22 14:04:42 -07:00
  • 951fb06341 Merge branch 'master' of github.com:MITx/mitx into merge Rocky Duan 2012-08-22 14:04:34 -07:00
  • fafbe41644 Merge pull request #502 from MITx/pmitros/berkeley_enrollment_hack David Ormsbee 2012-08-22 13:59:07 -07:00
  • e206bf2ffc Merge pull request #505 from MITx/feature/tomg/fall-design Calen Pennington 2012-08-22 13:34:39 -07:00
  • 69a3ea63bc Fixed minor issues (removed two unnecessary lines) Piotr Mitros 2012-08-22 16:32:14 -04:00
  • 3b24ae1068 Merge pull request #501 from MITx/kimth/autodisable-syllabus David Ormsbee 2012-08-22 13:15:24 -07:00
  • 3777cd2f5e Added missing file Piotr Mitros 2012-08-22 16:15:24 -04:00
  • c86ee73bd8 Merge pull request #504 from MITx/feature/bridger/new_wiki David Ormsbee 2012-08-22 13:13:33 -07:00
  • a05cf05462 Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-22 16:09:30 -04:00
  • 2c827c46f9 fixed firefox outline bugs Tom Giannattasio 2012-08-22 16:09:09 -04:00
  • e093a365a4 Merge pull request #503 from MITx/feature/ichuang/fix-staff-debug Calen Pennington 2012-08-22 13:01:31 -07:00
  • a694d1034e We use django-wiki's built-in wikilinks markdown extension. They were clashing. Bridger Maxwell 2012-08-22 15:57:44 -04:00
  • 7c242939f2 fix staff debug view, and also add new source_link ike 2012-08-22 15:51:08 -04:00
  • a301abd5ad Enrollment hack for allowing Berkeley to add their students. Piotr Mitros 2012-08-22 15:49:48 -04:00
  • cca5fe2f04 Delete page Kyle Fiedler 2012-08-22 15:40:56 -04:00
  • f4f8b7bf73 Added delete page and padding and hid th on overflow Kyle Fiedler 2012-08-22 15:39:24 -04:00
  • f46607710f Merge master kimth 2012-08-22 15:25:07 -04:00
  • 64788a73aa Remove ENABLE_SYLLABUS flag from envs/common kimth 2012-08-22 15:22:58 -04:00
  • 5b7ae1a99b Add more excludes to rakefile Calen Pennington 2012-08-22 15:14:25 -04:00
  • 960cf5792b Dynamically disable syllabus per-course kimth 2012-08-22 15:12:49 -04:00
  • 7464332180 added fix for error styles and swapped some the button order Kyle Fiedler 2012-08-22 15:09:20 -04:00
  • 9b26a20989 fixed search highlighting Rocky Duan 2012-08-22 12:04:32 -07:00
  • 8b8ee9f434 Merge pull request #500 from MITx/feature/cale/university-branding David Ormsbee 2012-08-22 12:02:19 -07:00
  • 2eb0de99eb Merge pull request #494 from MITx/feature/arjun/course_specific_css Calen Pennington 2012-08-22 11:55:20 -07:00
  • d735190570 Merge pull request #499 from MITx/feature/bridger/new_wiki Calen Pennington 2012-08-22 11:54:39 -07:00
  • 23e3d371ef adding more details about the state of course.css_class Arjun Singh 2012-08-22 11:49:26 -07:00
  • 55984e31fc Add HarvardX- and MITx- on-edx-logo.png files Calen Pennington 2012-08-22 14:47:50 -04:00
  • 5ca636e606 Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH Calen Pennington 2012-08-22 14:43:22 -04:00
  • 1277c5f892 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Kyle Fiedler 2012-08-22 14:43:15 -04:00
  • d0c92aa159 Added styles for the wiki directory Kyle Fiedler 2012-08-22 14:43:03 -04:00
  • 788c74e07a Added optional <wiki> tag to course to specify an alternative wiki page. Bridger Maxwell 2012-08-22 14:25:05 -04:00
  • b841591b0a Remove special styling for courseware header logo Calen Pennington 2012-08-22 14:08:36 -04:00
  • 6c3985fae9 fixed requirements Rocky Duan 2012-08-22 11:07:12 -07:00
  • 37c78524a8 migrated threads reloading related stuff Rocky Duan 2012-08-22 11:07:02 -07:00
  • 82bab71ccf First pass at branding the header logo on subdomains Calen Pennington 2012-08-22 14:05:12 -04:00
  • 02f29c22c9 Added stsyles for toc Kyle Fiedler 2012-08-22 13:41:20 -04:00
  • 45f516cd52 Merge pull request #493 from MITx/feature/bridger/new_wiki Calen Pennington 2012-08-22 10:27:18 -07:00
  • 2eb3f37681 Merge pull request #498 from MITx/feature/victor/domain-specific-caching Calen Pennington 2012-08-22 10:25:25 -07:00
  • ce0bc1f782 Separate caches per-domain-name Victor Shnayder 2012-08-22 13:18:33 -04:00
  • 14382702bc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki Bridger Maxwell 2012-08-22 13:09:42 -04:00
  • f580bafdfe Merge pull request #496 from MITx/kimth/fix-choiceresponse Calen Pennington 2012-08-22 10:07:42 -07:00
  • aa933cb38f Merge pull request #497 from MITx/feature/victor/catch-module-errors Calen Pennington 2012-08-22 10:05:08 -07:00
  • 6a0072a0fb Merge pull request #483 from MITx/feature/tomg/fall-design David Ormsbee 2012-08-22 10:04:12 -07:00
  • 365495521e Catch errors in module load Victor Shnayder 2012-08-22 12:58:46 -04:00
  • 7b4c86e55c Updated django-wiki with bug fix. Bridger Maxwell 2012-08-22 12:42:21 -04:00
  • 3796bb4a12 Changed title of default root wiki page to just be Wiki. Bridger Maxwell 2012-08-22 12:42:03 -04:00
  • edefa04de1 Workaround for 500 on showanswer for choiceresponse kimth 2012-08-22 12:41:30 -04:00
  • d2808981cb fixed wiki breadcrumb arrow bug Tom Giannattasio 2012-08-22 12:09:57 -04:00
  • fb1d9ca06c Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-22 11:41:19 -04:00
  • 7d903c4089 sidebar hover and firefox bug fixes Tom Giannattasio 2012-08-22 11:40:59 -04:00
  • f065959f8a Merge pull request #495 from MITx/feature/arjun/fix_syllabus_css Calen Pennington 2012-08-22 08:39:00 -07:00
  • 390823bdea Added django-wiki's requirements to requirements.txt, because they weren't being included automatically. Bridger Maxwell 2012-08-22 11:37:01 -04:00
  • 96f0f7cbde Changed default contents of new course wiki. Bridger Maxwell 2012-08-22 11:36:06 -04:00
  • 03248cc324 Updated django-wiki. Bridger Maxwell 2012-08-22 10:09:06 -04:00
  • b7ce475adb accordion hovers Tom Giannattasio 2012-08-22 09:35:17 -04:00
  • 8344fe88bd removed funky footer logo animation Tom Giannattasio 2012-08-22 09:08:42 -04:00
  • 885efc47c4 darker background for increased contrast Tom Giannattasio 2012-08-22 09:03:38 -04:00
  • a9126aa276 Fixed syllabus to look good with new courseware styling Arjun Singh 2012-08-22 05:25:48 -07:00
  • 9a21c5d4a8 Adding reasoning for adding a new metadata field Arjun Singh 2012-08-22 05:00:11 -07:00
  • 0b6bf77373 Adding a course-specific css class to body so that we can have course-targeted styles as a last resort Arjun Singh 2012-08-22 04:58:30 -07:00
  • 7e645e7f91 Merge branch 'master' into feature/tomg/fall-design Tom Giannattasio 2012-08-22 07:35:26 -04:00
  • 441d1955f9 fixed anonymous header bug Tom Giannattasio 2012-08-22 07:34:55 -04:00
  • 4a3975c78d adjusted frontend stuff Rocky Duan 2012-08-21 23:33:13 -07:00
  • a90af0c471 render permalink in backend Rocky Duan 2012-08-21 23:26:06 -07:00
  • 654075e03f migrated follow thread Rocky Duan 2012-08-21 23:08:32 -07:00
  • 723519ee74 Removed wiki/settings.html so the default one will be used. Bridger Maxwell 2012-08-22 00:55:03 -04:00
  • a285d1a60e Updated wiki preview template and django-wiki version. Bridger Maxwell 2012-08-22 00:07:37 -04:00