Code

Issue/#746#747

Code

Closed

darylhedley wants to merge 112 commits intomasteradaptlearning/adapt_authoring:masterfrom issue/#746adaptlearning/adapt_authoring:issue/#746Copy head branch name to clipboard

+1,646-1,177

Commits

Commits on Apr 10, 2015

• Removes sidebar update class

  Show description for 914481f
  darylhedley

  committed
  914481f

  Copy full SHA for 914481f

Commits on Apr 14, 2015

• issue/#632

  Show description for d3a4768
  finbartracey1

  committed
  d3a4768

  Copy full SHA for d3a4768

• issue/#632

  Show description for 535d090
  finbartracey1

  committed
  535d090

  Copy full SHA for 535d090

• issue/#635

  Show description for e17a4c5
  finbartracey1

  committed
  e17a4c5

  Copy full SHA for e17a4c5

Commits on Apr 16, 2015

• With error with updates being called when they should create new documents

  darylhedley

  committed
  edf6e3e

  Copy full SHA for edf6e3e

• Few more additions to the assetView

  darylhedley

  committed
  b0e7eed

  Copy full SHA for b0e7eed

• Removed fix for node v0.12

  darylhedley

  committed
  4abbdfe

  Copy full SHA for 4abbdfe

• Merge pull request #631 from adaptlearning/issue/#630

  Show description for d61bdc4
  brian-learningpool

  committed
  d61bdc4

  Copy full SHA for d61bdc4

• Enhancements to backbone forms asset selection

  Show description for 9f34ffe
  darylhedley

  committed
  9f34ffe

  Copy full SHA for 9f34ffe

Commits on Apr 17, 2015

• issue/#637

  Show description for eb8d709
  finbartracey1

  committed
  eb8d709

  Copy full SHA for eb8d709

• issue/#632

  Show description for 977465a
  finbartracey1

  committed
  977465a

  Copy full SHA for 977465a

• issue/#637

  Show description for d4fc7e0
  finbartracey1

  committed
  d4fc7e0

  Copy full SHA for d4fc7e0

• Merge pull request #646 from adaptlearning/issue/#637

  Show description for 11dda7d
  brian-learningpool

  committed
  11dda7d

  Copy full SHA for 11dda7d

• Adds ifUserIsMe and fixes inverse not being passed back

  Show description for ef19c21
  

  darylhedley

  authored and

  brian-learningpool

  committed
  ef19c21

  Copy full SHA for ef19c21

Commits on Apr 21, 2015

• Merge pull request #647 from adaptlearning/issue/#635

  Show description for c7a245a
  brian-learningpool

  committed
  c7a245a

  Copy full SHA for c7a245a

• issue/#649-part2

  Show description for 3a7af4f
  finbartracey1

  committed
  3a7af4f

  Copy full SHA for 3a7af4f

• issue/#649-part2

  Show description for c1b5fab
  finbartracey1

  committed
  c1b5fab

  Copy full SHA for c1b5fab

• Merge branch 'develop' of https://github.com/adaptlearning/adapt_authoring into develop

  brian-learningpool

  committed
  e6f1035

  Copy full SHA for e6f1035

• Filenames in published/previewed courses hashed

  Show description for 4a1bf85
  brian-learningpool

  committed
  4a1bf85

  Copy full SHA for 4a1bf85

• Merge pull request #654 from adaptlearning/use-hashed-filenames-in-output

  Show description for 86ded29
  brian-learningpool

  committed
  86ded29

  Copy full SHA for 86ded29

Commits on Apr 22, 2015

• Merge pull request #655 from adaptlearning/issue/#649-part2

  Show description for 4e65597
  finbartracey1

  committed
  4e65597

  Copy full SHA for 4e65597

Commits on Apr 23, 2015

• issue/#532

  Show description for c4fbb27
  finbartracey1

  committed
  c4fbb27

  Copy full SHA for c4fbb27

• First initial commit of asset changes

  Show description for 21eb516
  darylhedley

  committed
  21eb516

  Copy full SHA for 21eb516

Commits on Apr 27, 2015

• Corrected caching of the single page app

  brian-learningpool

  committed
  83ee5a9

  Copy full SHA for 83ee5a9

• Merge pull request #657 from adaptlearning/fix-for-caching

  Show description for 26df464
  brian-learningpool

  committed
  26df464

  Copy full SHA for 26df464

• Merge pull request #645 from adaptlearning/switch-editor-to-cdn-dev

  Show description for 33529b7
  brian-learningpool

  committed
  33529b7

  Copy full SHA for 33529b7

• Added a check for NodeJS version

  Show description for db6bf3b
  brian-learningpool

  committed
  db6bf3b

  Copy full SHA for db6bf3b

Commits on Apr 29, 2015

• Added 'chalk' package to project

  brian-learningpool

  committed
  ffb8b40

  Copy full SHA for ffb8b40

• Adds ability to autofill the graphic component images

  darylhedley

  committed
  19a41d4

  Copy full SHA for 19a41d4

• Asset management external links

  Show description for 19f4f49
  darylhedley

  committed
  19f4f49

  Copy full SHA for 19f4f49

• Bug fix with modalView autofill button being clicked without selecting an asset

  darylhedley

  committed
  6c45af4

  Copy full SHA for 6c45af4

Commits on Apr 30, 2015

• Work in progress (do not use)

  brian-learningpool

  committed
  481b583

  Copy full SHA for 481b583

• Fixes for intermittent IE issues

  Show description for a105cc9
  brian-learningpool

  committed
  a105cc9

  Copy full SHA for a105cc9

• Few more updates to hero image previews

  darylhedley

  committed
  f75d8d7

  Copy full SHA for f75d8d7

• Merge pull request #667 from adaptlearning/fix-for-IE-loading-issues

  Show description for 5bec26f
  brian-learningpool

  committed
  5bec26f

  Copy full SHA for 5bec26f

Commits on May 5, 2015

• Re-worded NodeJS warning message

  brian-learningpool

  committed
  420df9d

  Copy full SHA for 420df9d

• Merge pull request #662 from adaptlearning/issue/660

  Show description for 8494049
  brian-learningpool

  committed
  8494049

  Copy full SHA for 8494049

Commits on May 6, 2015

• Updated to enable alternative models for saving with assets

  darylhedley

  committed
  783e234

  Copy full SHA for 783e234

Commits on May 7, 2015

• Changed user preferences to be session based

  Show description for 0323ed4
  darylhedley

  committed
  0323ed4

  Copy full SHA for 0323ed4

• Merge pull request #669 from adaptlearning/issue/#663

  Show description for fd8cb7a
  brian-learningpool

  committed
  fd8cb7a

  Copy full SHA for fd8cb7a

• Fixes dashboard tags for grid view

  Show description for 0424094
  darylhedley

  committed
  0424094

  Copy full SHA for 0424094

Commits on May 12, 2015

• Fixes issue with plugins not running their JS in time

  Show description for 972a93a
  darylhedley

  committed
  972a93a

  Copy full SHA for 972a93a

• Merge pull request #673 from adaptlearning/issue/#672

  Show description for 9aaddee
  darylhedley

  committed
  9aaddee

  Copy full SHA for 9aaddee

• Merge pull request #665 from adaptlearning/issue/#644

  Show description for 42f3574
  brian-learningpool

  committed
  42f3574

  Copy full SHA for 42f3574

• Merge pull request #670 from adaptlearning/issue/#650

  Show description for 4b6a343
  brian-learningpool

  committed
  4b6a343

  Copy full SHA for 4b6a343

• Work in progress

  brian-learningpool

  committed
  02dbba2

  Copy full SHA for 02dbba2

• Fixes issue with inheritance placing the course collection on save of a project

  Show description for 0f7fa34
  darylhedley

  committed
  0f7fa34

  Copy full SHA for 0f7fa34

• Merge pull request #675 from adaptlearning/issue/#674

  Show description for df25a8f
  brian-learningpool

  committed
  df25a8f

  Copy full SHA for df25a8f

• Some other fixes to tags not allowing images to save

  darylhedley

  committed
  533ce38

  Copy full SHA for 533ce38

• Fixes to hero image not saving properly

  darylhedley

  committed
  42f87df

  Copy full SHA for 42f87df

• Merge pull request #676 from adaptlearning/issue/#674

  Show description for e07f2bf
  brian-learningpool

  committed
  e07f2bf

  Copy full SHA for e07f2bf

Commits on May 13, 2015

• Merge pull request #648 from adaptlearning/issue/#632

  Show description for 3c394b8
  brian-learningpool

  committed
  3c394b8

  Copy full SHA for 3c394b8

• Work in progress

  brian-learningpool

  committed
  2c20bdd

  Copy full SHA for 2c20bdd

Commits on May 14, 2015

• Fixes issue with Firefox component list widths

  Show description for 23dc886
  brian-learningpool

  committed
  23dc886

  Copy full SHA for 23dc886

• Added ability to check upgrades for both tools & pull the builder updates

  darylhedley

  committed
  f0870ec

  Copy full SHA for f0870ec

• Fixed git pull command not being needed

  darylhedley

  committed
  67145ab

  Copy full SHA for 67145ab

• Merge pull request #677 from adaptlearning/fix-for-component-list-width

  Show description for b64a121
  brian-learningpool

  committed
  b64a121

  Copy full SHA for b64a121

Commits on May 19, 2015

• updated upgrade script

  darylhedley

  committed
  d7d843c

  Copy full SHA for d7d843c

• Merge remote-tracking branch 'origin/version-checking-on-bootstrap' into version-checking-on-bootstrap

  Show description for d4ad247
  darylhedley

  committed
  d4ad247

  Copy full SHA for d4ad247

• Updates to upgrade

  darylhedley

  committed
  70e24ed

  Copy full SHA for 70e24ed

• More upgrade merges

  darylhedley

  committed
  58cebe3

  Copy full SHA for 58cebe3

• Added framework upgrade

  darylhedley

  committed
  82550a8

  Copy full SHA for 82550a8

• moved version back a number

  darylhedley

  committed
  a4eea49

  Copy full SHA for a4eea49

• Fixes issue with cwd not being set

  darylhedley

  committed
  46f461d

  Copy full SHA for 46f461d

• Adds version.json file to be updated

  darylhedley

  committed
  7e29fe8

  Copy full SHA for 7e29fe8

• Sorted out spacing

  darylhedley

  committed
  8a13359

  Copy full SHA for 8a13359

• added new lines to consoles

  darylhedley

  committed
  2751fc1

  Copy full SHA for 2751fc1

• Updated comments and static code

  darylhedley

  committed
  b6f94ef

  Copy full SHA for b6f94ef

• Added missing callback

  darylhedley

  committed
  799a614

  Copy full SHA for 799a614

• removed stringify

  darylhedley

  committed
  083603a

  Copy full SHA for 083603a

• merge of develop

  darylhedley

  committed
  ffdd463

  Copy full SHA for ffdd463

• updated the version.json back to the real release tags

  darylhedley

  committed
  0beb39c

  Copy full SHA for 0beb39c

Commits on May 21, 2015

• Fixes around asset selection

  Show description for bfb3ad8
  brian-learningpool

  committed
  bfb3ad8

  Copy full SHA for bfb3ad8

• Corrected issue with assets and course duplication

  Show description for fe20c97
  brian-learningpool

  committed
  fe20c97

  Copy full SHA for fe20c97

Commits on May 22, 2015

• Merge pull request #681 from adaptlearning/asset-patches

  Show description for b2f6969
  brian-learningpool

  committed
  b2f6969

  Copy full SHA for b2f6969

Commits on May 27, 2015

• updated npm before installing adapt-cli

  himanshu1618

  committed
  7581ba0

  Copy full SHA for 7581ba0

• updating node.js version to 010.33

  himanshu1618

  committed
  d432b87

  Copy full SHA for d432b87

Commits on May 28, 2015

• Fixes reference to files[0] to the actual folder name

  darylhedley

  committed
  8782a40

  Copy full SHA for 8782a40

• Separate the setting of assetType and metadata

  taylortom

  committed
  4647b96

  Copy full SHA for 4647b96

• Move setting of fileType

  taylortom

  committed
  587d521

  Copy full SHA for 587d521

• Made the process more robust

  darylhedley

  committed
  25a9aa0

  Copy full SHA for 25a9aa0

• Added error if the plugin doesn't contain a bower.json file

  darylhedley

  committed
  686ea38

  Copy full SHA for 686ea38

• updated to use async.some

  darylhedley

  committed
  67e39e6

  Copy full SHA for 67e39e6

• removed slash

  darylhedley

  committed
  2acc917

  Copy full SHA for 2acc917

Commits on Jun 2, 2015

• Updated with fixes to try/catch

  Show description for a73546a
  darylhedley

  committed
  a73546a

  Copy full SHA for a73546a

Commits on Jun 3, 2015

• Fix to old asset not being able to remove themselves

  Show description for 5c1c097
  darylhedley

  committed
  5c1c097

  Copy full SHA for 5c1c097

Commits on Jun 4, 2015

• Changes the way the modal window overlays

  Show description for e56a1e8
  darylhedley

  committed
  e56a1e8

  Copy full SHA for e56a1e8

Commits on Jun 9, 2015

• Merge pull request #717 from adaptlearning/issue/#716

  Show description for be0a2be
  darylhedley

  committed
  be0a2be

  Copy full SHA for be0a2be

• Fixes #711

  darylhedley

  committed
  5cd333f

  Copy full SHA for 5cd333f

Commits on Jun 11, 2015

• Merge pull request #724 from adaptlearning/issue/#711

  Show description for 08e937c
  brian-learningpool

  committed
  08e937c

  Copy full SHA for 08e937c

Commits on Jul 1, 2015

• Removed console

  darylhedley

  committed
  3599edc

  Copy full SHA for 3599edc

• Merge pull request #714 from adaptlearning/issue/#713

  Show description for 4fdeed5
  darylhedley

  committed
  4fdeed5

  Copy full SHA for 4fdeed5

• Slight tidy-up of install/upgrade process

  Show description for 3ae623f
  brian-learningpool

  committed
  3ae623f

  Copy full SHA for 3ae623f

• Removed references to .grey

  Show description for a1faaab
  brian-learningpool

  committed
  a1faaab

  Copy full SHA for a1faaab

• Removed another two instances of .grey

  Show description for ece8297
  brian-learningpool

  committed
  ece8297

  Copy full SHA for ece8297

• Merge pull request #678 from adaptlearning/version-checking-on-bootstrap

  Show description for eceae14
  brian-learningpool

  committed
  eceae14

  Copy full SHA for eceae14

Commits on Jul 2, 2015

• Merge pull request #705 from hrajotia/travis_npm_issue

  Show description for 07c5e37
  brian-learningpool

  committed
  07c5e37

  Copy full SHA for 07c5e37

• Updated asset management template for when ffmpeg is not used

  Show description for 47d615d
  brian-learningpool

  committed
  47d615d

  Copy full SHA for 47d615d

• Merge pull request #710 from adaptlearning/feature/#709

  Show description for 0a22452
  brian-learningpool

  committed
  0a22452

  Copy full SHA for 0a22452

• Re-worked language string compilation

  Show description for 07ffe1f
  brian-learningpool

  committed
  07ffe1f

  Copy full SHA for 07ffe1f

• Added logging and error for when plugin structure is incorrect

  Show description for fc28dee
  brian-learningpool

  committed
  fc28dee

  Copy full SHA for fc28dee

Commits on Jul 3, 2015

• Merge pull request #731 from adaptlearning/improve-zip-handling

  Show description for dd5b4ab
  brian-learningpool

  committed
  dd5b4ab

  Copy full SHA for dd5b4ab

• Merge pull request #730 from adaptlearning/fix-language-string-json

  Show description for 4ee07f7
  brian-learningpool

  committed
  4ee07f7

  Copy full SHA for 4ee07f7

• Fixes #726 and #527

  Show description for 4f0ac4e
  brian-learningpool

  committed
  4f0ac4e

  Copy full SHA for 4f0ac4e

Commits on Jul 6, 2015

• Re-work to build

  Show description for b391209
  brian-learningpool

  committed
  b391209

  Copy full SHA for b391209

• Merge pull request #732 from adaptlearning/issue/725

  Show description for 400aa6f
  brian-learningpool

  committed
  400aa6f

  Copy full SHA for 400aa6f

• Fixes #679 -- Adds missing favicon

  brian-learningpool

  committed
  1b40f8b

  Copy full SHA for 1b40f8b

• Merge pull request #733 from adaptlearning/issue/679

  Show description for f98eac0
  brian-learningpool

  committed
  f98eac0

  Copy full SHA for f98eac0

Commits on Jul 7, 2015

• Updated error reporting

  darylhedley

  committed
  98051e8

  Copy full SHA for 98051e8

• Merge branch 'develop' into issue/#706

  Show description for 0554175
  darylhedley

  committed
  0554175

  Copy full SHA for 0554175

• Merge pull request #708 from adaptlearning/issue/#706

  Show description for 9853999
  brian-learningpool

  committed
  9853999

  Copy full SHA for 9853999

Commits on Jul 9, 2015

• Fixed issue with manipulated nested objects

  darylhedley

  committed
  77817a3

  Copy full SHA for 77817a3