Merge lp://staging/~edb/quam-plures/uncripple_file_manager into lp://staging/quam-plures

Proposed by EdB
Status: Merged
Merged at revision: 7629
Proposed branch: lp://staging/~edb/quam-plures/uncripple_file_manager
Merge into: lp://staging/quam-plures
Diff against target: 495 lines (+184/-214)
6 files modified
qp_inc/files/files.ctrl.php (+1/-2)
qp_inc/files/views/_file_browse.view.php (+44/-60)
qp_inc/files/views/_file_list.inc.php (+134/-147)
qp_inc/items/model/_item.funcs.php (+2/-2)
qp_inc/items/views/_item_expert.form.php (+2/-2)
qp_inc/items/views/_item_links.view.php (+1/-1)
To merge this branch: bzr merge lp://staging/~edb/quam-plures/uncripple_file_manager
Reviewer Review Type Date Requested Status
Kimberly (community) Approve
Tilman Blumenbach (community) Approve
Review via email: mp+72223@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Kimberly (kimberly-netweb360) wrote :

This does take us back. The browse window at the bottom where you choose title shows "no caption".

I noticed the work you did to have the ability to see the title and caption by mousing over is gone. Will that be added back at some time?

Revision history for this message
EdB (edb) wrote :

Each of those items is a different branch. The problem is that nothing going into merge is getting code review or testing or merged, so "solved" issues remain unsolved as far as the core is concerned. Which is why I use "core plus branches".

Revision history for this message
Kimberly (kimberly-netweb360) wrote :

OK, I have never really understood how the branch thing works. What do I need to do to help? Do we need to merge this branch and then others. I know I have been lax on helping with testing. I tested this branch and the file manager in a pop-up appears to be working, I uploaded a file with it, inserted in in a post, Inserted several images using different floats and caption/title options and so no obvious flaws other than it is adding the center as well as the float to the class, as in "floatleft center"

Just educate me a bit more on what I need to be doing and I will try my best to do more.

Revision history for this message
EdB (edb) wrote :

I just tried a quick forum post about branching, but basically each branch is all-by-itself until merging happens. So problems fixed in another branch won't be here until that other branch is merged AND this branch author updates this branch.

For purposes of testing a branch do like you did: test the branch according to what IT says it is, and be damned with all other problems that may or may not have branches that address them.

7614. By EdB

core to 7614

Revision history for this message
Tilman Blumenbach (tblue) wrote :

This looks fine as well. :)

review: Approve
7615. By EdB

core up to 7618

7616. By EdB

core to 7620

7617. By EdB

core to 7624

Revision history for this message
Kimberly (kimberly-netweb360) wrote :

Function and display works and looks as expected. No problems found.

review: Approve
Revision history for this message
EdB (edb) wrote :

I am adding core updates AND retesting everything I have in merge just to be sure, but it is taking a long time due to many conflicts this time around. Will send another comment when I got them back up to speed.

7618. By EdB

core to 7628

Revision history for this message
EdB (edb) wrote :

Okay cool. This one is good to go - no issues when re-testing after merging from core.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches