[ckan-changes] [ckan/ckan] 375264: [#1550] Merge the merge and attached states into f...

[GitHub]

  Branch: refs/heads/1550-what-file-did-i-upload
  Home:   https://github.com/ckan/ckan
  Commit: 375264e28404e998f35dcf1aa878d9dd9edccdfc
      https://github.com/ckan/ckan/commit/375264e28404e998f35dcf1aa878d9dd9edccdfc
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1550] Merge the merge and attached states into filled state

They're the same now.


  Commit: 9ab79cf7c85d6877ee8f410ab2ed832908ba1f67
      https://github.com/ckan/ckan/commit/9ab79cf7c85d6877ee8f410ab2ed832908ba1f67
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1550] Refactor the state machine into a simpler architecture

We just have two states now, so we can simplify stuff.


  Commit: 5137d6e06693d0fbe954705ef608c5877d992d5e
      https://github.com/ckan/ckan/commit/5137d6e06693d0fbe954705ef608c5877d992d5e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1550] Initialize correctly the status of the image-upload


  Commit: 1d43bc7bbce3b16d6f2de580adfce54ccf6ce97d
      https://github.com/ckan/ckan/commit/1d43bc7bbce3b16d6f2de580adfce54ccf6ce97d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1550] Remove "Remove" button, as we now only use the "X" at the input


Compare: https://github.com/ckan/ckan/compare/03d8d70dd226...1d43bc7bbce3