Commit Graph

  • 9c452935b5 updated pinning icons and removed images marco 2013-06-14 15:10:17 -04:00
  • 0e0ceb4806 updated flag icons to be font-awesome based marco 2013-06-14 15:04:39 -04:00
  • 925f0a5ee8 Remove @xhr.restore() to fix tests. Peter Fogg 2013-07-17 14:15:50 -04:00
  • ec02a4f39f Studio: changed the copy and prompt type for unit + outline deletions Brian Talbot 2013-07-17 10:16:51 -04:00
  • fb0fcc310b Factor out common code between module editing and course overview. Peter Fogg 2013-07-16 13:44:53 -04:00
  • 75edc65748 Use Backbone notifications for setting graded status. Peter Fogg 2013-07-15 14:54:11 -04:00
  • 5029f460ec Use Backbone notifications for component delete. Peter Fogg 2013-07-15 11:46:29 -04:00
  • 9fe4cb734c Use Backbone notifications for course section delete. Peter Fogg 2013-07-15 13:57:22 -04:00
  • cba9827a91 Merge pull request #443 from edx/tsinghuax/cms-i18n-leftovers Calen Pennington 2013-07-22 08:32:12 -07:00
  • b4008f2e81 Merge pull request #331 from edx/gprice/user-pref-service Greg Price 2013-07-22 08:21:29 -07:00
  • 0ed06504bb Merge pull request #448 from edx/dhm/xml_default Don Mitchell 2013-07-22 08:13:03 -07:00
  • 642b649f76 removed new post icon and added font-awesome replacement marco 2013-06-14 14:42:16 -04:00
  • 6a97ddf53c Add an API to interact with users and preferences Greg Price 2013-07-03 10:04:22 -04:00
  • e2779468e4 new post button using font-awesome marco 2013-06-14 11:44:48 -04:00
  • 90e60c1fb6 cleaned up topic header to allow for multiple line titles still being visible marco 2013-06-13 15:50:21 -04:00
  • 1a267a5067 removed icon stack from email area of helpgrid marco 2013-06-12 16:02:17 -04:00
  • d2fae78824 icon color changes and profile link style to match profile page marco 2013-06-12 15:14:14 -04:00
  • ff9f5714dd sass build cleanup for baseline fixes marco 2013-06-12 14:39:10 -04:00
  • a0f54aaf26 cleaned up margin and padding to use baseline variable marco 2013-06-12 14:37:52 -04:00
  • b55b34ff0c removed border to the right of discussion list marco 2013-06-12 13:49:46 -04:00
  • f674e61f7a basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss marco 2013-06-12 13:47:39 -04:00
  • 6657ac189a cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning marco 2013-06-05 15:17:19 -04:00
  • 1fe54ba005 cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references marco 2013-06-04 15:15:12 -04:00
  • 0812867ab7 added in vendor font references to lms for font-awesome marco 2013-06-04 11:21:07 -04:00
  • 8216bb611d addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown. marco 2013-06-04 11:04:06 -04:00
  • 8886b59684 basic shell for discussion home page with both profile information and email notification settings marco 2013-06-03 17:23:02 -04:00
  • 17f4579f7d blankslate edited, header bar now with home button marco 2013-04-11 23:20:49 -04:00
  • 4a7e793ab2 Studio: revises spacing fix for welcome to edX studio title Brian Talbot 2013-07-22 09:45:08 -04:00
  • dc2631cb5a Studio: adds a space back to the phrase 'Welcome to edX Studio' that went missing Brian Talbot 2013-07-19 16:15:23 -04:00
  • 9a61038c87 Merge pull request #432 from edx/peter-fogg/update-asset-deletion-prompt Peter Fogg 2013-07-22 06:10:15 -07:00
  • 1b6f81b0c2 Merge pull request #408 from edx/cale/make-release-email-script-wiki-friendly Calen Pennington 2013-07-22 05:59:02 -07:00
  • 6c3de222cc Merge pull request #450 from edx/jbau/configure-session Jason Bau 2013-07-21 20:44:15 -07:00
  • 3991711edb Fixes for vagrant up Yarko Tymciurak 2013-07-11 18:59:08 -05:00
  • 18352e9f20 comment tweaks ihoover 2013-07-20 16:20:32 -04:00
  • a4ed24bd4b Merge branch 'master' into ihoover/feature_flag_auto_auth ihoover 2013-07-20 16:15:26 -04:00
  • d7de09442e tweaks ihoover 2013-07-20 16:14:41 -04:00
  • 967ef6ff94 tests added ihoover 2013-07-20 13:01:37 -04:00
  • 9056b096c6 add back removed space Chris Dodge 2013-07-20 11:10:01 -04:00
  • 679b118ed3 Merge pull request #271 from edx/dhm/next-gen-modulestore Calen Pennington 2013-07-20 04:51:11 -07:00
  • 6dab09f5f2 PEP8 and Pylint fixes Calen Pennington 2013-07-20 06:26:38 -04:00
  • 034de2cfd2 Allow session backend to be configurable and also add PLATFORM_NAME Jason Bau 2013-07-19 16:17:57 -07:00
  • efc6a3081d Merge pull request #444 from edx/will/fix-acceptance-tests Will Daly 2013-07-19 14:16:50 -07:00
  • 76a63a6ef0 Disabled test failing due to bug in Studio Will Daly 2013-07-19 17:13:51 -04:00
  • 011ceb8e63 Merge pull request #418 from edx/renzo/in-context-progress Renzo Lucioni 2013-07-19 14:01:40 -07:00
  • 654686293b Set to old xml defaults IFF no specified policy for problem nor course. Don Mitchell 2013-07-19 16:51:48 -04:00
  • 17daa2a023 Fixed two other tests Will Daly 2013-07-19 11:51:36 -04:00
  • 27d51b3453 Attempt to fix video test Will Daly 2013-07-19 10:47:50 -04:00
  • 2dd5338378 Add in progress text Vik Paruchuri 2013-07-19 16:43:01 -04:00
  • ca0cefd260 Move legend, make status elements smaller Vik Paruchuri 2013-07-19 16:26:23 -04:00
  • 9af87e41ba Resolve issues with persistence and sequential bar Renzo Lucioni 2013-07-18 16:52:02 -04:00
  • 1fc4ac864e Add feature showing current score next to problem title Renzo Lucioni 2013-06-06 18:43:46 -04:00
  • 3d669eabe0 fix merge conflicts with master ihoover 2013-07-19 16:03:13 -04:00
  • a47fe07058 Hide legend, move display name Vik Paruchuri 2013-07-19 15:50:28 -04:00
  • e232680210 Move child attributes Vik Paruchuri 2013-07-19 15:15:10 -04:00
  • 73e6e6f443 Merge pull request #394 from edx/fix/foldit-leaderboard Adam 2013-07-19 12:09:37 -07:00
  • 913c601ac1 Move default set_many impl to xblock Don Mitchell 2013-07-19 15:08:24 -04:00
  • 032b02df24 Merge pull request #445 from edx/adam/fix/wiki Adam 2013-07-19 12:02:39 -07:00
  • 549ef5d494 Ensure kvs up-to-date if code accessing it. Don Mitchell 2013-07-19 14:55:49 -04:00
  • 7165acc499 set django-wiki to its most recent version Adam Palay 2013-07-17 09:40:11 -04:00
  • 3509aea2b1 Redo js Vik Paruchuri 2013-07-19 14:21:01 -04:00
  • 22802a4d29 change from_xml class method on video class to make sure we honor the fact that the xml string could actually be a pointer to another file on disk which actually contains the attributes Chris Dodge 2013-07-18 17:01:25 -04:00
  • 77eb35a75f Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui Vik Paruchuri 2013-07-19 13:35:37 -04:00
  • 044a69d63d Merge pull request #52 from edx/nate/simple-chat Joe Blaylock 2013-07-19 10:10:32 -07:00
  • 62afa23a0d Make tests not msec time sensitive Don Mitchell 2013-07-16 16:26:05 -04:00
  • df7b917b40 Implement next generation modulestore Don Mitchell 2013-06-25 11:46:50 -04:00
  • 4a127e51c9 Merge pull request #441 from edx/dhm/course_update_bugs Don Mitchell 2013-07-19 08:56:01 -07:00
  • a2522c492c Merge pull request #160 from edx/fix/vik/studio-oe Vik Paruchuri 2013-07-19 08:44:16 -07:00
  • 2a3dd7323f CMS i18n changes from Tsinghua Calen Pennington 2013-07-18 09:43:46 -04:00
  • 66ca7d750e Merge pull request #411 from edx/ned/studentmodulehistory-cleaner-command Ned Batchelder 2013-07-19 08:33:37 -07:00
  • 541c98a3af POST requests were claiming request.method == 'PUT' Don Mitchell 2013-07-19 11:14:01 -04:00
  • 63c3bb0812 Reproduce POST showing up as PUT error Don Mitchell 2013-07-19 11:12:23 -04:00
  • a04539af5d change models to filter by course Adam Palay 2013-07-12 15:03:47 -04:00
  • e3602941ee Merge pull request #440 from edx/dhm/adaptive_template Don Mitchell 2013-07-19 07:57:29 -07:00
  • 0e58f3ac57 Merge pull request #439 from edx/alex/fix_code_jail_imports_and_draganddrop_yaml Alexander Kryklia 2013-07-19 07:50:26 -07:00
  • 37dc27cec4 Merge pull request #438 from edx/fix/cdodge/missing-space-on-landing-page chrisndodge 2013-07-19 07:43:10 -07:00
  • d78af5cf51 Merge pull request #294 from edx/feature/cdodge/add-dump-course-structure chrisndodge 2013-07-19 07:04:41 -07:00
  • eee1d6f593 Bug report: remove <?xml version..> tag Don Mitchell 2013-07-19 09:15:29 -04:00
  • 63b2b47106 update to render home page Kevin Chugh 2013-07-19 07:33:50 -04:00
  • 67f6d6c4d1 Fixes code_jail imports and draganddrop yaml Alexander Kryklia 2013-07-19 12:05:17 +03:00
  • 95302b02a8 I18N work seems to have a very prominent space in the landing page Chris Dodge 2013-07-18 21:12:49 -04:00
  • 50c906732f Chat rebase, test update Joe Blaylock 2013-07-17 12:28:58 -07:00
  • 293bd30a59 Use chat settings when deciding whether to render Nate Hardison 2013-05-30 18:56:00 -07:00
  • 3aec9fdb77 Add setting to enable/disable chat site-wide Nate Hardison 2013-05-30 18:54:39 -07:00
  • f4ae0e0cae Test generation of chat settings Nate Hardison 2013-05-21 16:33:30 -07:00
  • c53a550f3b Remove additional jQuery include Nate Hardison 2013-05-21 16:32:40 -07:00
  • a0ab47658a Move Candy.js files to new vendor/ directory Nate Hardison 2013-05-21 11:07:16 -07:00
  • bf8e5e6ba1 Simple port of Class2Go's chat feature Nate Hardison 2013-05-17 15:52:09 -07:00
  • 24564223cc Merge pull request #435 from edx/ned/allow-tempfiles-in-sandbox Ned Batchelder 2013-07-18 14:26:44 -07:00
  • 89c48f4a30 Use CodeJail with FSIZE support, and default to 50k Ned Batchelder 2013-07-18 08:49:05 -04:00
  • a478fa9ff7 Change error class Vik Paruchuri 2013-07-18 16:56:38 -04:00
  • 921e78b8ae Merge pull request #421 from edx/dhm/template_acceptance Don Mitchell 2013-07-18 13:49:55 -07:00
  • 0aa9c6c1ae json field value conversion test Don Mitchell 2013-07-17 15:38:44 -04:00
  • badf86f71b Have save_item parse json formatted field values by type Don Mitchell 2013-07-17 15:05:19 -04:00
  • 025a95885a Generate TypeError if from or to_json fail. Don Mitchell 2013-07-17 15:02:53 -04:00
  • 7615a0638b Merge pull request #310 from robertjmarks/master Sarina Canelake 2013-07-18 13:44:00 -07:00
  • e84a41b4b5 Merge pull request #416 from edx/sarina/xblock-bulk-save-interface Sarina Canelake 2013-07-18 13:39:44 -07:00
  • 3f9431e8cf Provide implicit saves for XBlocks and XModules. Diana Huang 2013-07-03 14:38:22 -04:00
  • 2a4976cf8a Cleanup how peer grading handles due date Vik Paruchuri 2013-07-18 15:36:42 -04:00
  • f0c9aa3916 Provide set_many methods for Lms and Mongo KeyValueStores Sarina Canelake 2013-07-01 12:27:11 -04:00
  • 0b991f9bbd Fix reset and score tests Vik Paruchuri 2013-07-18 15:19:13 -04:00