Skip to main content ↑ ↓
1.0.5 time to pack! Started by emanuele · · Read 5645 times 0 Members and 1 Guest are viewing this topic. previous topic - next topic

1.0.5 time to pack!

Okay, as usual we are a little bit late with the actual release... :P
I don't see any blocker for the release, so it's all about writing down the release notes and do the packaging! 8)
Bugs creator.
Features destroyer.
Template killer.

Re: 1.0.5 time to pack!

Reply #1 –

Happy days! I was about to start something, but I'll wait for the package :D

Re: 1.0.5 time to pack!

Reply #2 –

Just check the bug reports board, see if there is still something that can be thrown into it and if you didn't forget anything, such as http://www.elkarte.net/community/index.php?topic=2896.0 etc
No smileys today, sorry if I sound rude (I don't mean to, if I do), pretty sh!tty day over here, VERY sh!tty.
~ SimplePortal Support Team ~

Re: 1.0.5 time to pack!

Reply #3 –

Bah!   I'm done fixing bugs for 1.0.5!

Re: 1.0.5 time to pack!

Reply #4 –

...Any dislike message button? >_<
Last Edit: September 11, 2015, 09:32:53 pm by Flavio93Zena
~ SimplePortal Support Team ~

Re: 1.0.5 time to pack!

Reply #5 –

As I said there is nothing worth fixing for me, sorry.
The alt+s has been terribly broken for years, now is slightly broken and it relates to javascript, so if I have to look into it, it will have to wait for a while. ;)
Bugs creator.
Features destroyer.
Template killer.

Re: 1.0.5 time to pack!

Reply #6 –

And bring that patch to 1.1 will be... interesting:
Code: [Select]
Auto-merging themes/default/scripts/topic.js
CONFLICT (content): Merge conflict in themes/default/scripts/topic.js
Auto-merging themes/default/scripts/theme.js
CONFLICT (content): Merge conflict in themes/default/scripts/theme.js
Auto-merging themes/default/scripts/suggest.js
Auto-merging themes/default/scripts/script.js
CONFLICT (content): Merge conflict in themes/default/scripts/script.js
Auto-merging themes/default/scripts/like_posts.js
CONFLICT (content): Merge conflict in themes/default/scripts/like_posts.js
Auto-merging themes/default/scripts/jquery.sceditor.elkarte.js
Auto-merging themes/default/scripts/elk_jquery_plugins.js
Auto-merging themes/default/scripts/elk_jquery_embed.js
Auto-merging themes/default/languages/english/index.english.php
Auto-merging themes/default/languages/english/Help.english.php
Auto-merging themes/default/index.template.php
CONFLICT (content): Merge conflict in themes/default/index.template.php
Auto-merging themes/default/css/rtl.css
Auto-merging themes/default/css/index.css
CONFLICT (content): Merge conflict in themes/default/css/index.css
Removing themes/default/css/font-awesome.css
Auto-merging themes/default/css/_light/index_light.css
CONFLICT (content): Merge conflict in themes/default/css/_light/index_light.css
Auto-merging themes/default/css/_besocial/jquery.sceditor.elk_wiz_besocial.css
Auto-merging themes/default/css/_besocial/index_besocial.css
CONFLICT (content): Merge conflict in themes/default/css/_besocial/index_besocial.css
Auto-merging themes/default/Register.template.php
CONFLICT (content): Merge conflict in themes/default/Register.template.php
Auto-merging themes/default/Memberlist.template.php
CONFLICT (content): Merge conflict in themes/default/Memberlist.template.php
Auto-merging themes/default/ManageBoards.template.php
CONFLICT (content): Merge conflict in themes/default/ManageBoards.template.php
Auto-merging themes/default/GenericBoards.template.php
CONFLICT (content): Merge conflict in themes/default/GenericBoards.template.php
Auto-merging themes/default/Display.template.php
CONFLICT (content): Merge conflict in themes/default/Display.template.php
Auto-merging themes/default/Admin.template.php
CONFLICT (content): Merge conflict in themes/default/Admin.template.php
Auto-merging sources/subs/Topic.subs.php
CONFLICT (content): Merge conflict in sources/subs/Topic.subs.php
CONFLICT (modify/delete): sources/subs/ScheduledTask.class.php deleted in HEAD and modified in patch_1-0-5. Version patch_1-0-5 of sources/subs/ScheduledTask.class.php left in tree.
Auto-merging sources/subs/Profile.subs.php
CONFLICT (content): Merge conflict in sources/subs/Profile.subs.php
Auto-merging sources/subs/Post.subs.php
CONFLICT (content): Merge conflict in sources/subs/Post.subs.php
Auto-merging sources/subs/PersonalMessage.subs.php
CONFLICT (content): Merge conflict in sources/subs/PersonalMessage.subs.php
Auto-merging sources/subs/Messages.subs.php
CONFLICT (content): Merge conflict in sources/subs/Messages.subs.php
Auto-merging sources/subs/Mentions.subs.php
CONFLICT (content): Merge conflict in sources/subs/Mentions.subs.php
Auto-merging sources/subs/Members.subs.php
CONFLICT (content): Merge conflict in sources/subs/Members.subs.php
Auto-merging sources/subs/Likes.subs.php
CONFLICT (content): Merge conflict in sources/subs/Likes.subs.php
Auto-merging sources/subs/Drafts.subs.php
CONFLICT (content): Merge conflict in sources/subs/Drafts.subs.php
Auto-merging sources/subs/Cache.subs.php
CONFLICT (content): Merge conflict in sources/subs/Cache.subs.php
Auto-merging sources/subs/Boards.subs.php
CONFLICT (content): Merge conflict in sources/subs/Boards.subs.php
Auto-merging sources/ext/bad-behavior/badbehavior-plugin.php
CONFLICT (content): Merge conflict in sources/ext/bad-behavior/badbehavior-plugin.php
Auto-merging sources/controllers/Xmlpreview.controller.php
CONFLICT (content): Merge conflict in sources/controllers/Xmlpreview.controller.php
Auto-merging sources/controllers/Register.controller.php
CONFLICT (content): Merge conflict in sources/controllers/Register.controller.php
Auto-merging sources/controllers/ProfileAccount.controller.php
CONFLICT (content): Merge conflict in sources/controllers/ProfileAccount.controller.php
Auto-merging sources/controllers/Post.controller.php
CONFLICT (content): Merge conflict in sources/controllers/Post.controller.php
Auto-merging sources/controllers/PersonalMessage.controller.php
CONFLICT (content): Merge conflict in sources/controllers/PersonalMessage.controller.php
Auto-merging sources/controllers/Memberlist.controller.php
CONFLICT (content): Merge conflict in sources/controllers/Memberlist.controller.php
Auto-merging sources/controllers/Groups.controller.php
CONFLICT (content): Merge conflict in sources/controllers/Groups.controller.php
Auto-merging sources/controllers/Display.controller.php
CONFLICT (content): Merge conflict in sources/controllers/Display.controller.php
Auto-merging sources/admin/Reports.controller.php
CONFLICT (content): Merge conflict in sources/admin/Reports.controller.php
Auto-merging sources/admin/Packages.controller.php
CONFLICT (content): Merge conflict in sources/admin/Packages.controller.php
Auto-merging sources/admin/ManageRegistration.controller.php
CONFLICT (content): Merge conflict in sources/admin/ManageRegistration.controller.php
Auto-merging sources/admin/ManagePosts.controller.php
CONFLICT (content): Merge conflict in sources/admin/ManagePosts.controller.php
Auto-merging sources/admin/ManageNews.controller.php
CONFLICT (content): Merge conflict in sources/admin/ManageNews.controller.php
Auto-merging sources/admin/ManageMembers.controller.php
CONFLICT (content): Merge conflict in sources/admin/ManageMembers.controller.php
Auto-merging sources/admin/ManageFeatures.controller.php
CONFLICT (content): Merge conflict in sources/admin/ManageFeatures.controller.php
Auto-merging sources/Subs.php
CONFLICT (content): Merge conflict in sources/Subs.php
Auto-merging sources/Security.php
CONFLICT (content): Merge conflict in sources/Security.php
Auto-merging sources/QueryString.php
CONFLICT (content): Merge conflict in sources/QueryString.php
Auto-merging sources/Load.php
CONFLICT (content): Merge conflict in sources/Load.php
Auto-merging install/upgrade.php
CONFLICT (content): Merge conflict in install/upgrade.php
CONFLICT (modify/delete): install/install_1-0_postgresql.sql deleted in HEAD and modified in patch_1-0-5. Version patch_1-0-5 of install/install_1-0_postgresql.sql left in tree.
Auto-merging install/install.php
CONFLICT (content): Merge conflict in install/install.php
Auto-merging install/generate_detailed-version.php
Auto-merging index.php
CONFLICT (content): Merge conflict in index.php
Auto-merging Settings_bak.sample.php
CONFLICT (content): Merge conflict in Settings_bak.sample.php
Auto-merging Settings.sample.php
CONFLICT (content): Merge conflict in Settings.sample.php
Auto-merging SSI.php
CONFLICT (content): Merge conflict in SSI.php
Automatic merge failed; fix conflicts and then commit the result.

xD
Bugs creator.
Features destroyer.
Template killer.

Re: 1.0.5 time to pack!

Reply #7 –

I was very afraid of that :(

Going forward I'd vote for double commits.  So commit on 1.1 and should a bugfix for 1.0.6 be required then its done as a separate commit to that branch.  To many things are being moved in 1.1 and there is more to come.

Re: 1.0.5 time to pack!

Reply #8 –

Many are just the headers with the version, a bit tedious having to change them, but doable. Others instead will be quite a pain...

After about half an hour I'm down to:
Code: [Select]
        deleted by us:   install/install_1-0_postgresql.sql
        both modified:   sources/admin/ManageMembers.controller.php
        both modified:   sources/subs/Boards.subs.php
        both modified:   sources/subs/Cache.subs.php
        both modified:   sources/subs/Likes.subs.php
        both modified:   sources/subs/Members.subs.php
        both modified:   sources/subs/Mentions.subs.php
        both modified:   sources/subs/Messages.subs.php
        both modified:   sources/subs/Profile.subs.php
        deleted by us:   sources/subs/ScheduledTask.class.php
        both modified:   themes/default/Admin.template.php
        both modified:   themes/default/Register.template.php
        both modified:   themes/default/scripts/topic.js

that are those that will need some more careful consideration. But that's for another day. :P
Last Edit: September 13, 2015, 05:28:09 pm by emanuele
Bugs creator.
Features destroyer.
Template killer.

Re: 1.0.5 time to pack!

Reply #9 –

Thats great progress !

Now it looks like find the code in the new 1.1 locations and try to apply the fix.  I'd guess some are going to be easy, but a couple maybe difficult.

Re: 1.0.5 time to pack!

Reply #10 –

You DID it :D ... I merged it into 1.1.  Now its all over but the crying !

Re: 1.0.5 time to pack!

Reply #11 –

Easier than I thought, actually!
 emanuele was lucky LOL
Bugs creator.
Features destroyer.
Template killer.