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

Commit Graph

  • 6ccfd87e22 merge Ernie Park 2012-02-01 11:59:37 -05:00
  • a6977aae4c update routes and new password_reset Ernie Park 2012-02-01 11:59:27 -05:00
  • 661bdd1f82 merge Ernie Park 2012-02-01 11:58:37 -05:00
  • a0db591b88 move password_reset_form out of registration Ernie Park 2012-02-01 11:58:23 -05:00
  • 9f093f985c update password reset form and change inputs to type submit and chmod executable html files Ernie Park 2012-02-01 11:51:24 -05:00
  • f0f259970b typo Piotr Mitros 2012-01-31 22:51:56 -05:00
  • 8263c2a587 Fixed name Piotr Mitros 2012-01-31 22:21:51 -05:00
  • d0d858c967 Subs moved to data Piotr Mitros 2012-01-31 18:22:20 -05:00
  • cdcd8dec03 merge fischerl 2012-01-31 16:55:57 -05:00
  • 91b3422f04 more subs fischerl 2012-01-31 16:55:37 -05:00
  • 472a399667 STATIC_GRAB, starting to make course.xml ready for AB tests Piotr Mitros 2012-01-31 16:31:29 -05:00
  • c70e705009 Merged main css conflict Reda Lemeden 2012-01-31 16:17:42 -05:00
  • e3d74b0ce1 Removed old application.css Reda Lemeden 2012-01-31 16:06:33 -05:00
  • aa6170c720 Added Askbot images folder Reda Lemeden 2012-01-31 16:04:37 -05:00
  • d42e393036 Merge with default Reda Lemeden 2012-01-31 16:01:40 -05:00
  • 0edb12e441 Voting widget skinned Reda Lemeden 2012-01-31 16:00:25 -05:00
  • 4bf5e4e18f Merge with head Reda Lemeden 2012-01-31 15:57:56 -05:00
  • 0e3c487187 Voting widget skinned Reda Lemeden 2012-01-31 15:57:02 -05:00
  • 9f21488aed Fixed merge conflicts Kyle Fiedler 2012-01-31 15:32:56 -05:00
  • 5f7cc6ff83 Merge Kyle Fiedler 2012-01-31 15:29:51 -05:00
  • db45a46398 Added compiled css Kyle Fiedler 2012-01-31 15:22:16 -05:00
  • 91f9c31e1f update aa 2012-01-31 15:21:53 -05:00
  • 2d3ebff218 IE6 & 7 fixeS Kyle Fiedler 2012-01-31 14:45:44 -05:00
  • 201d494510 added more subs fischerl 2012-01-31 11:13:03 -05:00
  • b5c05c5c2e get images in the right place cjt 2012-01-31 10:56:38 -05:00
  • 3d552243d5 Styled wiki delete button Kyle Fiedler 2012-01-31 10:23:17 -05:00
  • c53483ce6d Merge Kyle Fiedler 2012-01-31 09:48:43 -05:00
  • 94016f8ba8 Minor edits to the index pages Kyle Fiedler 2012-01-31 09:48:27 -05:00
  • dd66eecfba Merge Piotr Mitros 2012-01-30 20:23:38 -05:00
  • e8311db7a6 Better text for password change in profile page Piotr Mitros 2012-01-30 20:23:24 -05:00
  • ef1bc23971 JSON password reset Piotr Mitros 2012-01-30 20:19:11 -05:00
  • cf1b0a8655 Seq module makes nicer class types for Kyle's video styling Piotr Mitros 2012-01-30 17:44:02 -05:00
  • f851063b04 Merge with Head Reda Lemeden 2012-01-30 17:34:01 -05:00
  • 82c1c70c0d Added style to the top section of the question view (voting+social still missing) Reda Lemeden 2012-01-30 17:31:41 -05:00
  • 5e89fba41d Added min-height to subtitles to decrease the size change Kyle Fiedler 2012-01-30 17:08:51 -05:00
  • 452333c743 Merge Piotr Mitros 2012-01-30 16:53:42 -05:00
  • 0645756bc7 favicon.ico Piotr Mitros 2012-01-30 16:53:12 -05:00
  • e6cea32d82 Changed around the text on the marketing pages Kyle Fiedler 2012-01-30 16:50:47 -05:00
  • 811995a27e Changes needed for Askbot S3 Piotr Mitros 2012-01-30 16:43:17 -05:00
  • c23425b7cd Merge Piotr Mitros 2012-01-30 15:53:57 -05:00
  • 974f744289 Amazon S3 SSL Piotr Mitros 2012-01-30 15:53:16 -05:00
  • 515dd66b67 merge Kyle Fiedler 2012-01-30 15:52:22 -05:00
  • 98f2c69193 Added images for video player and compiled css Kyle Fiedler 2012-01-30 15:52:03 -05:00
  • 3407fc9ec6 merge Kyle Fiedler 2012-01-30 15:51:23 -05:00
  • bd570bee46 Added styles for the video player Kyle Fiedler 2012-01-30 15:51:08 -05:00
  • 754fce5740 merge fischerl 2012-01-30 14:19:28 -05:00
  • ebdd67edc1 added lecture 2 subs fischerl 2012-01-30 14:16:42 -05:00
  • 6f2f08fb1c Merged in bug fixes from default Bridger Maxwell 2012-01-30 13:30:55 -05:00
  • 9ba59fe3a4 Working on adding up graded scores for sections. Bridger Maxwell 2012-01-30 13:30:39 -05:00
  • 6fa632c0c5 merged with deleted settings David Ormsbee 2012-01-30 13:27:50 -05:00
  • b4a91ff486 Suppress op level exception logging middleware if TEMPLATE_DEBUG=True David Ormsbee 2012-01-30 13:27:18 -05:00
  • 134165fed4 Near-final TOS, Honor Code, Copyright Piotr Mitros 2012-01-30 12:49:18 -05:00
  • f7eef6b217 Removed old settings Piotr Mitros 2012-01-30 12:48:47 -05:00
  • 9a0af7f47d remove outdated logging comment David Ormsbee 2012-01-30 12:41:59 -05:00
  • 3622f81c69 update logging to add pid to filename, so we don't have to worry about multiple processes trying to share the same log file David Ormsbee 2012-01-30 12:40:35 -05:00
  • c6d2ea6afb Merge with default branch Bridger Maxwell 2012-01-30 12:39:51 -05:00
  • 78a2b2239e Compliled sass Kyle Fiedler 2012-01-30 12:09:59 -05:00
  • 712b97115d Fixed topbar bug in discussion Kyle Fiedler 2012-01-30 12:09:23 -05:00
  • 86e3f473cd Added new error pages and changed textbook image Kyle Fiedler 2012-01-30 11:59:12 -05:00
  • 3fa9b89833 Merge Kyle Fiedler 2012-01-30 11:52:18 -05:00
  • 33060c358a Added new treeview image Kyle Fiedler 2012-01-30 11:51:55 -05:00
  • af183fc023 Added 404 and server down pages Kyle Fiedler 2012-01-30 11:31:48 -05:00
  • c81bf892bf images for Lab 1 cjt 2012-01-30 09:56:47 -05:00
  • 365e9a49c3 move lab images into data/images cjt 2012-01-30 09:50:53 -05:00
  • 3a6a43c055 Update logging handlers to use WatchedFileHandler (TimedRotatingFileHandler has problems with multiple processes) David Ormsbee 2012-01-29 22:45:34 -05:00
  • 9ad26e0646 Bug in tracking framework when no cookie Piotr Mitros 2012-01-29 22:17:04 -05:00
  • 2222e5b781 Attemping another fix for staging... Piotr Mitros 2012-01-29 21:59:27 -05:00
  • c7059bb005 import bug fixed (runserver vs. runfcgi issue) Piotr Mitros 2012-01-29 21:55:35 -05:00
  • 8e14bbae97 Marketing page closer to Kyle/Reda Piotr Mitros 2012-01-29 21:55:00 -05:00
  • a17dbb3c24 Fixed bugs from lfischer merge Piotr Mitros 2012-01-29 21:47:55 -05:00
  • 29c7f529b5 merge Piotr Mitros 2012-01-29 20:55:50 -05:00
  • 768c085334 We can now use Amazon S3 Piotr Mitros 2012-01-29 20:55:11 -05:00
  • daec24d565 We can now use Amazon S3 Piotr Mitros 2012-01-29 20:54:53 -05:00
  • a1a37f700d fixed previous merge fischerl 2012-01-29 17:19:07 -05:00
  • e975d3f2f9 merge fischerl 2012-01-29 17:17:06 -05:00
  • 859afccd27 added handi book indexing url and view fischerl 2012-01-29 17:14:43 -05:00
  • c99bc566ba Forked django-mako into our project. Piotr Mitros 2012-01-29 13:40:52 -05:00
  • 9d4c91e4b4 Merge Piotr Mitros 2012-01-29 13:40:16 -05:00
  • 1e34b21a76 Merge marketing.html Piotr Mitros 2012-01-29 12:48:49 -05:00
  • 7ebc3d0077 Removed unnecessary script references and folded final URLs into marketing pages Piotr Mitros 2012-01-29 11:48:56 -05:00
  • 2a288bc386 Removed unnecessary script references and folded final URLs into marketing pages Piotr Mitros 2012-01-29 11:46:56 -05:00
  • b86ba908da Forked django middleware and moved it into the project. We'd like better django integration Piotr Mitros 2012-01-29 07:46:41 -05:00
  • abef62a23a Syncing between machines Piotr Mitros 2012-01-28 21:27:54 -05:00
  • d85e36cd87 Merge Piotr Mitros 2012-01-28 13:30:43 -05:00
  • 81d7be7e45 Schematic wiki bug fixed Piotr Mitros 2012-01-28 13:29:49 -05:00
  • 8125180edc Major number of minor cleanups. Fixed from e-mail, import order, ==None, etc. Piotr Mitros 2012-01-28 12:10:56 -05:00
  • 849c5d928c Slightly better docs Piotr Mitros 2012-01-27 23:13:15 -05:00
  • 1abeec786e Merge Bridger Maxwell 2012-01-27 23:03:41 -05:00
  • cbd8a96431 Bug in last commit Piotr Mitros 2012-01-27 22:39:56 -05:00
  • 04a7be0ae7 Fixed e-mail in URLs.py, fixed 2 gjs bugs Piotr Mitros 2012-01-27 22:37:34 -05:00
  • 80e2421ee6 Password reset hardcoded to right domain. We should fix later Piotr Mitros 2012-01-27 22:35:10 -05:00
  • 1268530f7a Preparing for stage Piotr Mitros 2012-01-27 22:09:47 -05:00
  • 6c1a7ce66e default to cover of textbook fischerl 2012-01-27 19:16:24 -05:00
  • 84794a230d make sure exceptions that go all the way up the django stack are logged in our error logs when DEBUG=False David Ormsbee 2012-01-27 19:07:46 -05:00
  • 9cd32615e0 Added 'view revision' on wiki history Bridger Maxwell 2012-01-27 17:24:19 -05:00
  • ca44cf07b2 Added 'view revision' on wiki history Bridger Maxwell 2012-01-27 17:24:07 -05:00
  • c3a6ad2f8c Module ids are unique even across module types. Fix bugs where other fields were being used for an id. Bridger Maxwell 2012-01-27 16:12:56 -05:00
  • a58d36bff9 Fixed conflicts Kyle Fiedler 2012-01-27 16:12:11 -05:00
  • 0510e96a2e merge Kyle Fiedler 2012-01-27 16:09:07 -05:00
  • 2676c55ea7 added new index shot, fonts and generated css Kyle Fiedler 2012-01-27 16:08:46 -05:00