Fixing bug 274 #29

Closed
wants to merge 69 commits into
from

Projects

None yet

5 participants

@bretdawson
Contributor

Hi everybody,

This just adds a little more "fucktyping," to handle situations where the thumbnail and original images have different output channels.

Thanks,

Bret

theory and others added some commits Apr 11, 2010
@theory theory Increment version to 2.0.1. 0856761
@theory theory Tweak Changes. c1544a0
@theory theory Put the 2.0.1 header in the right place. f645daa
@theory theory Merge 1.10 changes. 843c950
@theory theory 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.
0266194
@theory theory 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.
182dbfd
@theory theory Add "object" date format.
This is so that one can easily get a DateTime object for a date value,
rather than a string.
fc9374f
@theory theory Move change to proper place. 3c17c86
@theory theory Remove redundant line. fc9d361
@rolfm @theory rolfm Fixed SFTP mover bug that would leave escaped tmp files on the destin…
…ation server.
2983408
@theory theory 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.
e3e528c
@theory theory 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.
0b6ef0e
@theory theory Only pass key and auth information if provided. 113b752
@theory theory Work around Net::SSH2 socket bug. 06d0f77
@theory theory Support Apache MPMs other than prefork.
[#188 state:resolved]
ea4c643
@theory theory Preven Net::FTPServer limits.
They lead to mysterious crashes.
c9fd33a
@theory theory Fix thinko: s/burn_another/publish_another/g 3b0537c
@theory theory exclude .gitignore from exports. 52e6ddc
@theory theory 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
9e4a1af
@theory Kahil Jallad Fix for checkout button showing regardless of perms 5fbe52e
@theory theory Credit kjallad.
Conflicts:

	lib/Bric/Changes.pod
f1e575f
@theory theory Use Kahil's full name. 0457aab
@theory theory Sync changes with master. 374a290
@theory theory Fix POD nerble. 5d325ac
@theory theory 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
e764714
@theory theory Fix for displaying desk asset counts. (Bug #198)
From commit e317d9b by Marshall Roch and Alex Howarth.

Conflicts:

	lib/Bric/Changes.pod
5865876
@gregheo @theory gregheo Fix for keyword autocomplete (Bug #206) af37917
@gregheo @theory gregheo Fix for date checking on asset search (Bug #211) fe25f92
@theory theory 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.
48df296
@theory theory Remove irrelevant changes.
These apply only to 2.1.0, not 2.0.1, which is what is in this branch.
c7c9593
@theory theory Skip SFTP tests if Net:SSH2 not installed. b2c1721
@theory theory Restore bug fix change note. df44209
@theory theory 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].
7d9e377
@theory theory Give credit where credit is due. 657ce14
@theory theory New URL for FCKeditor. 86db2f3
@theory Phillip Smith Fix placement of Publish/Checkout buttons in their bounding box.
[#194 state:resolved]
d57c3da
@theory theory Typos. 7dd762e
@theory theory Find Apache 2 `Include`d conf files by relative path.
[#174 state:resolved]
909f8eb
@gregheo @theory gregheo Fix for id param on related story lists.
[#183 state:resolved]
9169d3b
@nlegg @theory nlegg Fixed a typo: put_res() and del_res() now call the correct method. 11ca5ab
@theory Phillip Smith Fixed styling of popup menu for Check In and Move actions.
[#193 state:resolved]
82c0988
@theory Phillip Smith Fix for Xinha editor when using the Creat Link button (which was prev…
…iously hidden, not it shows). [#180 state:resolved] [Phillip Smith]
f8a3146
@theory theory Credit Phillip. c60c158
@theory theory 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].
d0f1cb6
@theory theory Note the fix to the sorting of content type. d54b7aa
@theory Phillip Smith Fix to limit the length of category descriptions (Bug #215). [Phillip…
… Smith] [#215 state:resolved]
8392470
@theory theory Credit where credit is due. 3e72e76
@theory theory 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]
84b739a
@theory theory Note autocomplete memory improvement. 97be5c5
@theory theory Initially hide the dialog box.
Broken in 76bc8da.
4e7eaff
@theory theory 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]
4008864
@theory theory Note template reactivation fix. 217bc40
@theory theory Show template subelement keys in view mode, too.
[#228 state:resolved]
76907fd
@theory theory Note addition of subelements to template view. e123b7a
@gregheo @theory gregheo Return only active subelements (bug #230) b905326
@theory theory Credit Greg with the deactivated element type fix. 5549492
@nlegg @theory nlegg Fixed #201: Deactived assets still have "Republish" checkbox in UI wh…
…en using "Find Stories"
e85e210
@theory theory Note disabling of publish checkbox for disabled assets. 45b0c0f
@theory theory Credit Nick. 270b2fd
@theory theory Make media category browser buttons work again.
Complements 6c8f371, which did the same
for stories. Thanks to Herring for the spot!
d2238d8
@theory theory Thanks Michael Herring. 7b55a86
@theory Zdravko Balorda 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.
bdb2e6a
@theory theory Credit Zdravko Balorda for fixing Bug # 212.
[#212 state:resolved]
a98bc7d
@bretdawson bretdawson Added date and changed version to 2.0.1. c0772dd
@bretdawson bretdawson Merge branch 'rev-2.0' of git://github.com/bricoleurs/bricolage
Conflicts:
	README
	inst/versions.txt
	lib/Bric.pm
	lib/Bric/Changes.pod
922347f
@bretdawson bretdawson Merge branch 'master' of git://github.com/bricoleurs/bricolage 40eced6
@bretdawson bretdawson Bringing local repo up to date. 77211b7
@bretdawson bretdawson Merge branch 'master' of git://github.com/bricoleurs/bricolage
Conflicts:
	comp/widgets/summary/template_meta.html
	lib/Bric/Changes.pod
b9b13a7
@bretdawson bretdawson Forcing find_or_create_alternate() to use the URI format of the
OC of the target element type.
9ee4841
@theory
Member
theory commented Jul 15, 2011

WTF? There are a shit-ton of commits here. Which one(s) are you referring to?

@bretdawson
Contributor

Just this one:

bretdawson@9ee4841

Obviously I have a lot to learn about git. Sorry.

@bretdawson bretdawson closed this Jul 26, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment