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

Commit Graph

  • c407012f2d Merge pull request #1168 from MITx/bug/dhm/dec12 chrisndodge 2012-12-17 10:17:23 -08:00
  • 288e1ec9c2 Merge pull request #1169 from MITx/fix/cdodge/course-id-on-mongo-system chrisndodge 2012-12-17 10:00:04 -08:00
  • 02b0f011a5 pin requests to a known version, as we believe there's been an upgrade which is incompatible to our usage Chris Dodge 2012-12-17 12:58:34 -05:00
  • c546c36858 Merge pull request #1147 from MITx/fix/zoldak/cms-jasmine Calen Pennington 2012-12-17 09:39:43 -08:00
  • e2526a37d3 Import default grading_policy was setting it to a unicode empty string rather than an empty dict and thus screwing up later updates. Don Mitchell 2012-12-17 11:50:40 -05:00
  • c74be27a91 Merge pull request #1167 from MITx/fix/cdodge/course-id-on-mongo-system chrisndodge 2012-12-17 07:50:06 -08:00
  • d18f42224c fix crash of custom tags when running against Mongo datastores. Mongo's 'system' does not have a course_id attribute defined, which makes it asymmetric to XmlFilesystem store Chris Dodge 2012-12-17 10:41:54 -05:00
  • 39d292a058 Merge pull request #1166 from MITx/bug/dhm/dec12 chrisndodge 2012-12-15 14:03:58 -08:00
  • 7223c8ce13 Found cut/paste error which was causing intermittent bug due to overloaded template name. Don Mitchell 2012-12-15 16:36:23 -05:00
  • 521fa938b3 Fixed course info bug (and simplified parsing). Incidentally fixed 2 other course info bugs (not editing/deleting right element if > 10, putting new elements at end rather than beginning of list). Made Location more robust against parsing errors. Don Mitchell 2012-12-15 15:56:51 -05:00
  • f5d07b1521 just tickle a file to for build cms-master. I dont seem to have the rights to force a jenkins build. Chris Dodge 2012-12-15 15:15:45 -05:00
  • 368abbe669 Merge pull request #1165 from MITx/bug/btalbot/pullrequest1160-untangling chrisndodge 2012-12-15 11:50:07 -08:00
  • 2ee488733c cms pull request 1160 - brought back all css changes lost in this request - mostly overview related Brian Talbot 2012-12-15 00:25:29 -05:00
  • 2a353068ab Merge pull request #1163 from MITx/feature/christina/misc Don Mitchell 2012-12-14 14:29:53 -08:00
  • e40b0d0d08 Fixed data order when loading json record from request. JM Van Thong 2012-12-14 17:16:57 -05:00
  • e57b5b1431 Merge pull request #1160 from MITx/feature/btalbot/cms-gradable Christina Roberts 2012-12-14 14:09:28 -08:00
  • ac7b0334a6 Code review changes. Don Mitchell 2012-12-14 16:51:40 -05:00
  • dbd9ac6e59 Merge pull request #1162 from MITx/fix/cdodge/security-holes Christina Roberts 2012-12-14 13:37:12 -08:00
  • 9d2062875f Merge pull request #1161 from MITx/bug/btalbot/cms-pagestext chrisndodge 2012-12-14 13:29:07 -08:00
  • e3b302f5fe Merge branch 'feature/cale/cms-master' into feature/christina/misc cahrens 2012-12-14 16:28:50 -05:00
  • ab9b208605 add some permissions asserting Chris Dodge 2012-12-14 16:26:15 -05:00
  • 808cf8c692 Some JavaScript cleanup (also addresses Studio #60). cahrens 2012-12-14 16:24:01 -05:00
  • f3067cd8c8 restyling of dashboard with pearson exam notifications Tom Giannattasio 2012-12-14 16:17:03 -05:00
  • 7d1a08d481 pages - made intro text visible again and styled it some Brian Talbot 2012-12-14 16:15:01 -05:00
  • 795b38f0fb Merge pull request #1159 from MITx/bug/btalbot/cms-tooltips chrisndodge 2012-12-14 12:22:01 -08:00
  • 0b762fa35f Remove ability to set gradability at the section level (commented out until we decide the inheritance) Remove Policy from subsection editor Commented out Graded as: _____ from subsection settings Fix menu dismissa Fix ambiguous selection Don Mitchell 2012-12-14 15:19:14 -05:00
  • e4f4f32c1b tooltips - removed duplicate/incorrect tooltip_manager.js reference in base.html and added tooltips to unit actions Brian Talbot 2012-12-14 15:18:45 -05:00
  • 0fc16dffee Gradable impl'd for overview page Don Mitchell 2012-12-14 12:29:57 -05:00
  • fbffe13d53 Merge pull request #1157 from MITx/bug/btalbot/cms-editingui chrisndodge 2012-12-14 09:02:27 -08:00
  • ea38482946 Merge pull request #1156 from MITx/feature/christina/misc chrisndodge 2012-12-14 09:00:38 -08:00
  • 4e152952af cms settings - revised course overview textarea to display as codemirror field on page load Brian Talbot 2012-12-14 11:57:46 -05:00
  • cd6946088e Merge branch 'feature/cale/cms-master' into feature/christina/misc cahrens 2012-12-14 11:50:56 -05:00
  • dd7ed956dd Bug fix for Studio #55. cahrens 2012-12-14 11:37:45 -05:00
  • 91713cbe18 editing UI - added in preventDefault() to all editing actions on course info Brian Talbot 2012-12-14 11:14:09 -05:00
  • c7feaa1373 editing - revised unit editor styling Brian Talbot 2012-12-14 10:54:44 -05:00
  • a725bae313 Merge pull request #1155 from MITx/style/btalbot/university-logos-gtown Carlos Andrés Rocha 2012-12-14 07:04:38 -08:00
  • fef3fd871e Merge pull request #1154 from MITx/feature/dhm/cms-settings Christina Roberts 2012-12-14 06:58:43 -08:00
  • 4602a9d654 universities - revised Georgetown University seal/logo for homepage/university page use Brian Talbot 2012-12-14 09:52:00 -05:00
  • b9d9c7b8c0 Fixed infinite loop in the 2nd video string parser which I'd fixed in the first yesterday. Fixed formatting of compounded video string errors. Don Mitchell 2012-12-14 09:48:04 -05:00
  • 1eacd5e346 Fix infinite loop in videosourceSample. Had fixed same one in parse_videosource but neglected to fix this one. Don Mitchell 2012-12-14 09:45:25 -05:00
  • d965221ec7 Merge pull request #1135 from MITx/bug/btalbot/cms-tooltips chrisndodge 2012-12-14 06:26:48 -08:00
  • 6c64032fcf Overview should be ready to test. Don Mitchell 2012-12-14 09:22:54 -05:00
  • 7dd2f48efc Merge pull request #1127 from MITx/bugfix/kevin/mathjax-rendering David Ormsbee 2012-12-14 05:07:24 -08:00
  • f87e5cefab Merge pull request #1152 from MITx/feature/dhm/cms-settings chrisndodge 2012-12-13 17:20:56 -08:00
  • 909ab2b5f6 Merge pull request #1146 from MITx/content/rocha/job-page-update Carlos Andrés Rocha 2012-12-13 14:42:38 -08:00
  • e2918c2dbd Don't save null about items to db as it chokes lms. Don Mitchell 2012-12-13 17:23:40 -05:00
  • e0849e8b5a Cache to debug other branch Don Mitchell 2012-12-13 16:34:58 -05:00
  • bb3b7cb3a9 add back the course info tab in the CMS Chris Dodge 2012-12-13 16:28:47 -05:00
  • 5709ee014b Merge pull request #1150 from MITx/bug/btalbot/cms-placeholdit chrisndodge 2012-12-13 12:50:33 -08:00
  • fb47f30918 bug - removed placeholdit image references in template HTML Brian Talbot 2012-12-13 15:48:39 -05:00
  • 094856e229 Merge pull request #1149 from MITx/style/studio/tom/ui-cleanups chrisndodge 2012-12-13 12:41:10 -08:00
  • 97ab513a10 Merge pull request #1130 from MITx/feature/cale/fix-discussion-breakage David Ormsbee 2012-12-13 12:20:57 -08:00
  • 85f198e36a Merge pull request #1148 from MITx/fix/rocha/divide-create-dev-env-script David Ormsbee 2012-12-13 12:17:32 -08:00
  • 59f1b1d1f5 styling - re-aligned unit controls for unit editing and styled standard delete button Brian Talbot 2012-12-13 15:15:30 -05:00
  • 3025a88d73 Extract installation of system dependencies from create dev script Carlos Andrés Rocha 2012-12-13 13:26:12 -05:00
  • 15942aae05 styling - re-aligned unit edit controls and added visual divider Brian Talbot 2012-12-13 15:02:38 -05:00
  • 8fdf7f6cfd Merge pull request #1138 from MITx/bug/tom/pearson-ie7 David Ormsbee 2012-12-13 11:31:26 -08:00
  • ede96d777d Add member services job descriptions Carlos Andrés Rocha 2012-12-13 14:27:04 -05:00
  • c485e441a9 Do not copy already compiled coffee to js files from xmodule video and also do not save them in git Jay Zoldak 2012-12-13 14:26:12 -05:00
  • 2524992965 styling - settings UI tweaks Brian Talbot 2012-12-13 14:24:09 -05:00
  • 090e83b709 styling - resolved FF top whitespace bug Brian Talbot 2012-12-13 14:16:51 -05:00
  • c182b8ef08 Merge pull request #1145 from MITx/feature/dhm/cms-settings Christina Roberts 2012-12-13 11:12:04 -08:00
  • f33efe3dde settings - debugged height issue with new/manipulated grade bars and moved solution back to CSS layer Brian Talbot 2012-12-13 13:45:57 -05:00
  • 34441759dd settings - added in preventDefault() for all grading controls that needed it Brian Talbot 2012-12-13 13:44:03 -05:00
  • 62f544479c Merge pull request #1143 from MITx/feature/christina/misc Don Mitchell 2012-12-13 10:42:18 -08:00
  • e77a67a93a Protect against graceperiodjson being null. r.don cahrens 2012-12-13 13:36:37 -05:00
  • 6b17659195 styling - settings layout and delete buttons Brian Talbot 2012-12-13 13:35:58 -05:00
  • 3b784f2145 styling - setting form field layout Brian Talbot 2012-12-13 13:21:43 -05:00
  • 69c26a08e3 settings/style - general UI clean up - wip Brian Talbot 2012-12-13 13:06:56 -05:00
  • 9cc1b348fa Merge branch 'feature/dhm/cms-settings' of github.com:MITx/mitx into feature/dhm/cms-settings Don Mitchell 2012-12-13 13:02:03 -05:00
  • 9b9bdb44a3 Fix video string parse for empty and completely malformed strings Don Mitchell 2012-12-13 12:58:59 -05:00
  • a39d609eea more Don Mitchell 2012-12-13 12:35:17 -05:00
  • 595edac4c2 Caching changes to fix critical bug on other branch Don Mitchell 2012-12-13 12:33:22 -05:00
  • 10b417c85e initial checkin of export Chris Dodge 2012-12-13 11:53:52 -05:00
  • 7d823d9ed9 resolving styling merge conflicts Brian Talbot 2012-12-13 11:43:48 -05:00
  • 9f863fd96e styling - adjusting collapse button CSS lost in cms-master rebase Brian Talbot 2012-12-13 11:37:51 -05:00
  • aee4fd912c Merge pull request #1142 from MITx/feature/dhm/cms-settings chrisndodge 2012-12-13 08:30:58 -08:00
  • 4ebc9a589d fix up some test failures Chris Dodge 2012-12-13 11:29:00 -05:00
  • 2be1f852e7 clean up of users page Tom Giannattasio 2012-12-07 15:37:22 -05:00
  • 75c4909785 added modal cover for editors Tom Giannattasio 2012-12-07 14:31:48 -05:00
  • d7b3f28d17 reworked add component steps Tom Giannattasio 2012-12-07 09:35:34 -05:00
  • 66004aeb2d pulled out component types from behind add component button Tom Giannattasio 2012-12-06 17:00:16 -05:00
  • 5b81d6b8cc cleaned up subsection and unit page Tom Giannattasio 2012-12-06 16:34:13 -05:00
  • 052b6f695a cleaned up editor styles; cleaned up static tabs page Tom Giannattasio 2012-12-06 14:25:30 -05:00
  • 39a882e278 more defined header, new icons, cleaner static tabs page Tom Giannattasio 2012-12-05 17:01:29 -05:00
  • 95dfc730dc new header styles; collapse all button added to courseware Tom Giannattasio 2012-12-05 12:05:14 -05:00
  • 8294b05802 style tweaks to tabs and static pages; key bindings for new user form Tom Giannattasio 2012-12-04 14:54:02 -05:00
  • 197ea33235 tweaked body color and window styles; adjusting new buttons Tom Giannattasio 2012-12-04 13:49:07 -05:00
  • 74ce3d225f removed new course button on click to prevent multiple instantiations Tom Giannattasio 2012-12-04 11:00:28 -05:00
  • 131f475156 headers still funky, absolutely positioned to avoid bugs for now; removed public tag and grey style Tom Giannattasio 2012-12-03 16:29:27 -05:00
  • 128a402b7f fixed long header bug Tom Giannattasio 2012-12-03 16:15:00 -05:00
  • 909fd93c80 Merge branch 'feature/btalbot/cms-gradable' of github.com:MITx/mitx into feature/btalbot/cms-gradable Don Mitchell 2012-12-13 10:40:49 -05:00
  • 6ab97b6fd9 Merge pull request #1125 from MITx/feature/dhm/cms-settings chrisndodge 2012-12-13 06:52:49 -08:00
  • 41ca47edfc Add flag to turn template caching on/off (default to off) Don Mitchell 2012-12-13 09:47:51 -05:00
  • 57385b8d3f grading - resolved rebase/merge conflicts Brian Talbot 2012-12-13 09:45:11 -05:00
  • 113c99e0b1 Merge pull request #1141 from MITx/feature/christina/misc Christina Roberts 2012-12-13 06:28:27 -08:00
  • c4e86140c1 Try running xmodule Jasmine tests on Jenkins (again!). Christina Roberts 2012-12-13 09:26:46 -05:00
  • 3421331f17 up the template caching version number to avoid stale caches since there's been a change to the underscore templates Chris Dodge 2012-12-13 09:25:13 -05:00
  • fc8281d517 up the template caching version number to avoid stale caches since there's been a change to the underscore templates Chris Dodge 2012-12-13 09:22:01 -05:00
  • aa2d376b88 Merge pull request #1140 from MITx/fix/cdodge/remove-xmodule-jasmine-tests chrisndodge 2012-12-12 18:15:19 -08:00