Code

Devel#100

Code

Open

whytheplatypus wants to merge 146 commits intogit-flow-conversionopenwebwork/retired-webwork2-dev:git-flow-conversionfrom developenwebwork/retired-webwork2-dev:develCopy head branch name to clipboard

+293,155-15,964

Commits

Commits on Jun 24, 2012

• Restore PGProblemEditor (the first one ) it's original look and feel

  Show description for 32b8c81
  mgage

  committed
  32b8c81

  Copy full SHA for 32b8c81

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  mgage

  committed
  d8028c2

  Copy full SHA for d8028c2

Commits on Jun 25, 2012

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  mgage

  committed
  8b53349

  Copy full SHA for 8b53349

Commits on Jun 26, 2012

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  mgage

  committed
  3fcf54c

  Copy full SHA for 3fcf54c

Commits on Jul 12, 2012

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  mgage

  committed
  602163d

  Copy full SHA for 602163d

Commits on Jul 26, 2012

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  mgage

  committed
  b8a1a6f

  Copy full SHA for b8a1a6f

Commits on Aug 7, 2012

• Merge branch 'subject_browse' into mgage

  mgage

  committed
  53bd418

  Copy full SHA for 53bd418

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  Show description for fe4b5ad
  mgage

  committed
  fe4b5ad

  Copy full SHA for fe4b5ad

Commits on Aug 8, 2012

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  Show description for c027b20
  mgage

  committed
  c027b20

  Copy full SHA for c027b20

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  mgage

  committed
  297df67

  Copy full SHA for 297df67

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  mgage

  committed
  bf29866

  Copy full SHA for bf29866

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  mgage

  committed
  71fdd5f

  Copy full SHA for 71fdd5f

Commits on Aug 21, 2012

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  mgage

  committed
  1486fcb

  Copy full SHA for 1486fcb

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  mgage

  committed
  e18558e

  Copy full SHA for e18558e

• Merge branch 'master' of git://github.com/mgage/webwork2-dev into mgage

  mgage

  committed
  89580d7

  Copy full SHA for 89580d7

• Fix (again) the check for the library version number

  Show description for 2e172c8
  mgage

  committed
  2e172c8

  Copy full SHA for 2e172c8

Commits on Aug 22, 2012

• Change version number to 2.5.2.1

  Show description for 20d9fb1
  mgage

  committed
  20d9fb1

  Copy full SHA for 20d9fb1

Commits on Aug 23, 2012

• Update themes

  Show description for 4537d92
  mgage

  committed
  4537d92

  Copy full SHA for 4537d92

• Update README's and LICENSE

  mgage

  committed
  68e6eca

  Copy full SHA for 68e6eca

Commits on Aug 28, 2012

• Preperation for merging to mgage

  goehle

  committed
  f2330e5

  Copy full SHA for f2330e5

• Merge branch 'ww2.5.1.1' into ww2.5.2

  Show description for c3ad79d
  mgage

  committed
  c3ad79d

  Copy full SHA for c3ad79d

• Add back ProblemGrader.pm and ShowAnswers.pm -- files needed for the new essayQuestion

  Show description for 7ce623a
  mgage

  committed
  7ce623a

  Copy full SHA for 7ce623a

• Add remaining changes needed to enable essayQuestions

  Show description for 7d6073d
  mgage

  committed
  7d6073d

  Copy full SHA for 7d6073d

• Merge branch 'ww2.5.2' of git://github.com/mgage/webwork2-dev into ww2.5.2

  Show description for b3331af
  mgage

  committed
  b3331af

  Copy full SHA for b3331af

• Set version number to 2.5.2

  mgage

  committed
  4aecc88

  Copy full SHA for 4aecc88

• Merge branch 'ww2.5.2' of git://github.com/mgage/webwork2-dev into ww2.5.2

  Show description for 413c2df
  mgage

  committed
  413c2df

  Copy full SHA for 413c2df

• Insert changes to math2.css and math3.css

  Show description for c4ec5ae
  mgage

  committed
  c4ec5ae

  Copy full SHA for c4ec5ae

Commits on Aug 29, 2012

• Merge branch 'ww2.5.2' of https://github.com/openwebwork/webwork2-dev into merge_with_ww2.5.2_on_hosted2

  mgage

  committed
  5ff213d

  Copy full SHA for 5ff213d

• Fix out of place brace

  mgage

  committed
  c79900b

  Copy full SHA for c79900b

• Merge commit '671bb8a200d37b84008585765fe4fabbf5f71de3' into ww2.5.2

  Show description for 3100820
  mgage

  committed
  3100820

  Copy full SHA for 3100820

• Merge pull request #27 from mgage/ww2.5.2

  Show description for f82020a
  mgage

  committed
  f82020a

  Copy full SHA for f82020a

Commits on Aug 30, 2012

• Merge pull request #16 from openwebwork/ww2.5.2

  Show description for 0fa1fbe
  mgage

  committed
  0fa1fbe

  Copy full SHA for 0fa1fbe

• Be more careful about replacing _ with spaces in set names

  Show description for 92efd49
  mgage

  committed
  92efd49

  Copy full SHA for 92efd49

Commits on Aug 31, 2012

• Fixed files for merging.

  Show description for 49ccdd4
  goehle

  committed
  49ccdd4

  Copy full SHA for 49ccdd4

• Bug fixes and minor upgrades to Essay Answers

  goehle

  committed
  f8c7324

  Copy full SHA for f8c7324

• Fixed fast forward conflict

  Show description for e42fd99
  goehle

  committed
  e42fd99

  Copy full SHA for e42fd99

• Merge branch 'ww2.5.2' of https://github.com/mgage/webwork2-dev

  Show description for 2818290
  goehle

  committed
  2818290

  Copy full SHA for 2818290

Commits on Sep 1, 2012

• Merge pull request #14 from goehle/master

  Show description for c25a0e9
  mgage

  committed
  c25a0e9

  Copy full SHA for c25a0e9

Commits on Sep 5, 2012

• Link codemirror2 to htdocs/codemirror2

  Show description for af13330
  mgage

  committed
  af13330

  Copy full SHA for af13330

• Fix bugs and improve error messages in SendMail.pm

  Show description for 54e1352
  mgage

  committed
  54e1352

  Copy full SHA for 54e1352

• Comment out codemirror in themes math2 and math3

  Show description for a7c565d
  mgage

  committed
  a7c565d

  Copy full SHA for a7c565d

• Replace publish by visible in database fields

  Show description for e59c85c
  mgage

  committed
  e59c85c

  Copy full SHA for e59c85c

Commits on Sep 7, 2012

• Add a VERSION file for PG.

  Show description for 217df55
  mgage

  committed
  217df55

  Copy full SHA for 217df55

• Merge pull request #37 from mgage/ww2.5.2

  Show description for e414514
  mgage

  committed
  e414514

  Copy full SHA for e414514

Commits on Sep 8, 2012

• Replace include() by require().

  Show description for ce1ce34
  mgage

  committed
  ce1ce34

  Copy full SHA for ce1ce34

• Replace include() by require().

  Show description for 45d53b3
  mgage

  committed
  45d53b3

  Copy full SHA for 45d53b3

• Merge pull request #39 from mgage/ww2.5.2

  Show description for 792fddb
  mgage

  committed
  792fddb

  Copy full SHA for 792fddb

• updates from Bill Wheeler

  

  whwheel

  authored and

  mgage

  committed
  215673a

  Copy full SHA for 215673a

• Merge pull request #41 from mgage/ww2.5.2

  Show description for fa753f0
  mgage

  committed
  fa753f0

  Copy full SHA for fa753f0

Commits on Sep 9, 2012

• Allow admin course data tables and directories to be updated

  Show description for a8254ad
  mgage

  committed
  a8254ad

  Copy full SHA for a8254ad

• Automatically create achievements directories.

  Show description for 2b9bb42
  mgage

  committed
  2b9bb42

  Copy full SHA for 2b9bb42

• Merge branch 'ww2.5.2' of https://github.com/mgage/webwork2-dev into ww2.5.2

  mgage

  committed
  8499d0e

  Copy full SHA for 8499d0e

Commits on Sep 10, 2012

• Merge pull request #45 from mgage/ww2.5.2

  Show description for 08b306f
  mgage

  committed
  08b306f

  Copy full SHA for 08b306f

Commits on Sep 19, 2012

• More bug fixes for Classlist editor. In addition, some preliminary validation on input. The classlist editor now validates for username and email address when adding.

  pstaabp

  committed
  46117fa

  Copy full SHA for 46117fa

Commits on Sep 20, 2012

• Preliminary rewrite of the Homework Set Editor

  pstaabp

  committed
  4d11ae0

  Copy full SHA for 4d11ae0

Commits on Sep 21, 2012

• Fix undefined variable errors

  Show description for 1ed3da2
  

  goehle

  authored and

  mgage

  committed
  1ed3da2

  Copy full SHA for 1ed3da2

Commits on Sep 25, 2012

• Merge pull request #52 from mgage/ww2.5.2

  Show description for 7d79715
  mgage

  committed
  7d79715

  Copy full SHA for 7d79715

Commits on Sep 26, 2012

• Merge branch 'ww2.5.2' of https://github.com/mgage/webwork2-dev into ww2.5.2

  mgage

  committed
  79f979a

  Copy full SHA for 79f979a

Commits on Sep 27, 2012

• Restore missing lines around 1955 that fetch user problems for a single user

  Show description for 6633ff1
  mgage

  committed
  6633ff1

  Copy full SHA for 6633ff1

• Merge pull request #53 from mgage/ww2.5.2

  Show description for 0fd5dde
  mgage

  committed
  0fd5dde

  Copy full SHA for 0fd5dde

• Add more comments to configuration files

  mgage

  committed
  35d032b

  Copy full SHA for 35d032b

• Merge branch 'ww2.5.2' of https://github.com/mgage/webwork2-dev into ww2.5.2

  mgage

  committed
  c5fd9de

  Copy full SHA for c5fd9de

Commits on Oct 11, 2012

• moving around javascript files and breaking things

  whytheplatypus

  committed
  7f2f0a6

  Copy full SHA for 7f2f0a6

• Start on moving to amd javascript

  whytheplatypus

  committed
  3891581

  Copy full SHA for 3891581

Commits on Oct 12, 2012

• Initial code for a Homework Set Editor 3.

  pstaabp

  committed
  4b6bcb0

  Copy full SHA for 4b6bcb0

• removing local dists.

  pstaabp

  committed
  50ae1d7

  Copy full SHA for 50ae1d7

• Merge commit '7c6c4d299e58735206d213c93b5e6bc6e05ed69d'

  Show description for 1a2b825
  pstaabp

  committed
  1a2b825

  Copy full SHA for 1a2b825

• Merge commit '1a2b82599047004142989fa47e8a0b53b44a4e88' into requirejs

  Show description for 29f10f1
  whytheplatypus

  committed
  29f10f1

  Copy full SHA for 29f10f1

• Added ProblemSet.js and ProblemSetList.pm

  pstaabp

  committed
  1c30b8e

  Copy full SHA for 1c30b8e

• Merge commit '1c30b8e602670981c506a1e0f20327f239d11222' into requirejs

  whytheplatypus

  committed
  45fdc31

  Copy full SHA for 45fdc31

• update to get things working

  whytheplatypus

  committed
  0e2b071

  Copy full SHA for 0e2b071

Commits on Oct 13, 2012

• A start with requirejs

  whytheplatypus

  committed
  f8b8c63

  Copy full SHA for f8b8c63

• Merge branch 'ww2.5.2' of https://github.com/openwebwork/webwork2-dev into ww2.5.2

  mgage

  committed
  351f020

  Copy full SHA for 351f020

• Bug fixes to the Hwk Editor 3

  pstaabp

  committed
  7fd5268

  Copy full SHA for 7fd5268

• requirejs working for library browser 3

  whytheplatypus

  committed
  07bfce0

  Copy full SHA for 07bfce0

• Merge commit '7fd5268e1bf64c7cf25b1faf9fb27a95b5901c3c' into requirejs

  Show description for f059d75
  whytheplatypus

  committed
  f059d75

  Copy full SHA for f059d75

• Use Storable::nfreeze instead of freeze.

  Show description for 82bf4e4
  apizer

  committed
  82bf4e4

  Copy full SHA for 82bf4e4

• userlist3 working with requires

  whytheplatypus

  committed
  f948f03

  Copy full SHA for f948f03

• Merge pull request #61 from apizer/ww2.5.2

  Show description for df6432b
  mgage

  committed
  df6432b

  Copy full SHA for df6432b

• removed base url, turns out it breaks things

  whytheplatypus

  committed
  4d5430f

  Copy full SHA for 4d5430f

• More bug fixes and features for Homework Set Editor.

  pstaabp

  committed
  1f17b06

  Copy full SHA for 1f17b06

• Merge commit '1f17b0641b9047ecf139d0f46c366157c98c7078'

  Show description for bca9838
  whytheplatypus

  committed
  bca9838

  Copy full SHA for bca9838

• getting requires working with the new set editor

  whytheplatypus

  committed
  e66182f

  Copy full SHA for e66182f

• More bug fixes

  pstaabp

  committed
  f83ac72

  Copy full SHA for f83ac72

• added jquery-ui-1.9.0

  pstaabp

  committed
  9064abc

  Copy full SHA for 9064abc

• Merge commit 'f83ac7289010b7c81465d9cee36b5a91c4b72c5b'

  Show description for a715a84
  whytheplatypus

  committed
  a715a84

  Copy full SHA for a715a84

• fix for bootstrap

  whytheplatypus

  committed
  2a06833

  Copy full SHA for 2a06833

• Merge commit '2a06833578bc22a3dfec1d185ae12264ca626d7a'

  Show description for b9c267b
  pstaabp

  committed
  b9c267b

  Copy full SHA for b9c267b

• Changed the lbtwo.template

  pstaabp

  committed
  07dfbef

  Copy full SHA for 07dfbef

• module views

  whytheplatypus

  committed
  9ebd84f

  Copy full SHA for 9ebd84f

• Merge commit '07dfbefdd4d3d576c8f69d9710b9dfcce79f0032'

  whytheplatypus

  committed
  7f56344

  Copy full SHA for 7f56344

• moving main page to bootstrap

  whytheplatypus

  committed
  0d087ce

  Copy full SHA for 0d087ce

Commits on Oct 14, 2012

• Merge commit 'df6432bbff5a9bae48381d1f96f826af54149f28'

  Show description for aec5d2f
  whytheplatypus

  committed
  aec5d2f

  Copy full SHA for aec5d2f

• requiers calendar view

  whytheplatypus

  committed
  7584eff

  Copy full SHA for 7584eff

• Added the feature that the help box on a page doesn't automatically open after closed 3 times.

  pstaabp

  committed
  fd458e7

  Copy full SHA for fd458e7

• added calendar to the front page

  whytheplatypus

  committed
  4570651

  Copy full SHA for 4570651

• Add color package to TeX for inline equation generation

  mgage

  committed
  8bbb2fe

  Copy full SHA for 8bbb2fe

• Merge commit 'df6432bbff5a9bae48381d1f96f826af54149f28'

  Show description for 1e22908
  pstaabp

  committed
  1e22908

  Copy full SHA for 1e22908

• A bug fix to bring back the Homework Editor 3.

  pstaabp

  committed
  a20ac98

  Copy full SHA for a20ac98

• removing the PG_VERSION from the repository it shouldn't be there

  whytheplatypus

  committed
  0e06d71

  Copy full SHA for 0e06d71

• commit for merging with gage. Calendar on the front page, requirejs views and modules

  whytheplatypus

  committed
  a000672

  Copy full SHA for a000672

• Merge pull request #19 from whytheplatypus/master

  Show description for fa57406
  mgage

  committed
  fa57406

  Copy full SHA for fa57406

• Merge pull request #20 from whytheplatypus/master

  Show description for d76f6de
  mgage

  committed
  d76f6de

  Copy full SHA for d76f6de

Commits on Oct 15, 2012

• Add all of the updates from the WeBWorK::Fitchburg code camp

  Show description for 340defb
  mgage

  committed
  340defb

  Copy full SHA for 340defb

Commits on Nov 3, 2012

• Merge commit '0e06d71eff1c6bf0dde487d0f887f1d9f10e2860'

  Show description for a129390
  pstaabp

  committed
  a129390

  Copy full SHA for a129390

Commits on Nov 25, 2012

• bug fixes to Homework Editor 3 and improved functionality including some preliminary merging of the library browser with the Homework editor.

  pstaabp

  committed
  50101d2

  Copy full SHA for 50101d2

Commits on Nov 27, 2012

• Simple javascript for library browser 1.

  jwj61

  committed
  5038a64

  Copy full SHA for 5038a64

• Beginnings of javascript in Library Browser 1, and starting to make a widget for editting library tags from inside webwork.

  jwj61

  committed
  e8605d0

  Copy full SHA for e8605d0

• Merge branch 'master' of https://github.com/openwebwork/webwork2-dev

  jwj61

  committed
  49be88f

  Copy full SHA for 49be88f

Commits on Dec 5, 2012

• Continued Development of the Homework Editor (now named Homework Manager). This includes countless bug fixes and the integration of the library 3 browser into the Homework Manager.

  pstaabp

  committed
  d5a94fb

  Copy full SHA for d5a94fb

Commits on Dec 13, 2012

• Added functionality to Homework Manager Page (formally named homework Editor 3) and lots of bug fixes.

  Show description for fc99d86
  pstaabp

  committed
  fc99d86

  Copy full SHA for fc99d86

Commits on Dec 15, 2012

• Change the interface of Homework Manager to a pulldown list of views instead of the tab views to save space on the page. For some reason most of the core model and view js files weren't included.

  pstaabp

  committed
  50d6699

  Copy full SHA for 50d6699

• Added missing files from the previous commit

  pstaabp

  committed
  91ad113

  Copy full SHA for 91ad113

Commits on Dec 18, 2012

• Added files not be tracked and deleted old files to try to merge with ww2.5.2

  pstaabp

  committed
  44b22f3

  Copy full SHA for 44b22f3

• A few other files to get the old Library Browser working.

  pstaabp

  committed
  a687d9b

  Copy full SHA for a687d9b

• Another round of adding files to the index so that I can merge with ww2.5.2

  pstaabp

  committed
  e63486d

  Copy full SHA for e63486d

• Still trying to merge with ww2.5.2

  pstaabp

  committed
  722f105

  Copy full SHA for 722f105

• Another attempt to merge with ww2.5.2

  pstaabp

  committed
  ef1ef21

  Copy full SHA for ef1ef21

• Merge branch 'ww2.5.2'

  Show description for 670561c
  pstaabp

  committed
  670561c

  Copy full SHA for 670561c

Commits on Dec 19, 2012

• Whitespace change only.

  jwj61

  committed
  59b7769

  Copy full SHA for 59b7769

Commits on Dec 21, 2012

• Adding javascript actions to original library browser. Some actions

  Show description for e41699e
  jwj61

  committed
  e41699e

  Copy full SHA for e41699e

• Merge branch 'master' of https://github.com/openwebwork/webwork2-dev

  jwj61

  committed
  599f22d

  Copy full SHA for 599f22d

Commits on Dec 22, 2012

• Fixing toggle for file path names in library browser 1.

  jwj61

  committed
  e8372c8

  Copy full SHA for e8372c8

Commits on Dec 23, 2012

• Library browser 1 can now rerandomize problems by clicking on an icon.

  jwj61

  committed
  d2b8d99

  Copy full SHA for d2b8d99

Commits on Dec 30, 2012

• More bug fixes and features for the Homework Manager. Features include assignment of a problem set to a set of users.

  pstaabp

  committed
  bcfe12b

  Copy full SHA for bcfe12b

• Added the date picker files I forgot to add in the last commit. Also, deleted some CalendarView files because of rearranging some code to simplify.

  pstaabp

  committed
  21dbaf1

  Copy full SHA for 21dbaf1

Commits on Jan 1, 2013

• Progress on more like this feature

  jwj61

  committed
  e8e6e92

  Copy full SHA for e8e6e92

• Merge pull request #21 from pstaabp/master

  Show description for e80252b
  mgage

  committed
  e80252b

  Copy full SHA for e80252b

Commits on Jan 15, 2013

• Put original library browser 1 back in as librarybrowsernojs, many

  Show description for e35a974
  jwj61

  committed
  e35a974

  Copy full SHA for e35a974

• Merge branch 'master' of https://github.com/openwebwork/webwork2-dev

  jwj61

  committed
  d26089c

  Copy full SHA for d26089c

Commits on Jan 16, 2013

• Fixed bug when rerandomizing a problem in the library browser1 (a

  Show description for 173af46
  jwj61

  committed
  173af46

  Copy full SHA for 173af46

• Set default so no one can edit tags yet.

  jwj61

  committed
  21e5bb4

  Copy full SHA for 21e5bb4

Commits on Jan 18, 2013

• Make new rerandomize icon typeset the mathematics in all modes

  Show description for a6be46a
  jwj61

  committed
  a6be46a

  Copy full SHA for a6be46a

• Merge branch 'master' of https://github.com/openwebwork/webwork2-dev

  jwj61

  committed
  d84b529

  Copy full SHA for d84b529

Commits on Jan 25, 2013

• fixed dbsection typo already fixed by Paul Pearson

  mgage

  committed
  f7a14cb

  Copy full SHA for f7a14cb

• updated mathjax

  mgage

  committed
  6e17f82

  Copy full SHA for 6e17f82

• Merge branch 'ww2.5.1.1'

  mgage

  committed
  b409acf

  Copy full SHA for b409acf

Commits on Jan 26, 2013

• add pointer to PG VERSION file

  mgage

  committed
  fef1efd

  Copy full SHA for fef1efd

Commits on Jan 27, 2013

• Merge branch 'ww2.5.1.3' of https://github.com/openwebwork/webwork2-dev into ww-devel

  Show description for 1581dac
  mgage

  committed
  1581dac

  Copy full SHA for 1581dac

• Correct typo involving $dh

  Show description for be579c8
  mgage

  committed
  be579c8

  Copy full SHA for be579c8

• Merge branch 'master' of https://github.com/jwj61/webwork2-dev into from_jj

  Show description for 7f5d5e9
  mgage

  committed
  7f5d5e9

  Copy full SHA for 7f5d5e9

Commits on Feb 2, 2013

• Deleting file (accidentally added in a recent merge).

  jwj61

  committed
  0397ce4

  Copy full SHA for 0397ce4

• Fixing merge with devel branch.

  jwj61

  committed
  83804d8

  Copy full SHA for 83804d8

• Merge pull request #86 from jwj61/devel

  Show description for 3d84acf
  mgage

  committed
  3d84acf

  Copy full SHA for 3d84acf

Commits on Mar 9, 2013

• removing local config that I screwed up

  whytheplatypus

  committed
  b0eb522

  Copy full SHA for b0eb522

• added apache-config to ignore list

  whytheplatypus

  committed
  edde686

  Copy full SHA for edde686