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

Commit Graph

  • 7d3d34c69e Remove tags for comment client request time histogram in Datadog Greg Price 2013-05-22 13:08:07 -04:00
  • 6be9463eca Cleanup. cahrens 2013-05-27 21:50:56 -04:00
  • a195c4f55f Continue merge. cahrens 2013-05-27 20:36:10 -04:00
  • 851ed6722a Continue merge. cahrens 2013-05-27 20:28:56 -04:00
  • 34082efad5 Merge branch 'master' into feature/christina/metadata-ui cahrens 2013-05-27 20:08:19 -04:00
  • 17c710af83 Merge branch 'master' into feature/christina/metadata-ui cahrens 2013-05-27 20:08:09 -04:00
  • 599a215ad0 Move includes to right place. cahrens 2013-05-27 19:36:02 -04:00
  • 256a367748 Merge pull request #2085 from edx/feature/vik/oe-editor VikParuchuri 2013-05-24 13:56:26 -07:00
  • b1b93e71d7 Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor Vik Paruchuri 2013-05-24 16:52:14 -04:00
  • e17276ade8 Fix some pep8 stuff Vik Paruchuri 2013-05-24 16:43:29 -04:00
  • cef401f246 Swap icon to icon-table Vik Paruchuri 2013-05-24 16:20:59 -04:00
  • 87d904cb35 Merge branch 'master' into feature/christina/metadata-ui cahrens 2013-05-24 16:10:34 -04:00
  • 519ddc02f9 Merge pull request #2117 from edx/fix/will/testing-docs Will Daly 2013-05-24 13:02:59 -07:00
  • 9cbb4e090d Swap icons for font awesome Vik Paruchuri 2013-05-24 14:40:33 -04:00
  • 5050eab74a Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor Vik Paruchuri 2013-05-24 14:26:33 -04:00
  • a64476f39a Removed obsolete troubleshooting tip. Will Daly 2013-05-24 11:08:52 -04:00
  • d2880586a3 Merge pull request #2118 from edx/fix/frances/studio-iconcleanup frances botsford 2013-05-24 07:31:15 -07:00
  • c0aef206ae Merge branch 'style/btalbot/metadata-ui' into feature/christina/metadata-ui marco 2013-05-24 09:49:57 -04:00
  • 27c6816bac Merge pull request #2113 from edx/fix/cdodge/few-xml-serialize-fixes chrisndodge 2013-05-24 06:26:23 -07:00
  • dfb623a29f removed old icon css and js files and references that are no longer needed Frances Botsford 2013-05-24 09:01:15 -04:00
  • 8b76afb938 converted undo image in component settings list to FontAwesome Frances Botsford 2013-05-24 08:51:14 -04:00
  • 587ac0ecf0 Removed is_graded attribute. In HTML yaml it is not used, and that is not graded. Valera Rozuvan 2013-05-23 13:24:06 +03:00
  • 1e8c4e9edf Rebase + updated videoalpha template. Now no data_dir attribute and is_graded set to false. Valera Rozuvan 2013-05-23 11:59:12 +03:00
  • aaeb3a862d Added Python tests for start_time and end_time parameters. Valera Rozuvan 2013-05-17 12:48:34 +03:00
  • 56f60e06e4 changed 'from' and 'to' to 'start_time' and 'end_time' Lyla Fischer 2013-05-13 08:14:54 -04:00
  • d68162f9fa removed from and to labels Lyla Fischer 2013-05-09 09:08:22 -04:00
  • c238f76fe8 different default section Lyla Fischer 2013-04-29 13:01:38 -04:00
  • 53f80d3991 standard video introduction Lyla Fischer 2013-04-29 12:08:31 -04:00
  • 6794b73d99 Added videoalpha version 1 to the advanced components in studio. Valera Rozuvan 2013-03-21 16:28:39 +02:00
  • bfaadd47ab Updated testing documentation to reflect changes to how requirements are installed. Will Daly 2013-05-23 22:30:09 -04:00
  • 2793bb4337 Add few more tests; fix a small bug with parallel resistors Peter Baratta 2013-05-23 17:23:17 -04:00
  • 2486f7c271 Fixed docstrings and other comments from PR review Peter Baratta 2013-05-23 17:29:14 -04:00
  • 138ad3988f Update test (and set PREVIEW_LMS_BASE to something different so we can actually test the method). cahrens 2013-05-23 17:06:02 -04:00
  • a03a4fdd07 PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). Make this work locally as well. https://edx.lighthouseapp.com/projects/102637/tickets/331 cahrens 2013-05-23 16:45:10 -04:00
  • 522b76e847 PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). https://edx.lighthouseapp.com/projects/102637/tickets/331 cahrens 2013-05-23 16:27:05 -04:00
  • ebc991cce6 Merge pull request #2094 from edx/ned/make-numpy-and-scipy-both-install Ned Batchelder 2013-05-23 12:03:07 -07:00
  • b6090952da randomize_module.py was missing 'import lxml' to support definition_to_xml(). Also, fix serialization of show_timezone to expect a bool Chris Dodge 2013-05-23 14:24:36 -04:00
  • 94300608a0 Merge pull request #2112 from edx/feature/giulio/variablize-colors caesar2164 2013-05-23 11:21:23 -07:00
  • 69beea854c Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports Calen Pennington 2013-05-23 11:06:34 -07:00
  • 538ffe6fbe fixing video-bg-image and homepage-bg-image urls Giulio Gratta 2013-05-23 11:04:24 -07:00
  • 1371c8d0da revises alignment of advanced editor and cheatsheet toggle Brian Talbot 2013-05-23 13:17:29 -04:00
  • 7940ca54ad studio - adjusts visual vertical spacing of save/cancel actions in modal editing windows on unit and page edits. Brian Talbot 2013-05-23 12:58:24 -04:00
  • 007a4e534f Merge pull request #2110 from edx/fix/db/lettuce-tests David Baumgold 2013-05-23 09:55:56 -07:00
  • cf1e906c13 Fix lettuce tests David Baumgold 2013-05-23 12:50:19 -04:00
  • ba93f45341 Merge pull request #2050 from edx/feature/giulio/variablize-colors caesar2164 2013-05-23 09:47:04 -07:00
  • 566a8b3823 fix bad css and clean up after rebase/merge Giulio Gratta 2013-05-22 10:30:25 -07:00
  • 93258c548f fixed hardcoded changes left over from parent theme branch backport Giulio Gratta 2013-05-16 18:14:22 -05:00
  • 3dd5733cee first round of color replacements with variables Giulio Gratta 2013-05-15 18:21:39 -05:00
  • a16cb4b134 resolved confict based on change branching later than the live hotfix branch e0d 2013-05-23 12:35:36 -04:00
  • 1a8a721998 Will not do unrelated test at this time. cahrens 2013-05-23 12:31:20 -04:00
  • a8084628e1 Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master chrisndodge 2013-05-23 09:27:36 -07:00
  • 257dae634b Merge pull request #2090 from edx/fix/cale/amazon-ses-errors Calen Pennington 2013-05-23 09:17:51 -07:00
  • 9e542aa548 Merge pull request #2109 from edx/ned/hotfix-disable-codejail-memory-limit Ned Batchelder 2013-05-23 09:13:29 -07:00
  • 082e24c634 Removed references to server_error.js David Baumgold 2013-05-23 12:09:12 -04:00
  • 1224204b4c Use the latest CodeJail, with 0 default for memory limit. Ned Batchelder 2013-05-23 12:03:02 -04:00
  • 48703af234 Merge. cahrens 2013-05-23 11:41:26 -04:00
  • c95b44d851 Merge branch 'master' into feature/christina/metadata-ui cahrens 2013-05-23 11:41:12 -04:00
  • c8d6d5d283 Selenium tests. cahrens 2013-05-23 11:34:02 -04:00
  • 1de8c4d321 Merge branch 'master' into pbaratta/calc-tests Peter Baratta 2013-05-23 11:11:08 -04:00
  • 70898a06da Pep8 fix Peter Baratta 2013-05-23 11:09:23 -04:00
  • a4ad495bef Merge pull request #2084 from edx/fix/will/lettuce-browser-size Will Daly 2013-05-23 08:00:48 -07:00
  • a15a283674 Merge pull request #2087 from edx/backbone-notifications-font-awesome David Baumgold 2013-05-23 07:31:43 -07:00
  • f521b8e8c0 Handle errors while sending emails around changing user data Calen Pennington 2013-05-20 14:48:48 -04:00
  • e6a1a9faaf Merge branch 'master' into feature/cdodge/autoprovision-forums-master Jay Zoldak 2013-05-23 10:19:39 -04:00
  • db261dc1c3 Add docstrings; test divsion by zero at Response level Peter Baratta 2013-05-21 15:20:51 -04:00
  • c26edbd631 jasmine-jquery compatiblity post-backport David Baumgold 2013-05-23 10:14:47 -04:00
  • af8b509e2d Merge pull request #2106 from edx/fix/nate/application-mako-crash Jay Zoldak 2013-05-23 06:31:51 -07:00
  • daa0ac2f01 Capture Mako exit code and fail fast if necessary Nate Hardison 2013-05-22 19:42:22 -07:00
  • f826198214 Use "is not None" convention Nate Hardison 2013-05-22 19:34:14 -07:00
  • b2b6ca5f7b Record junit reports of jasmine tests Calen Pennington 2013-05-15 13:10:52 -04:00
  • 293d0a8645 special case the db setup for the cms acceptance tests. We need the comment client database tables to be created since we're creating the DB from scratch Chris Dodge 2013-05-22 21:58:29 -04:00
  • 7ef6132194 Make factories return unicode data Calen Pennington 2013-05-22 21:34:07 -04:00
  • a282153337 Cleaned up whitespace in docs Calen Pennington 2013-05-22 21:38:03 -04:00
  • dcefd9e991 Taught rake test_lms and test_cms to run specific tests by passing a single argument Calen Pennington 2013-05-20 14:47:44 -04:00
  • 2add58bb5a Create sequences for names, emails, and usernames in UserFactory Calen Pennington 2013-05-20 14:37:26 -04:00
  • 3fceb46953 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master Chris Dodge 2013-05-22 20:44:22 -04:00
  • a0b6a176f2 Use .get instead of [] to access env hash Nate Hardison 2013-05-22 14:49:22 -07:00
  • 350c5460af Revert "Update jasmine-jquery to 1.5.1" David Baumgold 2013-05-22 17:29:52 -04:00
  • 4a92949218 scipy can go back into base. MySQL-python really does have to be installed after distribute has been updated by base.txt, I tested it. Ned Batchelder 2013-05-22 17:05:41 -04:00
  • 39663ce947 Add in newlines at end of files Vik Paruchuri 2013-05-22 17:01:49 -04:00
  • 4736527952 Add Jasmine tests to cover AJAX error notifications David Baumgold 2013-05-22 15:45:04 -04:00
  • be8daf7468 /event was returning invalid JSON: fix it David Baumgold 2013-05-22 15:11:17 -04:00
  • 0a7222b123 Allow an AJAX call to specify that it should not notify on error David Baumgold 2013-05-22 15:04:30 -04:00
  • 2359c43855 studio - revises z-index/element depth levels for modals, notifications, prompts, and alerts to use universal .depth Sass extends Brian Talbot 2013-05-21 14:06:50 -04:00
  • 3738078ce9 Load system feedback template for SectionEdit tests David Baumgold 2013-05-21 13:29:00 -04:00
  • a5cc3a9ff9 Revert "Load *.js files more generically for Jasmine tests" David Baumgold 2013-05-21 13:18:41 -04:00
  • bc6e480103 studio - corrects some errand new icon-based typography rules to use the line-height() mixin Brian Talbot 2013-05-21 13:24:21 -04:00
  • 3cfadb8ae8 Migrated internationalization text into template for section name David Baumgold 2013-05-21 11:29:41 -04:00
  • fa330784d3 removed symbolset, replaced with fontawesome for gradable status; added transform-origin for saving notification animation to remove wobble Frances Botsford 2013-05-20 11:58:53 -04:00
  • dc2acb18ee Moved global AJAX Error handler definition to main.coffee David Baumgold 2013-05-20 10:23:58 -04:00
  • f3523d805f Escape section name in Backbone to prevent XSS David Baumgold 2013-05-20 10:17:29 -04:00
  • bb0460cc0d studio - changes all specific ss-icon-based selectors to use Font Awesome/generic icon- class name in notifications/prompts/alerts Sass Brian Talbot 2013-05-16 15:55:34 -04:00
  • 4e79d064a0 removed symbolset, replaced with fontawesome for alerts, notifications, and all references in js files Frances Botsford 2013-05-16 13:22:49 -04:00
  • 9a61663dce Restore HTML escaping in Mako template David Baumgold 2013-05-17 14:57:29 -04:00
  • 9e864834bd Unify system feedback templates David Baumgold 2013-05-17 14:41:56 -04:00
  • 1e7e38824a Shorten secondary action detection code David Baumgold 2013-05-17 14:08:17 -04:00
  • 5a06c69289 Add toBeShown and toBeHiding matchers for Jasmine David Baumgold 2013-05-17 13:54:23 -04:00
  • af51d6483a Load *.js files more generically for Jasmine tests David Baumgold 2013-05-17 13:38:38 -04:00
  • 0052eaacbc Backbone section: don't save name on validation error David Baumgold 2013-05-17 13:24:36 -04:00
  • 55cd8afe34 Fixing copy for default server error message on notification David Baumgold 2013-05-16 16:38:06 -04:00