Bringing Evo back to life again

☆ A M B ☆
1,231 Posts

yama Reply #261, 14 years, 5 months ago

Quote from: Stefanie at Apr 12, 2012, 12:28 PM

We create a new branch on my sources and start to merge the changes of the Japanese community into this branch. This way we can test this changes, without touching the ongoing development.
After we got all that changes ready to go, we merge that 1.1.dev.japanese branch into the main 1.1.dev branch.

OK, it understood. I do my best.

222 Posts

Stefanie Reply #262, 14 years, 5 months ago

Merged Susans commits into branch 1.1.dev.

Thank you, Susan

I'm working on the unit tests for DocumentParser, DBAPI unit tests are finished.

I marked the method delete as deprecated, it does not do what one might think and is not used at all. But it may be in use by some extension.

Gone away and found a better place to stay

☆ A M B ☆
24,524 Posts

sottwell Reply #263, 14 years, 5 months ago

Is there a way to revoke a pull request?

Or can you roll your back to before you merged my branch? There's a stupid Javascript bug in the header.inc.php/template system.

https://github.com/sottwell/evolution/issues?sort=created&direction=desc&state=open&page=1 [ed. note: sottwell last edited this post 14 years, 5 months ago.]

Studying MODX in the desert - http://sottwell.com
Tips and Tricks from the MODX Forums and Slack Channels - http://modxcookbook.com
Join the Slack Community - http://modx.org

222 Posts

Stefanie Reply #264, 14 years, 5 months ago

Quote from: sottwell at Apr 13, 2012, 12:07 AM

Is there a way to revoke a pull request?

Or can you roll your back to before you merged my branch? There's a stupid Javascript bug in the header.inc.php/template system.

https://github.com/sottwell/evolution/issues?sort=created&direction=desc&state=open&page=1

Just change the code, push it, and file another pull. But I can accept new polls only in the evening, I''m on the road tl my job.

Gone away and found a better place to stay

☆ A M B ☆
24,524 Posts

sottwell Reply #265, 14 years, 5 months ago

It's just the header.inc.php file; if you just replace that with the original all is well again.

Studying MODX in the desert - http://sottwell.com
Tips and Tricks from the MODX Forums and Slack Channels - http://modxcookbook.com
Join the Slack Community - http://modx.org

☆ A M B ☆
1,231 Posts

yama Reply #266, 14 years, 5 months ago

Quote from: Stefanie at Apr 12, 2012, 12:28 PM

We create a new branch on my sources and start to merge the changes of the Japanese community into this branch. This way we can test this changes, without touching the ongoing development.
After we got all that changes ready to go, we merge that 1.1.dev.japanese branch into the main 1.1.dev branch.

Is here new branch?

222 Posts

Stefanie Reply #267, 14 years, 5 months ago

@Susan: Changed /manager/includes/header.inc.php back to version 1.0.6 in branch 1.1.dev

@yama: Here is the branch at https://github.com/sjstoelting/evolution/tree/1.1.dev.japanese. The branch includes the changes, that where done by Susan.

Gone away and found a better place to stay

☆ A M B ☆
1,231 Posts

yama Reply #268, 14 years, 5 months ago

Thanks, Stefanie.

https://github.com/sjstoelting/evolution/commit/4c11d8423d8f698ae415ad572047a4ddac2764ef
We wish to start from this point. (This is official 1.0.6 release point)

For example,

* mutate_content.dynamic.php
* mutate_templates.dynamic.php

These two files of difference are large.
To these two files, we have also improved a large number.

Thanks

222 Posts

Stefanie Reply #269, 14 years, 5 months ago

@yama: Yes, we can start with 1.0.6 as base, but than include your changes in that branch and afterwards we merge the changes done by Susan. In the end, it doesn't matter, which way we bring them together.

You wish 1.0.6 -> branch 1.1.dev.japanese <- merge 1.1.dev
What I thought was 1.0.6 -> branch 1.1.dev -> 1.1.dev.japanese

Both end up at the same point.

Gone away and found a better place to stay

☆ A M B ☆
1,231 Posts

yama Reply #270, 14 years, 5 months ago

OK, Stefanie