forked from drlippman/IMathAS
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed commit of the following: commit 90a2d60549a6859c5801e7cb32f73029f0109655 Merge: 99c62b3 87304b4 Author: drlippman <drlippman@yahoo.com> Date: Mon Jul 2 20:23:56 2018 -0700 Merge branch 'master' into EC.fixes1 # Conflicts: # course/courseshowitems.php commit 99c62b3 Merge: 088b2c8 bda7c84 Author: drlippman <drlippman@yahoo.com> Date: Wed Jun 20 10:48:28 2018 -0700 Merge branch 'master' into EC.fixes1 commit 088b2c8 Author: drlippman <drlippman@yahoo.com> Date: Mon Jun 18 10:41:33 2018 -0700 more fix the fixes commit 5574d08 Merge: 04c55b0 9faef55 Author: drlippman <drlippman@yahoo.com> Date: Thu Jun 14 09:45:59 2018 -0700 Merge branch 'EC.fixes1' of github.com:drlippman/IMathAS into EC.fixes1 commit 04c55b0 Author: drlippman <drlippman@yahoo.com> Date: Thu Jun 14 09:45:25 2018 -0700 Bug fix gb-viewasid commit 9faef55 Author: David Lippman <drlippman@gmail.com> Date: Thu May 31 11:37:31 2018 -0700 Replace unserialize with safe alt in importitems commit d0360d7 Author: drlippman <drlippman@yahoo.com> Date: Thu May 31 09:00:49 2018 -0700 Merge EC fixes update jquery version rebuild assessment_min.js commit d624083 Merge: 327e5bf 14ce20c Author: David Lippman <drlippman@yahoo.com> Date: Thu May 24 20:08:31 2018 -0700 Merge branch 'master' into EC.fixes1 commit 327e5bf Author: David Lippman <drlippman@yahoo.com> Date: Thu May 24 20:08:00 2018 -0700 Fixes round 6 commit 5bc8387 Merge: 6fab661 65b2f7d Author: drlippman <drlippman@yahoo.com> Date: Wed May 16 20:26:15 2018 -0700 Merge branch 'master' into EC.fixes1 commit 6fab661 Author: drlippman <drlippman@yahoo.com> Date: Wed May 16 19:55:00 2018 -0700 Encode stuff that doesn't really need to be encoded to make checkmarx happy commit c3f81b5 Author: drlippman <drlippman@yahoo.com> Date: Wed May 16 19:22:57 2018 -0700 Remove local copy of MathJax commit 05c79b9 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Fri Apr 27 11:34:52 2018 -0500 fixes round 5 4-27-2018 commit d89e23a Merge: ddfba0f 88926e3 Author: drlippman <drlippman@yahoo.com> Date: Mon Apr 30 17:27:22 2018 -0700 Merge branch 'master' into EC.fixes1 # Conflicts: # course/gb-viewasid.php # course/gradebook.php # javascript/assessment_min.js commit ddfba0f Author: drlippman <drlippman@yahoo.com> Date: Tue Apr 24 17:18:42 2018 -0700 fix the fixes round 4 commit 88d2f45 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Wed Apr 18 09:42:04 2018 -0500 updating actions.php commit 5ea43b7 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Wed Apr 18 08:47:06 2018 -0500 add fix back in for gradebook commit 9c38185 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Wed Apr 18 08:45:40 2018 -0500 revert gradebook commit 7afcfbc Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Tue Apr 17 15:28:45 2018 -0500 EC fixes round 4 - 4/17/2018 commit fb139fa Merge: 3572b81 da018b8 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Tue Apr 17 15:20:56 2018 -0500 Merge branch 'EC.fixes1' of github.com:drlippman/IMathAS into fixes commit 3572b81 Merge: e64cdcc 8f296ba Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Tue Apr 17 15:20:32 2018 -0500 Merge branch 'master' of github.com:drlippman/IMathAS into fixes commit da018b8 Merge: e3878fc 8f296ba Author: drlippman <drlippman@yahoo.com> Date: Mon Apr 16 20:54:17 2018 -0700 Merge branch 'master' into EC.fixes1 commit e3878fc Author: drlippman <drlippman@yahoo.com> Date: Wed Apr 11 20:42:24 2018 -0700 Fix the fixes round 3 commit e64cdcc Merge: bda94b0 cd18db2 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Wed Apr 11 13:39:27 2018 -0500 Merge branch 'EC.fixes1' of github.com:drlippman/IMathAS into fixes commit cd18db2 Merge: 40a8d3f b2f6df0 Author: David Lippman <drlippman@gmail.com> Date: Wed Apr 11 11:21:15 2018 -0700 Merge branch 'master' into EC.fixes1 commit bda94b0 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Tue Apr 10 09:45:38 2018 -0500 EC updates round 3 4-10-2018 commit 85fb741 Merge: 40a8d3f b2f6df0 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Tue Apr 10 09:42:37 2018 -0500 Merge branch 'master' of github.com:drlippman/IMathAS into fixes commit 40a8d3f Author: drlippman <drlippman@yahoo.com> Date: Tue Apr 3 21:16:22 2018 -0700 fix the fixes round 2 commit b83b00e Merge: 8afa2f8 8dae162 Author: drlippman <drlippman@yahoo.com> Date: Tue Apr 3 20:25:15 2018 -0700 Merge branch 'fixes' of https://github.com/ejrasmussen1/IMathAS into EC.fixes1 commit 8dae162 Merge: 30d41b0 8afa2f8 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Tue Apr 3 15:58:54 2018 -0500 merge fix commit 8afa2f8 Merge: 582c439 7a6de0d Author: drlippman <drlippman@yahoo.com> Date: Tue Apr 3 13:44:09 2018 -0700 Merge branch 'EC.fixes1' of github.com:drlippman/IMathAS into EC.fixes1 commit 582c439 Author: drlippman <drlippman@yahoo.com> Date: Fri Mar 23 12:06:40 2018 -0700 Fix the fixes commit c2fa84e Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Thu Mar 22 08:58:21 2018 -0500 Adding updates into fixes branch commit 30d41b0 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Tue Apr 3 13:59:04 2018 -0500 EC fixes round 2 4/3/2018 commit 249c885 Merge: ef68f5b 87653db Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Tue Apr 3 13:55:22 2018 -0500 merge fix commit ef68f5b Merge: e6ed757 8f2e1e0 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Thu Mar 29 10:03:20 2018 -0500 Merge branch 'master' of github.com:drlippman/IMathAS into fixes commit 7a6de0d Author: drlippman <drlippman@yahoo.com> Date: Fri Mar 23 12:06:40 2018 -0700 Fix the fixes commit 632a55c Merge: eb9b40b e6ed757 Author: drlippman <drlippman@yahoo.com> Date: Fri Mar 23 10:20:24 2018 -0700 Merge branch 'fixes' of https://github.com/ejrasmussen1/IMathAS into EC.fixes1 commit e6ed757 Author: Eric Rasmussen <erasmussen@eaglecrk.com> Date: Thu Mar 22 08:58:21 2018 -0500 Adding updates into fixes branch
- Loading branch information
Showing
1,307 changed files
with
4,231 additions
and
28,719 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.