Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 236d37b276 EDITOR_ROLE_NAME -> STAFF_ROLE_NAME Chris Dodge 2012-10-18 10:00:08 -04:00
• c112e5077e Merge pull request #930 from MITx/bug/lyla/templates chrisndodge 2012-10-17 18:14:48 -07:00
• 2adf614267 Merge pull request #933 from MITx/fix/cdodge/disable-view-live-no-public-units chrisndodge 2012-10-17 13:18:37 -07:00
• 1a6845b07f optimize slightly, allow caller to pass in the list of units in a subsection, so we don't have to refetch Chris Dodge 2012-10-17 16:17:52 -04:00
• a88bb7caf3 hide 'View Live' button if no units have been published Chris Dodge 2012-10-17 16:08:16 -04:00
• 5013ee3441 Merge pull request #931 from MITx/feature/cas/tomg/embed-links chrisndodge 2012-10-17 12:34:03 -07:00
• 24faac4f9d Merge pull request #929 from MITx/feature/cas/tomg/bigger-sign-up chrisndodge 2012-10-17 12:33:17 -07:00
• 64caf51423 Merge pull request #932 from MITx/feature/cdodge/edit-section-info chrisndodge 2012-10-17 12:32:20 -07:00
• 6047aae9fb get basics of set section date time. Need to pass to Tom for some styling considerations Chris Dodge 2012-10-17 15:28:34 -04:00
• 005cf66e2e removed box shadow on embed xmls Tom Giannattasio 2012-10-17 15:20:03 -04:00
• a91a19e7a8 adjustments for newly inserted assets Tom Giannattasio 2012-10-17 15:12:50 -04:00
• e9b42d7a15 added embeddable xml input text to modal Tom Giannattasio 2012-10-17 15:07:34 -04:00
• edacd22c16 added xml embed text field to table Tom Giannattasio 2012-10-17 14:40:37 -04:00
• 374413a012 Merge branch 'cas' into bug/lyla/templates Lyla Fischer 2012-10-17 14:32:37 -04:00
• 094382d588 added solutions and basic metadata to templates Lyla Fischer 2012-10-17 14:28:47 -04:00
• b0e62b08fa added solutions and basic metadata to templates Lyla Fischer 2012-10-17 14:28:47 -04:00
• 2fd86bd783 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/edit-section-info Chris Dodge 2012-10-17 13:49:16 -04:00
• 6011d6d333 Merge pull request #928 from MITx/fix/cdodge/asset-upload-tweeks chrisndodge 2012-10-17 10:47:47 -07:00
• 82e77a26c6 add mustache.js to common static repo Chris Dodge 2012-10-17 13:47:07 -04:00
• 60cf22e4b2 work in progress: set start date Chris Dodge 2012-10-17 13:46:40 -04:00
• 4772bf68d6 transition added to log in button Tom Giannattasio 2012-10-17 12:55:53 -04:00
• a961ac9331 more prominent log in link on sign up form Tom Giannattasio 2012-10-17 12:51:48 -04:00
• fed5a12b92 reworked log in page to emphasize sign up Tom Giannattasio 2012-10-17 12:45:45 -04:00
• 90861c22d0 improvements on asset upload refresh. Now we don't need to refresh the whole page, just insert the table tow Chris Dodge 2012-10-17 12:26:56 -04:00
• b76556b932 Merge pull request #926 from MITx/fix/cdodge/asset-upload-tweeks chrisndodge 2012-10-17 07:35:23 -07:00
• 5964ecc70c remove work in progress regarding convert datetime to localtime Chris Dodge 2012-10-17 10:34:23 -04:00
• 170694e580 fix/cdodge/asset-upload-tweeks Chris Dodge 2012-10-17 10:31:18 -04:00
• b91f1886b1 Merge pull request #924 from MITx/fix/cdodge/manage-users chrisndodge 2012-10-16 13:20:16 -07:00
• 908a25d243 Merge pull request #925 from MITx/feature/cdodge/forgot-password chrisndodge 2012-10-16 13:19:47 -07:00
• 554f179957 tie in 'forgot password' workflow in CAS LMS Chris Dodge 2012-10-16 16:18:21 -04:00
• ed2febe44e fix 403 error when editors visit page (make read only). Don't allow user to remove him/herself. Rewire up the remove user callback. Chris Dodge 2012-10-16 13:17:41 -04:00
• 4cadbcc556 Merge pull request #920 from MITx/feature/rocha/ut-press-release Carlos Andrés Rocha 2012-10-16 10:03:05 -07:00
• b479c85310 Change order of X Universities in the front page Carlos Andrés Rocha 2012-10-16 13:02:13 -04:00
• 02a960e44c Merge pull request #923 from MITx/feature/rocha/dashboard-software-licenses Carlos Andrés Rocha 2012-10-16 09:05:23 -07:00
• e7c62b0fc6 Add migrations to license django application Carlos Andrés Rocha 2012-10-16 11:57:38 -04:00
• f8f2e63ed4 Merge pull request #922 from MITx/feature/rocha/dashboard-software-licenses Victor Shnayder 2012-10-16 08:38:05 -07:00
• 0b83366041 Merge pull request #896 from MITx/feature/ichuang/cms-input-filter-latex2edx chrisndodge 2012-10-16 06:44:55 -07:00
• ca7476223a Merge pull request #921 from MITx/kimth/fix-cr-show-answer arjun810 2012-10-15 21:50:27 -07:00
• a8cedf8ab9 Update lms/djangoapps/licenses/views.py Carlos Andrés Rocha 2012-10-15 21:04:10 -03:00
• e9ec63e4b6 Add ajax endpoint to retrieve and assign course software licenses Carlos Andrés Rocha 2012-10-15 18:45:36 -04:00
• 3808ff85a8 Added django command to generate random serial numbers. Carlos Andrés Rocha 2012-08-28 11:46:12 -04:00
• 9cf8c02dc6 Added import_serial_numbers command test. Carlos Andrés Rocha 2012-08-22 14:23:36 -04:00
• 516c41f342 Added html view of serial numbers. Refactored code. Carlos Andrés Rocha 2012-08-22 11:53:04 -04:00
• b2de8199b7 Added licenses view helper functions. Carlos Andrés Rocha 2012-08-21 19:04:53 -04:00
• ed88708d71 Renamed models and commands for importing serial numbers. Carlos Andrés Rocha 2012-08-21 19:04:11 -04:00
• 24d5c9162c Created Django App with commands to import software license numbers per class. Carlos Andrés Rocha 2012-08-21 10:20:26 -04:00
• 57f49353d8 Fix CR showanswer template kimth 2012-10-15 22:09:19 +00:00
• 1efb9711c3 Removed obsolete information from site faq Carlos Andrés Rocha 2012-10-15 14:51:16 -04:00
• 146ad77cc1 Merge pull request #919 from MITx/feature/tomg/cas-import-text chrisndodge 2012-10-15 11:46:03 -07:00
• f10d1773c7 added open sans pull Tom Giannattasio 2012-10-15 14:44:53 -04:00
• c9abddc9a8 removed css comment Tom Giannattasio 2012-10-15 14:37:05 -04:00
• c542ac5bd6 added link to documentation Tom Giannattasio 2012-10-15 14:35:44 -04:00
• daee441153 client-side check for a .tar.gz extension Tom Giannattasio 2012-10-15 14:34:30 -04:00
• 158c000af1 Merge pull request #918 from MITx/feature/tomg/cas-tree-tweaks chrisndodge 2012-10-15 10:54:02 -07:00
• 3d67c9606e fix bug where activation page was blank Chris Dodge 2012-10-15 13:52:41 -04:00
• 83b32987e6 removed extra ol element from unit location pane Tom Giannattasio 2012-10-15 13:07:53 -04:00
• c3bffe3e21 update name in unit location pane whenever display name is changed Tom Giannattasio 2012-10-15 13:04:06 -04:00
• 38bd83858b Make problemset render as a sequential, not a vertical. Victor Shnayder 2012-10-15 12:52:21 -04:00
• b269215951 Merge pull request #915 from MITx/feature/rocha/ut-press-release Carlos Andrés Rocha 2012-10-15 09:38:47 -07:00
• c23f44b6d4 Merge pull request #902 from MITx/hotfix/rocha/openid-sreg-return-only-username Carlos Andrés Rocha 2012-10-15 09:29:20 -07:00
• f495f219cf Update common/djangoapps/external_auth/views.py Carlos Andrés Rocha 2012-10-15 13:28:54 -03:00
• 54176bfd19 Merge pull request #916 from MITx/feature/tomg/code-mirror-background chrisndodge 2012-10-15 09:17:05 -07:00
• 4cae93a22e changed default form focus on new course Tom Giannattasio 2012-10-15 12:10:47 -04:00
• 8b8d96123d added white background to codemirror Tom Giannattasio 2012-10-15 12:01:29 -04:00
• a88a857723 Adjusted to return email address John Hess 2012-10-15 12:55:39 -03:00
• 979f8f873b Merge pull request #914 from MITx/feature/tomg/cas-cleanup-2 chrisndodge 2012-10-15 08:55:10 -07:00
• b121e620f8 Make small corrections to UT pages and announcement Carlos Andrés Rocha 2012-10-15 11:54:23 -04:00
• 551b879207 fixed component drag fly in glitch Tom Giannattasio 2012-10-15 11:47:58 -04:00
• 200792ebfb temporarily removed dates from sections Tom Giannattasio 2012-10-15 11:41:03 -04:00
• c885fce798 removed expand/collapse from new section form Tom Giannattasio 2012-10-15 11:07:41 -04:00
• 851616d25b Merge pull request #913 from MITx/fix/cdodge/signup-tweeks chrisndodge 2012-10-15 08:29:47 -07:00
• aa4361b3f0 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/signup-tweeks Chris Dodge 2012-10-15 11:26:53 -04:00
• 16720f517d Merge pull request #911 from MITx/feature/tomg/cas-import-progress chrisndodge 2012-10-15 08:25:38 -07:00
• 4d439bbe03 add a confirmation when deleting components Chris Dodge 2012-10-15 11:24:34 -04:00
• 500738d189 polished import progress bar Tom Giannattasio 2012-10-15 11:19:11 -04:00
• 0988810882 Merge pull request #907 from MITx/feature/rocha/ut-press-release jarv 2012-10-15 08:17:45 -07:00
• b13412d3b2 Make corrections of UT announcement Carlos Andrés Rocha 2012-10-15 11:12:22 -04:00
• 57df208930 return after warning user that not all create new course fields have been filled out Chris Dodge 2012-10-15 11:09:16 -04:00
• 60d431aa69 Merge pull request #910 from MITx/feature/tomg/cas-toast-alerts chrisndodge 2012-10-15 08:08:10 -07:00
• 5b179ccf83 Merge pull request #908 from MITx/feature/tomg/cas-new-course-style chrisndodge 2012-10-15 08:07:43 -07:00
• 1cfde391ff changed save unit alerts to toast Tom Giannattasio 2012-10-15 10:54:58 -04:00
• 08f59d62d6 Merge pull request #909 from MITx/fix/cdodge/signup-tweeks chrisndodge 2012-10-15 07:50:35 -07:00
• 2aee549a76 don't show courses/create new course if account has not been activated. Also better error messaging on failed logins. Also redirect to index after signup. Chris Dodge 2012-10-15 10:48:01 -04:00
• 44283497a8 removed log Tom Giannattasio 2012-10-15 10:30:00 -04:00
• 168fccf7ae polished new course form Tom Giannattasio 2012-10-15 10:21:39 -04:00
• 40dd6fa105 Add missing text to FAQ Carlos Andrés Rocha 2012-10-15 07:16:13 -04:00
• 516daa4710 Converted FAQ template to unix line endings Carlos Andrés Rocha 2012-10-15 06:58:39 -04:00
• c5a148639d Add announcement of UT joining edx and related changes Carlos Andrés Rocha 2012-10-15 06:57:50 -04:00
• 4bf9323eed More test speedups: Victor Shnayder 2012-10-15 02:23:00 -04:00
• 3f3df3fdb4 remove no-longer-used test dbs Victor Shnayder 2012-10-15 01:48:46 -04:00
• bc96203807 Use a faster hashing algorithm for testing Victor Shnayder 2012-10-15 01:34:45 -04:00
• d56fb287e1 Merge pull request #905 from MITx/fix/cdodge/cas-tab-fixes chrisndodge 2012-10-14 20:40:19 -07:00
• eab5bd4c3e fix preview draft link. We need to generate the link target url directly rather than using jump_to. I think jump_to is not properly finding the draft objects and needs more investigation Chris Dodge 2012-10-14 23:38:43 -04:00
• 557b79129b added image, solution, showhide examples to latex_problem template; fixed x_module.py to only load *.yaml files as templates TODO: Note that bad templates cause the CMS not to load; it should throw exceptions instead of dying. ichuang 2012-10-14 23:26:46 -04:00
• a45861e290 Merge pull request #904 from MITx/fix/cdodge/cas-tab-fixes chrisndodge 2012-10-14 19:47:07 -07:00
• 6fc07ab45e always hide the pages button. We don't want it appearing in case someone types a 'w' Chris Dodge 2012-10-14 22:42:36 -04:00
• a8cbcca9ab fix HTML display of math (it wasn't queueing mathjax) ichuang 2012-10-14 22:14:51 -04:00
• 5931a8d9bc Merge pull request #903 from MITx/fix/cdodge/broken-path-to-view-subsection chrisndodge 2012-10-14 18:33:43 -07:00
• a47b2be8df set position=0 when position=None. Discuss with Dave O. Chris Dodge 2012-10-14 21:31:45 -04:00
• 4ac1a74117 when calling jump_to when location=<id-of-sequential> then Position is being computed as None. The redirect then yields a 404. Force Position to be 0 when Position=None Chris Dodge 2012-10-14 21:29:00 -04:00