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

Commit Graph

  • 652e2aa24c fix for inheriting metadata bug Victor Shnayder 2012-08-01 19:22:14 -04:00
  • b63f05b651 update clean_xml script to use error trackers properly Victor Shnayder 2012-08-01 19:20:28 -04:00
  • 82899323e8 Add metadata inherit test Victor Shnayder 2012-08-01 19:19:58 -04:00
  • 2f4bf5f606 Minor fixes to cms Victor Shnayder 2012-08-01 19:17:52 -04:00
  • b2ddef99be padding and margins of discussion containers Brittany Cheng 2012-08-01 18:14:59 -04:00
  • 03d9b7a928 merge kyle's style fixes Brittany Cheng 2012-08-01 18:09:27 -04:00
  • ae89aac6ce Merge branch 'master' of github.com:MITx/mitx into discussion2 Brittany Cheng 2012-08-01 18:07:52 -04:00
  • 6c214fc4bd basic paginator styles Brittany Cheng 2012-08-01 18:03:36 -04:00
  • eedf62a1a9 Merge pull request #333 from MITx/feature/kfiedler/courseware-style David Ormsbee 2012-08-01 14:58:02 -07:00
  • 7b725a075c external_auth djangoapps files ichuang 2012-08-01 17:57:21 -04:00
  • b90aa2e2db Added more styles for the info page and added headers for the updates and handouts so they will be consistant for every class Kyle Fiedler 2012-08-01 17:35:58 -04:00
  • 6c3ec99f9e Start to change to ems and remove all of cream Kyle Fiedler 2012-08-01 16:55:30 -04:00
  • cdd37eeb92 Strip down sequence navigaiton and more stripping of the courseware nav Kyle Fiedler 2012-08-01 14:29:53 -04:00
  • dac66a998e Merge branch 'master' of github.com:dementrock/mitx into discussion2 Brittany Cheng 2012-08-01 17:06:37 -04:00
  • 01ac251c2b styles and staff Brittany Cheng 2012-08-01 17:06:32 -04:00
  • 0e7ce4a6be Merge pull request #332 from MITx/jarv/prod-requirements jarv 2012-08-01 13:58:33 -07:00
  • a68cb545be updating prod-requirements John Jarvis 2012-08-01 16:57:13 -04:00
  • 04f82b7b02 Merge branch 'master' of github.com:MITx/mitx into jarv/prod-requirements John Jarvis 2012-08-01 16:56:49 -04:00
  • ce15faf6a0 Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2 Rocky Duan 2012-08-01 16:52:06 -04:00
  • fc31885d2e Merge branch 'master' into discussion2 Rocky Duan 2012-08-01 16:51:54 -04:00
  • 1ee1d900ab fixded inline with pagination Rocky Duan 2012-08-01 16:51:32 -04:00
  • 0dccfc0a8d forgot to change template name Rocky Duan 2012-08-01 16:47:20 -04:00
  • 7bb329d436 vote styles Brittany Cheng 2012-08-01 16:45:34 -04:00
  • 5d3b187540 Merge branch 'master' of github.com:MITx/mitx Rocky Duan 2012-08-01 16:45:21 -04:00
  • 17d11a6391 pagination Rocky Duan 2012-08-01 16:45:08 -04:00
  • 845ca43ea1 inline and forum styles Brittany Cheng 2012-08-01 16:42:09 -04:00
  • 7350243de5 Merge pull request #331 from MITx/feature/victor/xml-verify Calen Pennington 2012-08-01 13:35:45 -07:00
  • ea26c25cb4 add back-compat code to customtag Victor Shnayder 2012-08-01 16:33:28 -04:00
  • 3b34d84216 Merge pull request #326 from MITx/feature/victor/xml-verify Calen Pennington 2012-08-01 13:20:43 -07:00
  • 442fb6e839 Pass the cursor, rather than the output of cursor.execute, to dictfetchall Calen Pennington 2012-08-01 16:19:29 -04:00
  • aa215bc316 Merge remote-tracking branch 'origin/hotfix/1.0.1' into hotfix/1.0.3 Calen Pennington 2012-08-01 15:59:06 -04:00
  • 4874fa51ef remove cruft from student.views ichuang 2012-08-01 15:00:27 -04:00
  • 10ebcefd54 add openid authentication ichuang 2012-08-01 14:59:55 -04:00
  • 07ebc83368 fixing merge error Brittany Cheng 2012-08-01 14:39:26 -04:00
  • bdab90190f trying to fix merge conflicts Brittany Cheng 2012-08-01 14:29:00 -04:00
  • 01623ddbfb merge with origin master Brittany Cheng 2012-08-01 14:24:46 -04:00
  • f204e9888f renamed files Rocky Duan 2012-08-01 13:09:19 -04:00
  • 51772c04f3 use separate templates for forum view and inline view Rocky Duan 2012-08-01 13:02:57 -04:00
  • 777c3ee42c Merge branch 'master' of github.com:MITx/mitx Rocky Duan 2012-08-01 12:49:00 -04:00
  • 7d9d790c5d endorse comments Rocky Duan 2012-08-01 12:43:57 -04:00
  • 75c478771e fixed histogram bug under staff view Rocky Duan 2012-08-01 12:42:57 -04:00
  • 7fb831a2e8 Record warning on bad html files Victor Shnayder 2012-08-01 09:36:13 -04:00
  • 05c22c4901 Prettier error display Victor Shnayder 2012-08-01 09:29:31 -04:00
  • 32253510d1 Import error cleanup Victor Shnayder 2012-07-31 19:37:53 -04:00
  • 463b758434 fixed args in call to add_histogram Victor Shnayder 2012-07-31 17:20:33 -04:00
  • 740c9b7df1 fixed docstring for customtag Victor Shnayder 2012-07-31 17:20:18 -04:00
  • 0b67d1c401 Turn error_handlers into error_trackers Victor Shnayder 2012-07-31 17:20:04 -04:00
  • 009bd23066 save LazyLoadingDict in case we do want it later Victor Shnayder 2012-07-31 17:13:49 -04:00
  • 58543bd84b definition and metadata no longer lazy-loaded Victor Shnayder 2012-07-31 17:12:47 -04:00
  • 119ab639d0 make cms users look like staff by default Victor Shnayder 2012-07-31 17:12:00 -04:00
  • bc14441a75 add template I forgot Victor Shnayder 2012-07-31 13:45:13 -04:00
  • e2e524453f Make courseware index view more bulletproof Victor Shnayder 2012-07-31 13:44:40 -04:00
  • c0cdff7071 Rename MalformedDescriptor to ErrorDescriptor Victor Shnayder 2012-07-31 13:44:04 -04:00
  • 707551b08d local variable naming tweak Victor Shnayder 2012-07-31 11:26:02 -04:00
  • 0edc40de34 Address minor comments in #313 Victor Shnayder 2012-07-31 11:25:10 -04:00
  • 0ae434cc09 Move path_to_location out of mongo.py Victor Shnayder 2012-07-31 11:24:39 -04:00
  • ed35cefa29 Fix html file handling. Victor Shnayder 2012-07-30 18:36:02 -04:00
  • 46775386d3 make CACHE_TIMEOUT messages go away Victor Shnayder 2012-07-30 18:29:18 -04:00
  • d750d945fd Remove malformed tags when contents aren't malformed anymore. Victor Shnayder 2012-07-30 15:11:38 -04:00
  • c53ed6a238 remove some debugging messages Victor Shnayder 2012-07-30 15:10:21 -04:00
  • 10054e95ce add message to import command Victor Shnayder 2012-07-30 15:09:33 -04:00
  • 0d83d2e645 Add roundtrip test for malformed module Victor Shnayder 2012-07-30 11:51:14 -04:00
  • 53608922ba Make the malformed descriptor import properly Victor Shnayder 2012-07-30 11:36:43 -04:00
  • ef6da22ac3 Add a fallback MalformedDescriptor Victor Shnayder 2012-07-30 10:42:23 -04:00
  • 4e6a9b0df7 Add kwargs back to DescriptorSystem init()s Victor Shnayder 2012-07-30 10:36:33 -04:00
  • 0bfcefd214 Merge pull request #327 from MITx/fix-beautifulsoup4 Calen Pennington 2012-08-01 08:39:38 -07:00
  • ef8a211b9e Merge pull request #329 from MITx/MITx/feature/bridger/fast_course_grading Calen Pennington 2012-08-01 08:37:16 -07:00
  • c107d109c9 Merge branch 'master' of github.com:MITx/mitx into discussion2 Brittany Cheng 2012-08-01 11:29:26 -04:00
  • ae3da772d0 Got profile page working again. The grader for each course is now defined in the data dir as grading_policy.json. Bridger Maxwell 2012-08-01 11:27:04 -04:00
  • a2e1409dbb Merge pull request #328 from MITx/jarv/dev-script-updates jarv 2012-08-01 08:13:34 -07:00
  • 94c19059b5 trailing whitespace John Jarvis 2012-08-01 11:08:41 -04:00
  • 71898e4869 removing matplotlib from requirements.txt John Jarvis 2012-08-01 10:54:50 -04:00
  • 8c1bb0cab2 sanity checking /usr/local, updating coffee script install location, old location no longer works John Jarvis 2012-08-01 10:54:32 -04:00
  • 8a983b3ced Queuekey does not need to be integer kimth 2012-08-01 10:39:09 -04:00
  • fac7659315 Use xqueue cname kimth 2012-08-01 10:23:30 -04:00
  • f637ca5120 Merge branch 'master' of github.com:MITx/mitx into discussion2 Brittany Cheng 2012-08-01 09:44:45 -04:00
  • b9773b5d17 Merge pull request #323 from MITx/kimth/lms-coderesponse ichuang 2012-07-31 19:45:55 -07:00
  • 381d247589 djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4 ichuang 2012-07-31 21:43:29 -04:00
  • 8023d2b70a pulled from origin master Brittany Cheng 2012-07-31 18:48:39 -04:00
  • f1e07024d4 Merge branch 'master' of github.com:MITx/mitx into discussion2 Brittany Cheng 2012-07-31 18:43:21 -04:00
  • 33c7336f1d styles again Brittany Cheng 2012-07-31 18:17:35 -04:00
  • f099928150 Merge pull request #324 from MITx/jarv/dev-script-updates jarv 2012-07-31 14:59:51 -07:00
  • b08ea47bf3 Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates John Jarvis 2012-07-31 17:24:09 -04:00
  • 0642af0147 submodules are not on a branch, no need to pull John Jarvis 2012-07-31 17:17:33 -04:00
  • ecab194e47 removing unnecessary chdir John Jarvis 2012-07-31 17:14:22 -04:00
  • 5c73a6f2ca betting rvmrc handling John Jarvis 2012-07-31 17:04:58 -04:00
  • 61fa118427 Merge pull request #325 from MITx/feature/kfiedler/courseware-style David Ormsbee 2012-07-31 13:58:18 -07:00
  • 9c31715da5 removing virtualenv install lines that arent needed John Jarvis 2012-07-31 16:55:07 -04:00
  • 4d1bf53027 Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates John Jarvis 2012-07-31 16:53:29 -04:00
  • 37ba0395e0 do not install virtualenv unless it needs to be upgraded (<1.7) John Jarvis 2012-07-31 16:49:18 -04:00
  • 72bd3e6db0 edit tag styles Brittany Cheng 2012-07-31 16:44:55 -04:00
  • 11495563fa Tweaks to CodeMirror: fix indentation, textarea is vertically resizable kimth 2012-07-31 16:42:17 -04:00
  • b5b0d08621 Sorta fix askbot Kyle Fiedler 2012-07-31 16:28:48 -04:00
  • 9d14033f6b Added some styles for the top navigation and for the sidebar navigation Kyle Fiedler 2012-07-31 15:52:27 -04:00
  • 29d75057f2 fix font inheritance, update post control styles Brittany Cheng 2012-07-31 16:25:27 -04:00
  • f3567ddd66 Change absolute paths to relative in scss Victor Shnayder 2012-07-31 14:03:03 -04:00
  • 71b9dbbb2e Remove obsolete js references Victor Shnayder 2012-07-31 14:18:04 -04:00
  • e08cb5067e always pip install virtualenv John Jarvis 2012-07-31 16:09:11 -04:00
  • 0919963119 adding option back for --system-site-packages, will ensure virtualenv > 1.7 John Jarvis 2012-07-31 16:07:00 -04:00
  • 84fcb5ef52 change watch to follow in front end Rocky Duan 2012-07-31 16:00:42 -04:00