Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing bug 274 #29

Closed
wants to merge 69 commits into from
Closed

Fixing bug 274 #29

wants to merge 69 commits into from

Commits on Apr 11, 2010

  1. Increment version to 2.0.1.

    theory committed Apr 11, 2010
    Copy the full SHA
    0856761 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2010

  1. Tweak Changes.

    theory committed Apr 12, 2010
    Copy the full SHA
    c1544a0 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    f645daa View commit details
    Browse the repository at this point in the history
  3. Merge 1.10 changes.

    theory committed Apr 12, 2010
    Copy the full SHA
    843c950 View commit details
    Browse the repository at this point in the history
  4. Fix Bric::Util::ApacheReq test failures.

    Fixe bug in the Bric::Util::ApacheReq tests where they would fail if the
    `LISTEN_PORT` or `SSL_PORT` `bricolage.conf` directives were anything other
    than 80 and 443, respectively. Thanks to Héctor Daniel Cortés González for the
    report.
    theory committed Apr 12, 2010
    Copy the full SHA
    0266194 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2010

  1. Add SKIP_SSL_REDIRECT directive.

    This directive prevents Bricolage from redirecting to and from an SSL URL when
    `SSL_ENABLE` is turned on. The case for this is when Bricolage is running
    behind a reverse proxy server that's handling SSL mappsings. Thanks to Alex
    Krohn for the report.
    theory committed Apr 14, 2010
    Copy the full SHA
    182dbfd View commit details
    Browse the repository at this point in the history

Commits on May 7, 2010

  1. Add "object" date format.

    This is so that one can easily get a DateTime object for a date value,
    rather than a string.
    theory committed May 7, 2010
    Copy the full SHA
    fc9374f View commit details
    Browse the repository at this point in the history
  2. Move change to proper place.

    theory committed May 7, 2010
    Copy the full SHA
    3c17c86 View commit details
    Browse the repository at this point in the history
  3. Remove redundant line.

    theory committed May 7, 2010
    Copy the full SHA
    fc9d361 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2010

  1. Fixed SFTP mover bug that would leave escaped tmp files on the destin…

    …ation server.
    rolfm authored and theory committed Jun 5, 2010
    Copy the full SHA
    2983408 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2010

  1. Refactor Bric::Util::Trans::SFTP.

    It was a bit of a mess. Much of the code was unnecessary, dating from before
    2.0 when it used Net::SFTP instead of Net::SSH2. As a result, the error
    handling was all wrong.
    
    While at it, remove the file name escaping, as with newer versions of
    Net::SSH2 at least (or perhaps newer versions of libssh2), it was leaving the
    backslashes in the file names on the destination server. So bump up the
    minimum version of Net::SSH2.
    
    For sanity, also add tests to make sure that Net::Util::Trans::SFTP and
    Net::Util::Trans::SFTP compile and have apprpropriate interfaces.
    theory committed Jul 6, 2010
    Copy the full SHA
    e3e528c View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2010

  1. Don't deactivate assets while updating via SOAP.

    I've no idea why they were able temporarily disabled to begin with. Seemed an
    unnecessary defense against something or other. And the downside was
    discovered with the addition of the `EXPIRE_ON_DEACTIVATE` directive:
    assets were getting expired every time they were updated via SOAP! So
    change the code to only activate or deactivate if requested.
    theory committed Jul 7, 2010
    Copy the full SHA
    0b6ef0e View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2010

  1. Copy the full SHA
    113b752 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2010

  1. Copy the full SHA
    06d0f77 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2010

  1. Support Apache MPMs other than prefork.

    [#188 state:resolved]
    theory committed Jul 29, 2010
    Copy the full SHA
    ea4c643 View commit details
    Browse the repository at this point in the history
  2. Preven Net::FTPServer limits.

    They lead to mysterious crashes.
    theory committed Jul 29, 2010
    Copy the full SHA
    c9fd33a View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    3b0537c View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2010

  1. Copy the full SHA
    52e6ddc View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2010

  1. Use currently-checked out asset for diff.

    If the "to" choice is the same version as the currently-checked out version,
    use the currently-checked out representation. This is so we can see changes
    since the checkout.
    
    This is not ideal, frankly, as it's a bit magical. We should consider
    modifying the functionality for 2.2 so that there is another choice for
    currently-checked out items, "Current version" or something. When that's
    selected, the currently-checked out version should be used (for "to" or
    "from"). Otherwise, use the checked-in version. I think this would be less
    surprising.
    
    Conflicts:
    
    	lib/Bric/Changes.pod
    theory committed Nov 2, 2010
    Copy the full SHA
    9e4a1af View commit details
    Browse the repository at this point in the history
  2. Fix for checkout button showing regardless of perms

    Kahil Jallad authored and theory committed Nov 2, 2010
    Copy the full SHA
    5fbe52e View commit details
    Browse the repository at this point in the history
  3. Credit kjallad.

    Conflicts:
    
    	lib/Bric/Changes.pod
    theory committed Nov 2, 2010
    Copy the full SHA
    f1e575f View commit details
    Browse the repository at this point in the history
  4. Use Kahil's full name.

    theory committed Nov 2, 2010
    Copy the full SHA
    0457aab View commit details
    Browse the repository at this point in the history
  5. Sync changes with master.

    theory committed Nov 2, 2010
    Copy the full SHA
    374a290 View commit details
    Browse the repository at this point in the history
  6. Fix POD nerble.

    theory committed Nov 2, 2010
    Copy the full SHA
    5d325ac View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2010

  1. Fixed bug in bric_ftpd where the ftp PWD command returns an incorrect

    path (missing the site name).  Some ftp clients (eg. FileZilla) call PWD
    and use this path after changing directories.
    
    Conflicts:
    
    	lib/Bric/Changes.pod
    theory committed Nov 5, 2010
    Copy the full SHA
    e764714 View commit details
    Browse the repository at this point in the history
  2. Fix for displaying desk asset counts. (Bug #198)

    From commit e317d9b by Marshall Roch and Alex Howarth.
    
    Conflicts:
    
    	lib/Bric/Changes.pod
    theory committed Nov 5, 2010
    Copy the full SHA
    5865876 View commit details
    Browse the repository at this point in the history
  3. Fix for keyword autocomplete (Bug #206)

    gregheo authored and theory committed Nov 5, 2010
    Copy the full SHA
    af37917 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    fe25f92 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2010

  1. Don't update publish status on publish failure.

    Or, more specifically, revert it to what it was before. If a story hasn't been
    published before, then on publish failure the publish status will be false and
    the publish date and first publishd date will be `undef`. If it *has* been
    published before, then the publish date will not be udpated. This has been an
    issue for a long time, so I'll backpatch all the way to 1.10.x.
    theory committed Dec 2, 2010
    Copy the full SHA
    48df296 View commit details
    Browse the repository at this point in the history
  2. Remove irrelevant changes.

    These apply only to 2.1.0, not 2.0.1, which is what is in this branch.
    theory committed Dec 2, 2010
    Copy the full SHA
    c7c9593 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    b2c1721 View commit details
    Browse the repository at this point in the history
  4. Restore bug fix change note.

    theory committed Dec 2, 2010
    Copy the full SHA
    df44209 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2010

  1. Fix Xinha.

    Update the JavaScript code to only load the editors when they're made visible.
    This is a little fragile, since if we change the structure of the HTML at all,
    we'll need to make sure that the Xinha code is updated to take advantage of
    the new structure. That is, CSS selectors passed to `Element.select()` would
    need to be updated.
    
    Not sure if htmlArea or FCKEditor need to be updated, as well. [#217 state:resolved].
    theory committed Dec 9, 2010
    Copy the full SHA
    7d9e377 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    657ce14 View commit details
    Browse the repository at this point in the history
  3. New URL for FCKeditor.

    theory committed Dec 9, 2010
    Copy the full SHA
    86db2f3 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2011

  1. Fix placement of Publish/Checkout buttons in their bounding box.

    [#194 state:resolved]
    Phillip Smith authored and theory committed Jan 17, 2011
    Copy the full SHA
    d57c3da View commit details
    Browse the repository at this point in the history
  2. Typos.

    theory committed Jan 17, 2011
    Copy the full SHA
    7dd762e View commit details
    Browse the repository at this point in the history
  3. Find Apache 2 Included conf files by relative path.

    [#174 state:resolved]
    theory committed Jan 17, 2011
    Copy the full SHA
    909f8eb View commit details
    Browse the repository at this point in the history
  4. Fix for id param on related story lists.

    [#183 state:resolved]
    gregheo authored and theory committed Jan 17, 2011
    Copy the full SHA
    9169d3b View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    11ca5ab View commit details
    Browse the repository at this point in the history
  6. Fixed styling of popup menu for Check In and Move actions.

    [#193 state:resolved]
    Phillip Smith authored and theory committed Jan 17, 2011
    Copy the full SHA
    82c0988 View commit details
    Browse the repository at this point in the history
  7. Fix for Xinha editor when using the Creat Link button (which was prev…

    …iously hidden, not it shows). [#180 state:resolved] [Phillip Smith]
    Phillip Smith authored and theory committed Jan 17, 2011
    Copy the full SHA
    f8a3146 View commit details
    Browse the repository at this point in the history
  8. Credit Phillip.

    theory committed Jan 17, 2011
    Copy the full SHA
    c60c158 View commit details
    Browse the repository at this point in the history
  9. Properly sort by Content Type in Element Type manager

    Done by adding a new `my_meths` key in Bric::Biz::ElementType that returns the
    name. This is to avoid transforming the element type business class ID in
    listManager, because that transformation happens before the value is
    transformed. [#190 state:resolved].
    theory committed Jan 17, 2011
    Copy the full SHA
    d0f1cb6 View commit details
    Browse the repository at this point in the history
  10. Copy the full SHA
    d54b7aa View commit details
    Browse the repository at this point in the history
  11. Fix to limit the length of category descriptions (Bug #215). [Phillip…

    … Smith] [#215 state:resolved]
    Phillip Smith authored and theory committed Jan 17, 2011
    Copy the full SHA
    8392470 View commit details
    Browse the repository at this point in the history
  12. Credit where credit is due.

    theory committed Jan 17, 2011
    Copy the full SHA
    3e72e76 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2011

  1. Restore category recall to new asset pages.

    Before we had autocompletion of categories in the New Story/Media/Template
    profiles, it used to be that they would remember the last category selected
    when you go to create a new document. That was lost; so restore it.
    
    Done by adding a new widget, `comp/widgets/profile/autocomplete.mc`, which
    munges the memorization code from the `select_object` widget with the simple
    population of a text filed in `text.mc`. Also a callback that handles
    remembering the value when a form is submitted. That callback, of course, is
    Bric::App::Callback::Autopopulate.
    
    [#159 state:resolved]
    theory committed Jan 18, 2011
    Copy the full SHA
    84b739a View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    97be5c5 View commit details
    Browse the repository at this point in the history
  3. Initially hide the dialog box.

    Broken in 76bc8da.
    theory committed Jan 18, 2011
    Copy the full SHA
    4e7eaff View commit details
    Browse the repository at this point in the history
  4. Don't reactivate element template when creating category template.

    Done by adding `tplate_type` to the search for existing templates. Needed to
    add support for that parameter to `Bric::Bus::Asset::Template->list()`.
    [#195 state:resolved]
    theory committed Jan 18, 2011
    Copy the full SHA
    4008864 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    217bc40 View commit details
    Browse the repository at this point in the history
  6. Show template subelement keys in view mode, too.

    [#228 state:resolved]
    theory committed Jan 18, 2011
    Copy the full SHA
    76907fd View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    e123b7a View commit details
    Browse the repository at this point in the history
  8. Return only active subelements (bug #230)

    gregheo authored and theory committed Jan 18, 2011
    Copy the full SHA
    b905326 View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    5549492 View commit details
    Browse the repository at this point in the history
  10. Fixed #201: Deactived assets still have "Republish" checkbox in UI wh…

    …en using "Find Stories"
    nlegg authored and theory committed Jan 18, 2011
    Copy the full SHA
    e85e210 View commit details
    Browse the repository at this point in the history
  11. Copy the full SHA
    45b0c0f View commit details
    Browse the repository at this point in the history
  12. Credit Nick.

    theory committed Jan 18, 2011
    Copy the full SHA
    270b2fd View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2011

  1. Make media category browser buttons work again.

    Complements 6c8f371, which did the same
    for stories. Thanks to Herring for the spot!
    theory committed Jan 26, 2011
    Copy the full SHA
    d2238d8 View commit details
    Browse the repository at this point in the history
  2. Thanks Michael Herring.

    theory committed Jan 26, 2011
    Copy the full SHA
    7b55a86 View commit details
    Browse the repository at this point in the history
  3. Fix #212: OC lists for media and story follows site context

    This is a suggested fix as Phillip asked. In Bricolage 2.0 stories
    and media profiles listed all output channels for users to associate
    their documents, instead of only OC associated to the working site only.
    Zdravko Balorda authored and theory committed Jan 26, 2011
    Copy the full SHA
    bdb2e6a View commit details
    Browse the repository at this point in the history
  4. Credit Zdravko Balorda for fixing Bug # 212.

    [#212 state:resolved]
    theory committed Jan 26, 2011
    Copy the full SHA
    a98bc7d View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2011

  1. Copy the full SHA
    c0772dd View commit details
    Browse the repository at this point in the history
  2. Merge branch 'rev-2.0' of git://github.com/bricoleurs/bricolage

    Conflicts:
    	README
    	inst/versions.txt
    	lib/Bric.pm
    	lib/Bric/Changes.pod
    bretdawson committed Feb 6, 2011
    Copy the full SHA
    922347f View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2011

  1. Copy the full SHA
    40eced6 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2011

  1. Copy the full SHA
    77211b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2011

  1. Merge branch 'master' of git://github.com/bricoleurs/bricolage

    Conflicts:
    	comp/widgets/summary/template_meta.html
    	lib/Bric/Changes.pod
    bretdawson committed Jul 12, 2011
    Copy the full SHA
    b9b13a7 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2011

  1. Forcing find_or_create_alternate() to use the URI format of the

    OC of the target element type.
    bretdawson committed Jul 15, 2011
    Copy the full SHA
    9ee4841 View commit details
    Browse the repository at this point in the history