Please create a patch against the "next" branch that I can merge.

Also, please review your other commits and create a clean branch against "next" with them, because I cannot even merge the first commit without having conflicts:

[root@rice-oxley ipfire-2.x (next)]# git merge a6cafac8d4b27e01729f2384ba03c33e91dfc944 Auto-merging langs/en/cgi-bin/en.pl Auto-merging langs/de/cgi-bin/de.pl Auto-merging html/html/themes/maniac/include/functions.pl CONFLICT (content): Merge conflict in html/html/themes/maniac/include/functions.pl Auto-merging html/html/themes/ipfire/include/functions.pl CONFLICT (content): Merge conflict in html/html/themes/ipfire/include/functions.pl Removing html/html/images/updbooster/updxl-yl.gif Removing html/html/images/updbooster/updxl-rd.gif Removing html/html/images/updbooster/updxl-led-yellow.gif Removing html/html/images/updbooster/updxl-led-red.gif Removing html/html/images/updbooster/updxl-led-green.gif Removing html/html/images/updbooster/updxl-led-gray.gif Removing html/html/images/updbooster/updxl-led-blue.gif Removing html/html/images/updbooster/updxl-gr.gif Removing html/html/images/updbooster/updxl-globe.gif Auto-merging html/cgi-bin/updatexlrator.cgi CONFLICT (content): Merge conflict in html/cgi-bin/updatexlrator.cgi Automatic merge failed; fix conflicts and then commit the result.

Michael

On Tue, 2013-04-09 at 15:52 +0200, Jörn-Ingo Weigert wrote:

here are the List what should be updated

/srv/web/ipfire/cgi-bin/updatexlrator.cgi /srv/web/ipfire/html/themes/ipfire/images/updxl-icons.gif /srv/web/ipfire/html/themes/ipfire/include/updxlr.css

/srv/web/ipfire/html/themes/maniac/images/updxl-icons.gif

/srv/web/ipfire/html/themes/ipfire/maniac/updxlr.css

and the actual images from:

/srv/web/ipfire/images/updbooster/updxlr-src-*.gif

greets Ingo

2013/4/9 Michael Tremer michael.tremer@ipfire.org Hey,

    I am gonna merge those changes for core update 68. Could you
    please
    check if all changes files are in the core update's filelist
    (config/rootfiles/core/68/...)?

    Please also make sure, that all rootfiles are up to date, so
    no files
    will be missing in the install images.

    Michael

    _______________________________________________
    Development mailing list
    Development@lists.ipfire.org
    http://lists.ipfire.org/mailman/listinfo/development

Where is it?

On Thu, 2013-04-11 at 06:02 +0200, Jörn-Ingo Weigert wrote:

Hope, I've done it the right way. ;-)

Here is the branch based on and be merged into origin/next.

Kind regards,

jiweigert

2013/4/9 Michael Tremer michael.tremer@ipfire.org Hey,

    I am gonna merge those changes for core update 68. Could you
    please
    check if all changes files are in the core update's filelist
    (config/rootfiles/core/68/...)?

    Please also make sure, that all rootfiles are up to date, so
    no files
    will be missing in the install images.

    Michael

    _______________________________________________
    Development mailing list
    Development@lists.ipfire.org
    http://lists.ipfire.org/mailman/listinfo/development

Hi,

here is a list of bugs that are still to be fixed.

Overall the changes look good and everything is still working as far as I can see.

Screenshot #1:

The cache statistic overview is empty when there are not files in the cache. Instead of a blank page, a short message should be shown that there is nothing to see until there is at least one file in the cache.

Screenshot #2:

The sources are a mess. Use a table for that.

Screenshot #3:

At least one radio button should be checked for the default view (Standard-Ansicht).

Screenshot #4:

The status headline is very very hard to read. This is also the case for some other headlines.

Screenshot #5:

The size is displayed in bytes. When clicking the trash button, the download is not canceled (which is what I expected). However, the file does not show up in the cache after it has been downloaded.

Various other problems:

IPFire is spelled like this: IPFire. Not Ipfire. Please check the correct spelling for the other sources as well.

There is still the GET problem, which needs to be solved, but not in the way as it was suggested earlier.

-Michael

On Thu, 2013-04-25 at 13:42 +0200, Jörn-Ingo Weigert wrote:

Arrgh,

here : http://git.ipfire.org/?p=people/jiweigert/ipfire-2.x.git;a=shortlog;h=refs/h...

2013/4/25 Michael Tremer michael.tremer@ipfire.org Where is it?

    On Thu, 2013-04-11 at 06:02 +0200, Jörn-Ingo Weigert wrote:
    > Hope, I've done it the right way. ;-)
    >
    >
    > Here is the branch based on and be merged into origin/next.
    >
    >
    > Kind regards,
    >
    >
    > jiweigert
    >
    >
    >
    > 2013/4/9 Michael Tremer <michael.tremer@ipfire.org>
    >         Hey,
    >
    >         I am gonna merge those changes for core update 68.
    Could you
    >         please
    >         check if all changes files are in the core update's
    filelist
    >         (config/rootfiles/core/68/...)?
    >
    >         Please also make sure, that all rootfiles are up to
    date, so
    >         no files
    >         will be missing in the install images.
    >
    >         Michael
    >
    >         _______________________________________________
    >         Development mailing list
    >         Development@lists.ipfire.org
    >         http://lists.ipfire.org/mailman/listinfo/development
    >
    >