Standardize

[digitaldybbuk]

Appinfo time is displayed via the use of the currentTimestamp(),
other locations will follow. Not totally complete yet.

[derrell]

There are a number of changes here that are in upstream swedev. Please fetch/merge upstream swedev, fix any resulting conflicts, push to github, and then issue a new pull request. That way, the pull request will contain only your change set, and will merge easily.

Thanks.

[digitaldybbuk]

Hmm so basically re fetch etc.. Because someone just made some changes and issued a pull request after mine is that what happened?

I'm gonna finish all date labels in the next two hours so should I issue it then?

Sent from my iPhone

On Dec 5, 2011, at 4:20 PM, Derrell Lipmanreply@reply.github.com wrote:

@@ -319,17 +327,7 @@ qx.Class.define("aiagallery.module.dgallery.appinfo.Gui",
new qx.ui.container.Composite(new qx.ui.layout.HBox(10));

    // Create a download button to allow to user to download the application

•    downloadBtn = 
  

•      new qx.ui.form.Button("Download",
  

- "qx/icon/Tango/16/apps/internet-download-manager.png");

•    // Makes download button smaller and centers it
  

•    downloadBtn.set(
  

•      {
  

•        maxWidth : 200,
  

•        alignX : "center"
  

- });

•    downloadBtn = new qx.ui.form.Button("Download", "qx/icon/Tango/16/apps/internet-download-manager.png");
  

There are a number of changes here that are in upstream swedev. Please fetch/merge upstream swedev, fix any resulting conflicts, push to github, and then issue a new pull request. That way, the pull request will contain only your change set, and will merge easily.

Thanks.

---

Reply to this email directly or view it on GitHub:
https://github.com/derrell/App-Inventor-Gallery/pull/225/files#r271245

[derrell]

Hmm so basically re fetch etc.. Because someone just made some changes and
issued a pull request after mine is that what happened?

No, the changes that your code overwrites are a few days old, so it looks
like you have somehow not properly merged upstream swedev.

Derrell